# HG changeset patch # User Marcin Kuzminski # Date 2019-02-25 15:40:40 # Node ID 92260bb87b0eeaee07ae81d2fa8aebda4c350498 # Parent 1f314713dc5d92207b0c4d901a0672e7f15a1ea7 packaging: moved some not required dependencies to pinned requirements file diff --git a/pip2nix.ini b/pip2nix.ini --- a/pip2nix.ini +++ b/pip2nix.ini @@ -1,3 +1,3 @@ [pip2nix] -requirements = ., -r ./requirements.txt +requirements = ., -r ./requirements.txt, -r ./requirements_pinned.txt output = ./pkgs/python-packages.nix diff --git a/pkgs/python-packages.nix b/pkgs/python-packages.nix --- a/pkgs/python-packages.nix +++ b/pkgs/python-packages.nix @@ -1701,8 +1701,6 @@ self: super: { self."setuptools-scm" self."amqp" self."authomatic" - self."atomicwrites" - self."attrs" self."babel" self."beaker" self."bleach" @@ -1722,12 +1720,9 @@ self: super: { self."formencode" self."future" self."futures" - self."gnureadline" self."infrae.cache" self."iso8601" self."itsdangerous" - self."jinja2" - self."billiard" self."kombu" self."lxml" self."mako" @@ -1739,7 +1734,6 @@ self: super: { self."paste" self."pastedeploy" self."pastescript" - self."pathlib2" self."peppercorn" self."psutil" self."py-bcrypt" @@ -1801,7 +1795,6 @@ self: super: { self."greenlet" self."gunicorn" self."waitress" - self."setproctitle" self."ipdb" self."ipython" self."rhodecode-tools" diff --git a/requirements.txt b/requirements.txt --- a/requirements.txt +++ b/requirements.txt @@ -4,8 +4,7 @@ setuptools-scm==2.1.0 amqp==2.3.1 # not released authomatic that has updated some oauth providers https://code.rhodecode.com/upstream/authomatic/archive/90a9ce60cc405ae8a2bf5c3713acd5d78579a04e.tar.gz?md5=3c68720a1322b25254009518d1ff6801#egg=authomatic==0.1.0.post1 -atomicwrites==1.2.1 -attrs==18.2.0 + babel==1.3 beaker==1.9.1 bleach==3.0.2 @@ -26,12 +25,9 @@ ecdsa==0.13 formencode==1.2.4 future==0.14.3 futures==3.0.2 -gnureadline==6.3.8 infrae.cache==1.0.1 iso8601==0.1.12 itsdangerous==0.24 -jinja2==2.9.6 -billiard==3.5.0.3 kombu==4.2.1 lxml==4.2.5 mako==1.0.7 @@ -43,7 +39,6 @@ packaging==15.2 paste==3.0.5 pastedeploy==2.0.1 pastescript==3.0.0 -pathlib2==2.3.3 peppercorn==0.6 psutil==5.4.8 py-bcrypt==0.4 @@ -115,7 +110,6 @@ gevent==1.4.0 greenlet==0.4.15 gunicorn==19.9.0 waitress==1.1.0 -setproctitle==1.1.10 ## debug ipdb==0.11.0 diff --git a/requirements_pinned.txt b/requirements_pinned.txt new file mode 100644 --- /dev/null +++ b/requirements_pinned.txt @@ -0,0 +1,11 @@ +# contains not directly required libraries we want to pin the version. + +atomicwrites==1.2.1 +attrs==18.2.0 +billiard==3.5.0.3 +gnureadline==6.3.8 +jinja2==2.9.6 +jsonschema==2.6.0 +pathlib2==2.3.3 +setproctitle==1.1.10 +