engineering/unrhodecode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

dependencies: bumped lxml and made it a dependency.

Browse source
This commit is contained in:
Marcin Kuzminski 2017-03-09 19:53:29 +01:00
parent c45f76cc38
commit 838777528b
5 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
pkgs/python-packages.nix
View file

@ -978,13 +978,13 @@
};
};
lxml = super.buildPythonPackage {
name = "lxml-3.4.4";
name = "lxml-3.7.3";
buildInputs = with self; [];
doCheck = false;
propagatedBuildInputs = with self; [];
src = fetchurl {
url = "https://pypi.python.org/packages/63/c7/4f2a2a4ad6c6fa99b14be6b3c1cece9142e2d915aa7c43c908677afc8fa4/lxml-3.4.4.tar.gz";
md5 = "a9a65972afc173ec7a39c585f4eea69c";
url = "https://pypi.python.org/packages/39/e8/a8e0b1fa65dd021d48fe21464f71783655f39a41f218293c1c590d54eb82/lxml-3.7.3.tar.gz";
md5 = "075692ce442e69bbd604d44e21c02753";
};
meta = {
license = [ pkgs.lib.licenses.bsdOriginal ];
@ -1642,9 +1642,9 @@
};
rhodecode-enterprise-ce = super.buildPythonPackage {
name = "rhodecode-enterprise-ce-4.7.0";
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];
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];
doCheck = true;
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];
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];
src = ./.;
meta = {
license = [ { fullName = "Affero GNU General Public License v3 or later (AGPLv3+)"; } { fullName = "AGPLv3, and Commercial License"; } ];

1
requirements.txt
View file

@ -29,6 +29,7 @@ iso8601==0.1.11
itsdangerous==0.24
Jinja2==2.7.3
kombu==1.5.1
lxml==3.7.3
Mako==1.0.6
Markdown==2.6.7
MarkupSafe==0.23

1
requirements_test.txt
View file

@ -14,4 +14,3 @@ WebTest==1.4.3
cov-core==1.15.0
coverage==3.7.1
cssselect==0.9.1
lxml==3.4.4

4
rhodecode/tests/utils.py
View file

@ -25,6 +25,8 @@ import os.path
import subprocess32
import tempfile
import urllib2
from lxml.html import fromstring, tostring
from lxml.cssselect import CSSSelector
from urlparse import urlparse, parse_qsl
from urllib import unquote_plus
@ -204,8 +206,6 @@ class AssertResponse(object):
self.response = response
def get_imports(self):
from lxml.html import fromstring, tostring
from lxml.cssselect import CSSSelector
return fromstring, tostring, CSSSelector
def one_element_exists(self, css_selector):

1
setup.py
View file

@ -112,6 +112,7 @@ install_requirements = [
'ipython',
'iso8601',
'kombu',
'lxml',
'msgpack-python',
'nbconvert',
'packaging',