# HG changeset patch # User Marcin Kuzminski # Date 2016-12-13 10:59:00 # Node ID 7331abed97710c77659b1897fcf6dd5868055838 # Parent 85e5575dda702db77bb7528d72d9c66f22d865ef requirements: updated structure of requirement files, and re-generated nix files. diff --git a/default.nix b/default.nix --- a/default.nix +++ b/default.nix @@ -135,6 +135,8 @@ let rhodecode-testdata ]); + #TODO: either move this into overrides, OR use the new machanics from + # pip2nix and requiremtn.txt file propagatedBuildInputs = attrs.propagatedBuildInputs ++ (with self; [ rhodecode-tools ]); diff --git a/pkgs/python-packages-overrides.nix b/pkgs/python-packages-overrides.nix --- a/pkgs/python-packages-overrides.nix +++ b/pkgs/python-packages-overrides.nix @@ -100,11 +100,7 @@ self: super: { }); py-gfm = super.py-gfm.override { - src = pkgs.fetchgit { - url = "https://code.rhodecode.com/upstream/py-gfm"; - rev = "0d66a19bc16e3d49de273c0f797d4e4781e8c0f2"; - sha256 = "0ryp74jyihd3ckszq31bml5jr3bciimhfp7va7kw6ld92930ksv3"; - }; + name = "py-gfm-0.1.3.rhodecode-upstream1"; }; pycurl = super.pycurl.override (attrs: { @@ -123,12 +119,7 @@ self: super: { }); Pylons = super.Pylons.override (attrs: { - name = "Pylons-1.0.1-patch1"; - src = pkgs.fetchgit { - url = "https://code.rhodecode.com/upstream/pylons"; - rev = "707354ee4261b9c10450404fc9852ccea4fd667d"; - sha256 = "b2763274c2780523a335f83a1df65be22ebe4ff413a7bc9e9288d23c1f62032e"; - }; + name = "Pylons-1.0.2.rhodecode-patch1"; }); pyramid = super.pyramid.override (attrs: { @@ -149,16 +140,6 @@ self: super: { }; }); - Pyro4 = super.Pyro4.override (attrs: { - # TODO: Was not able to generate this version, needs further - # investigation. - name = "Pyro4-4.35"; - src = pkgs.fetchurl { - url = "https://pypi.python.org/packages/source/P/Pyro4/Pyro4-4.35.src.tar.gz"; - md5 = "cbe6cb855f086a0f092ca075005855f3"; - }; - }); - pysqlite = super.pysqlite.override (attrs: { propagatedBuildInputs = [ pkgs.sqlite diff --git a/pkgs/python-packages.nix b/pkgs/python-packages.nix --- a/pkgs/python-packages.nix +++ b/pkgs/python-packages.nix @@ -185,13 +185,13 @@ }; }; Pylons = super.buildPythonPackage { - name = "Pylons-1.0.1"; + name = "Pylons-1.0.2.dev20161213"; buildInputs = with self; []; doCheck = false; propagatedBuildInputs = with self; [Routes WebHelpers Beaker Paste PasteDeploy PasteScript FormEncode simplejson decorator nose Mako WebError WebTest Tempita MarkupSafe WebOb]; src = fetchurl { - url = "https://pypi.python.org/packages/a2/69/b835a6bad00acbfeed3f33c6e44fa3f936efc998c795bfb15c61a79ecf62/Pylons-1.0.1.tar.gz"; - md5 = "6cb880d75fa81213192142b07a6e4915"; + url = "https://code.rhodecode.com/upstream/pylons/archive/707354ee4261b9c10450404fc9852ccea4fd667d.tar.gz?md5=f26633726fa2cd3a340316ee6a5d218f"; + md5 = "f26633726fa2cd3a340316ee6a5d218f"; }; meta = { license = [ pkgs.lib.licenses.bsdOriginal ]; @@ -1126,8 +1126,8 @@ doCheck = false; propagatedBuildInputs = with self; [setuptools Markdown]; src = fetchurl { - url = "https://pypi.python.org/packages/12/e4/6b3d8678da04f97d7490d8264d8de51c2dc9fb91209ccee9c515c95e14c5/py-gfm-0.1.3.tar.gz"; - md5 = "e588d9e69640a241b97e2c59c22527a6"; + url = "https://code.rhodecode.com/upstream/py-gfm/archive/0d66a19bc16e3d49de273c0f797d4e4781e8c0f2.tar.gz?md5=0d0d5385bfb629eea636a80b9c2bfd16"; + md5 = "0d0d5385bfb629eea636a80b9c2bfd16"; }; meta = { license = [ pkgs.lib.licenses.bsdOriginal ]; @@ -1499,7 +1499,7 @@ }; rhodecode-enterprise-ce = super.buildPythonPackage { name = "rhodecode-enterprise-ce-4.6.0"; - buildInputs = with self; [pytest py pytest-runner pytest-catchlog pytest-cov pytest-profiling gprof2dot pytest-timeout pytest-sugar 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 lxml configobj]; doCheck = true; propagatedBuildInputs = with self; [Babel Beaker FormEncode Mako Markdown MarkupSafe MySQL-python Paste PasteDeploy PasteScript Pygments pygments-markdown-lexer Pylons Pyro4 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 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 = ./.; @@ -1521,13 +1521,13 @@ }; }; serpent = super.buildPythonPackage { - name = "serpent-1.12"; + name = "serpent-1.15"; buildInputs = with self; []; doCheck = false; propagatedBuildInputs = with self; []; src = fetchurl { - url = "https://pypi.python.org/packages/3b/19/1e0e83b47c09edaef8398655088036e7e67386b5c48770218ebb339fbbd5/serpent-1.12.tar.gz"; - md5 = "05869ac7b062828b34f8f927f0457b65"; + url = "https://pypi.python.org/packages/7b/38/b2b27673a882ff2ea5871bb3e3e6b496ebbaafd1612e51990ffb158b9254/serpent-1.15.tar.gz"; + md5 = "e27b1aad5c218e16442f52abb7c7053a"; }; meta = { license = [ pkgs.lib.licenses.mit ]; diff --git a/requirements.txt b/requirements.txt --- a/requirements.txt +++ b/requirements.txt @@ -1,42 +1,15 @@ -# core +## core setuptools==20.8.1 setuptools-scm==1.11.0 -Babel==1.3 -Beaker==1.7.0 -Chameleon==2.24 -FormEncode==1.2.4 -Jinja2==2.7.3 -Markdown==2.6.7 -MarkupSafe==0.23 -MySQL-python==1.2.5 -Paste==2.0.2 -PasteDeploy==1.5.2 -PasteScript==1.7.5 -Pygments==2.1.3 -pygments-markdown-lexer==0.1.0.dev39 -# TODO: This version is not available on PyPI -# Pylons==1.0.2.dev20160108 -Pylons==1.0.1 -Pyro4==4.41 -Routes==1.13 -SQLAlchemy==0.9.9 -Sphinx==1.2.2 -Tempita==0.5.2 -URLObject==2.4.0 -WebError==0.10.3 -# TODO: This is modified by us, needs a better integration. For now -# using the latest version before. -# WebHelpers==1.3.dev20150807 -WebHelpers==1.3 -WebHelpers2==2.0 -WebOb==1.3.1 amqplib==1.0.2 anyjson==0.3.3 -appenlight-client==0.6.14 -authomatic==0.1.0.post1; +authomatic==0.1.0.post1 +Babel==1.3 backport-ipaddress==0.1 +Beaker==1.7.0 celery==2.2.10 +Chameleon==2.24 channelstream==0.5.2 click==5.1 colander==1.2 @@ -47,33 +20,42 @@ docutils==0.12 dogpile.cache==0.6.1 dogpile.core==0.4.1 ecdsa==0.11 +FormEncode==1.2.4 future==0.14.3 futures==3.0.2 gnureadline==6.3.3 infrae.cache==1.0.1 iso8601==0.1.11 itsdangerous==0.24 +Jinja2==2.7.3 kombu==1.5.1 Mako==1.0.6 +Markdown==2.6.7 +MarkupSafe==0.23 meld3==1.0.2 msgpack-python==0.4.8 +MySQL-python==1.2.5 nose==1.3.6 objgraph==2.0.0 packaging==15.2 paramiko==1.15.1 +Paste==2.0.2 +PasteDeploy==1.5.2 +PasteScript==1.7.5 psutil==4.3.1 psycopg2==2.6.1 py-bcrypt==0.4 -py-gfm==0.1.3 pycrypto==2.6.1 pycurl==7.19.5 pyflakes==0.8.1 +pygments-markdown-lexer==0.1.0.dev39 +Pygments==2.1.3 pyparsing==1.5.7 -pyramid==1.6.1 pyramid-beaker==0.8 pyramid-debugtoolbar==2.4.2 pyramid-jinja2==2.5 pyramid-mako==1.0.2 +pyramid==1.6.1 pysqlite==2.6.3 python-dateutil==1.5 python-ldap==2.4.19 @@ -84,18 +66,24 @@ pyzmq==14.6.0 recaptcha-client==1.0.6 repoze.lru==0.6 requests==2.9.1 +Routes==1.13 setproctitle==1.1.8 simplejson==3.7.2 six==1.9.0 +Sphinx==1.2.2 +SQLAlchemy==0.9.9 subprocess32==3.2.6 supervisor==3.3.1 - +Tempita==0.5.2 translationstring==1.3 trollius==1.0.4 -uWSGI==2.0.11.2 urllib3==1.16 +URLObject==2.4.0 venusian==1.0 - +WebError==0.10.3 +WebHelpers2==2.0 +WebHelpers==1.3 +WebOb==1.3.1 Whoosh==2.7.4 wsgiref==0.1.2 zope.cachedescriptors==4.0.0 @@ -103,19 +91,27 @@ zope.deprecation==4.1.2 zope.event==4.0.3 zope.interface==4.1.3 -# cli tools +## customized/patched libs +# our patched version of Pylons==1.0.2 +https://code.rhodecode.com/upstream/pylons/archive/707354ee4261b9c10450404fc9852ccea4fd667d.tar.gz?md5=f26633726fa2cd3a340316ee6a5d218f#egg=Pylons==1.0.2.rhodecode-patch-1 +# not released py-gfm==0.1.3 +https://code.rhodecode.com/upstream/py-gfm/archive/0d66a19bc16e3d49de273c0f797d4e4781e8c0f2.tar.gz?md5=0d0d5385bfb629eea636a80b9c2bfd16#egg=py-gfm==0.1.3.rhodecode-upstream1 + + +## cli tools alembic==0.8.4 invoke==0.13.0 bumpversion==0.5.3 transifex-client==0.10 -# http servers +## http servers gevent==1.1.2 greenlet==0.4.10 gunicorn==19.6.0 waitress==1.0.1 +uWSGI==2.0.11.2 -# debug +## debug ipdb==0.10.1 ipython==5.1.0 CProfileV==1.0.6 @@ -124,5 +120,12 @@ bottle==0.12.8 ## rhodecode-tools, special case https://code.rhodecode.com/rhodecode-tools-ce/archive/v0.11.0.tar.gz?md5=e5fd0a8363af08a0ced71b50ca9cce15#egg=rhodecode-tools==0.11.0 -# test related requirements +## appenlight +appenlight-client==0.6.14 + +# Pyro/Deprecated TODO(Marcink): remove in 4.7 release. +Pyro4==4.41 +serpent==1.15 + +## test related requirements -r requirements_test.txt diff --git a/requirements_test.txt b/requirements_test.txt --- a/requirements_test.txt +++ b/requirements_test.txt @@ -1,12 +1,14 @@ +# test related requirements pytest==3.0.5 py==1.4.31 +pytest-cov==2.4.0 +pytest-sugar==0.7.1 pytest-runner==2.9.0 pytest-catchlog==1.2.2 -pytest-cov==2.4.0 pytest-profiling==1.2.2 gprof2dot==2016.10.13 pytest-timeout==1.2.0 -pytest-sugar==0.7.1 + mock==1.0.1 WebTest==1.4.3 cov-core==1.15.0