##// END OF EJS Templates
dependencies: bumped lxml and made it a dependency.
marcink -
r1525:16ed4028 default
parent child Browse files
Show More
@@ -978,13 +978,13 b''
978 };
978 };
979 };
979 };
980 lxml = super.buildPythonPackage {
980 lxml = super.buildPythonPackage {
981 name = "lxml-3.4.4";
981 name = "lxml-3.7.3";
982 buildInputs = with self; [];
982 buildInputs = with self; [];
983 doCheck = false;
983 doCheck = false;
984 propagatedBuildInputs = with self; [];
984 propagatedBuildInputs = with self; [];
985 src = fetchurl {
985 src = fetchurl {
986 url = "https://pypi.python.org/packages/63/c7/4f2a2a4ad6c6fa99b14be6b3c1cece9142e2d915aa7c43c908677afc8fa4/lxml-3.4.4.tar.gz";
986 url = "https://pypi.python.org/packages/39/e8/a8e0b1fa65dd021d48fe21464f71783655f39a41f218293c1c590d54eb82/lxml-3.7.3.tar.gz";
987 md5 = "a9a65972afc173ec7a39c585f4eea69c";
987 md5 = "075692ce442e69bbd604d44e21c02753";
988 };
988 };
989 meta = {
989 meta = {
990 license = [ pkgs.lib.licenses.bsdOriginal ];
990 license = [ pkgs.lib.licenses.bsdOriginal ];
@@ -1642,9 +1642,9 b''
1642 };
1642 };
1643 rhodecode-enterprise-ce = super.buildPythonPackage {
1643 rhodecode-enterprise-ce = super.buildPythonPackage {
1644 name = "rhodecode-enterprise-ce-4.7.0";
1644 name = "rhodecode-enterprise-ce-4.7.0";
1645 buildInputs = with self; [pytest py pytest-cov pytest-sugar pytest-runner pytest-catchlog pytest-profiling gprof2dot pytest-timeout mock WebTest cov-core coverage cssselect lxml configobj];
1645 buildInputs = with self; [pytest py pytest-cov pytest-sugar pytest-runner pytest-catchlog pytest-profiling gprof2dot pytest-timeout mock WebTest cov-core coverage cssselect configobj];
1646 doCheck = true;
1646 doCheck = true;
1647 propagatedBuildInputs = with self; [Babel Beaker FormEncode Mako Markdown MarkupSafe MySQL-python Paste PasteDeploy PasteScript Pygments pygments-markdown-lexer Pylons Routes SQLAlchemy Tempita URLObject WebError WebHelpers WebHelpers2 WebOb WebTest Whoosh alembic amqplib anyjson appenlight-client authomatic backport-ipaddress celery channelstream colander decorator deform docutils gevent gunicorn infrae.cache ipython iso8601 kombu msgpack-python nbconvert packaging psycopg2 py-gfm pycrypto pycurl pyparsing pyramid pyramid-debugtoolbar pyramid-mako pyramid-beaker pysqlite python-dateutil python-ldap python-memcached python-pam recaptcha-client repoze.lru requests simplejson subprocess32 waitress zope.cachedescriptors dogpile.cache dogpile.core psutil py-bcrypt];
1647 propagatedBuildInputs = with self; [Babel Beaker FormEncode Mako Markdown MarkupSafe MySQL-python Paste PasteDeploy PasteScript Pygments pygments-markdown-lexer Pylons Routes SQLAlchemy Tempita URLObject WebError WebHelpers WebHelpers2 WebOb WebTest Whoosh alembic amqplib anyjson appenlight-client authomatic backport-ipaddress celery channelstream colander decorator deform docutils gevent gunicorn infrae.cache ipython iso8601 kombu lxml msgpack-python nbconvert packaging psycopg2 py-gfm pycrypto pycurl pyparsing pyramid pyramid-debugtoolbar pyramid-mako pyramid-beaker pysqlite python-dateutil python-ldap python-memcached python-pam recaptcha-client repoze.lru requests simplejson subprocess32 waitress zope.cachedescriptors dogpile.cache dogpile.core psutil py-bcrypt];
1648 src = ./.;
1648 src = ./.;
1649 meta = {
1649 meta = {
1650 license = [ { fullName = "Affero GNU General Public License v3 or later (AGPLv3+)"; } { fullName = "AGPLv3, and Commercial License"; } ];
1650 license = [ { fullName = "Affero GNU General Public License v3 or later (AGPLv3+)"; } { fullName = "AGPLv3, and Commercial License"; } ];
@@ -29,6 +29,7 b' iso8601==0.1.11'
29 itsdangerous==0.24
29 itsdangerous==0.24
30 Jinja2==2.7.3
30 Jinja2==2.7.3
31 kombu==1.5.1
31 kombu==1.5.1
32 lxml==3.7.3
32 Mako==1.0.6
33 Mako==1.0.6
33 Markdown==2.6.7
34 Markdown==2.6.7
34 MarkupSafe==0.23
35 MarkupSafe==0.23
@@ -14,4 +14,3 b' WebTest==1.4.3'
14 cov-core==1.15.0
14 cov-core==1.15.0
15 coverage==3.7.1
15 coverage==3.7.1
16 cssselect==0.9.1
16 cssselect==0.9.1
17 lxml==3.4.4
@@ -25,6 +25,8 b' import os.path'
25 import subprocess32
25 import subprocess32
26 import tempfile
26 import tempfile
27 import urllib2
27 import urllib2
28 from lxml.html import fromstring, tostring
29 from lxml.cssselect import CSSSelector
28 from urlparse import urlparse, parse_qsl
30 from urlparse import urlparse, parse_qsl
29 from urllib import unquote_plus
31 from urllib import unquote_plus
30
32
@@ -204,8 +206,6 b' class AssertResponse(object):'
204 self.response = response
206 self.response = response
205
207
206 def get_imports(self):
208 def get_imports(self):
207 from lxml.html import fromstring, tostring
208 from lxml.cssselect import CSSSelector
209 return fromstring, tostring, CSSSelector
209 return fromstring, tostring, CSSSelector
210
210
211 def one_element_exists(self, css_selector):
211 def one_element_exists(self, css_selector):
@@ -112,6 +112,7 b' install_requirements = ['
112 'ipython',
112 'ipython',
113 'iso8601',
113 'iso8601',
114 'kombu',
114 'kombu',
115 'lxml',
115 'msgpack-python',
116 'msgpack-python',
116 'nbconvert',
117 'nbconvert',
117 'packaging',
118 'packaging',
General Comments 0
You need to be logged in to leave comments. Login now