##// END OF EJS Templates
requirements: updated structure of requirement files, and re-generated nix files.
marcink -
r1236:7331abed default
parent child
Show More
@@ -135,6 +135,8 let
135 rhodecode-testdata
135 rhodecode-testdata
136 ]);
136 ]);
137
137
138 #TODO: either move this into overrides, OR use the new machanics from
139 # pip2nix and requiremtn.txt file
138 propagatedBuildInputs = attrs.propagatedBuildInputs ++ (with self; [
140 propagatedBuildInputs = attrs.propagatedBuildInputs ++ (with self; [
139 rhodecode-tools
141 rhodecode-tools
140 ]);
142 ]);
@@ -100,11 +100,7 self: super: {
100 });
100 });
101
101
102 py-gfm = super.py-gfm.override {
102 py-gfm = super.py-gfm.override {
103 src = pkgs.fetchgit {
103 name = "py-gfm-0.1.3.rhodecode-upstream1";
104 url = "https://code.rhodecode.com/upstream/py-gfm";
105 rev = "0d66a19bc16e3d49de273c0f797d4e4781e8c0f2";
106 sha256 = "0ryp74jyihd3ckszq31bml5jr3bciimhfp7va7kw6ld92930ksv3";
107 };
108 };
104 };
109
105
110 pycurl = super.pycurl.override (attrs: {
106 pycurl = super.pycurl.override (attrs: {
@@ -123,12 +119,7 self: super: {
123 });
119 });
124
120
125 Pylons = super.Pylons.override (attrs: {
121 Pylons = super.Pylons.override (attrs: {
126 name = "Pylons-1.0.1-patch1";
122 name = "Pylons-1.0.2.rhodecode-patch1";
127 src = pkgs.fetchgit {
128 url = "https://code.rhodecode.com/upstream/pylons";
129 rev = "707354ee4261b9c10450404fc9852ccea4fd667d";
130 sha256 = "b2763274c2780523a335f83a1df65be22ebe4ff413a7bc9e9288d23c1f62032e";
131 };
132 });
123 });
133
124
134 pyramid = super.pyramid.override (attrs: {
125 pyramid = super.pyramid.override (attrs: {
@@ -149,16 +140,6 self: super: {
149 };
140 };
150 });
141 });
151
142
152 Pyro4 = super.Pyro4.override (attrs: {
153 # TODO: Was not able to generate this version, needs further
154 # investigation.
155 name = "Pyro4-4.35";
156 src = pkgs.fetchurl {
157 url = "https://pypi.python.org/packages/source/P/Pyro4/Pyro4-4.35.src.tar.gz";
158 md5 = "cbe6cb855f086a0f092ca075005855f3";
159 };
160 });
161
162 pysqlite = super.pysqlite.override (attrs: {
143 pysqlite = super.pysqlite.override (attrs: {
163 propagatedBuildInputs = [
144 propagatedBuildInputs = [
164 pkgs.sqlite
145 pkgs.sqlite
@@ -185,13 +185,13
185 };
185 };
186 };
186 };
187 Pylons = super.buildPythonPackage {
187 Pylons = super.buildPythonPackage {
188 name = "Pylons-1.0.1";
188 name = "Pylons-1.0.2.dev20161213";
189 buildInputs = with self; [];
189 buildInputs = with self; [];
190 doCheck = false;
190 doCheck = false;
191 propagatedBuildInputs = with self; [Routes WebHelpers Beaker Paste PasteDeploy PasteScript FormEncode simplejson decorator nose Mako WebError WebTest Tempita MarkupSafe WebOb];
191 propagatedBuildInputs = with self; [Routes WebHelpers Beaker Paste PasteDeploy PasteScript FormEncode simplejson decorator nose Mako WebError WebTest Tempita MarkupSafe WebOb];
192 src = fetchurl {
192 src = fetchurl {
193 url = "https://pypi.python.org/packages/a2/69/b835a6bad00acbfeed3f33c6e44fa3f936efc998c795bfb15c61a79ecf62/Pylons-1.0.1.tar.gz";
193 url = "https://code.rhodecode.com/upstream/pylons/archive/707354ee4261b9c10450404fc9852ccea4fd667d.tar.gz?md5=f26633726fa2cd3a340316ee6a5d218f";
194 md5 = "6cb880d75fa81213192142b07a6e4915";
194 md5 = "f26633726fa2cd3a340316ee6a5d218f";
195 };
195 };
196 meta = {
196 meta = {
197 license = [ pkgs.lib.licenses.bsdOriginal ];
197 license = [ pkgs.lib.licenses.bsdOriginal ];
@@ -1126,8 +1126,8
1126 doCheck = false;
1126 doCheck = false;
1127 propagatedBuildInputs = with self; [setuptools Markdown];
1127 propagatedBuildInputs = with self; [setuptools Markdown];
1128 src = fetchurl {
1128 src = fetchurl {
1129 url = "https://pypi.python.org/packages/12/e4/6b3d8678da04f97d7490d8264d8de51c2dc9fb91209ccee9c515c95e14c5/py-gfm-0.1.3.tar.gz";
1129 url = "https://code.rhodecode.com/upstream/py-gfm/archive/0d66a19bc16e3d49de273c0f797d4e4781e8c0f2.tar.gz?md5=0d0d5385bfb629eea636a80b9c2bfd16";
1130 md5 = "e588d9e69640a241b97e2c59c22527a6";
1130 md5 = "0d0d5385bfb629eea636a80b9c2bfd16";
1131 };
1131 };
1132 meta = {
1132 meta = {
1133 license = [ pkgs.lib.licenses.bsdOriginal ];
1133 license = [ pkgs.lib.licenses.bsdOriginal ];
@@ -1499,7 +1499,7
1499 };
1499 };
1500 rhodecode-enterprise-ce = super.buildPythonPackage {
1500 rhodecode-enterprise-ce = super.buildPythonPackage {
1501 name = "rhodecode-enterprise-ce-4.6.0";
1501 name = "rhodecode-enterprise-ce-4.6.0";
1502 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];
1502 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];
1503 doCheck = true;
1503 doCheck = true;
1504 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];
1504 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];
1505 src = ./.;
1505 src = ./.;
@@ -1521,13 +1521,13
1521 };
1521 };
1522 };
1522 };
1523 serpent = super.buildPythonPackage {
1523 serpent = super.buildPythonPackage {
1524 name = "serpent-1.12";
1524 name = "serpent-1.15";
1525 buildInputs = with self; [];
1525 buildInputs = with self; [];
1526 doCheck = false;
1526 doCheck = false;
1527 propagatedBuildInputs = with self; [];
1527 propagatedBuildInputs = with self; [];
1528 src = fetchurl {
1528 src = fetchurl {
1529 url = "https://pypi.python.org/packages/3b/19/1e0e83b47c09edaef8398655088036e7e67386b5c48770218ebb339fbbd5/serpent-1.12.tar.gz";
1529 url = "https://pypi.python.org/packages/7b/38/b2b27673a882ff2ea5871bb3e3e6b496ebbaafd1612e51990ffb158b9254/serpent-1.15.tar.gz";
1530 md5 = "05869ac7b062828b34f8f927f0457b65";
1530 md5 = "e27b1aad5c218e16442f52abb7c7053a";
1531 };
1531 };
1532 meta = {
1532 meta = {
1533 license = [ pkgs.lib.licenses.mit ];
1533 license = [ pkgs.lib.licenses.mit ];
@@ -1,42 +1,15
1 # core
1 ## core
2 setuptools==20.8.1
2 setuptools==20.8.1
3 setuptools-scm==1.11.0
3 setuptools-scm==1.11.0
4
4
5 Babel==1.3
6 Beaker==1.7.0
7 Chameleon==2.24
8 FormEncode==1.2.4
9 Jinja2==2.7.3
10 Markdown==2.6.7
11 MarkupSafe==0.23
12 MySQL-python==1.2.5
13 Paste==2.0.2
14 PasteDeploy==1.5.2
15 PasteScript==1.7.5
16 Pygments==2.1.3
17 pygments-markdown-lexer==0.1.0.dev39
18 # TODO: This version is not available on PyPI
19 # Pylons==1.0.2.dev20160108
20 Pylons==1.0.1
21 Pyro4==4.41
22 Routes==1.13
23 SQLAlchemy==0.9.9
24 Sphinx==1.2.2
25 Tempita==0.5.2
26 URLObject==2.4.0
27 WebError==0.10.3
28 # TODO: This is modified by us, needs a better integration. For now
29 # using the latest version before.
30 # WebHelpers==1.3.dev20150807
31 WebHelpers==1.3
32 WebHelpers2==2.0
33 WebOb==1.3.1
34 amqplib==1.0.2
5 amqplib==1.0.2
35 anyjson==0.3.3
6 anyjson==0.3.3
36 appenlight-client==0.6.14
7 authomatic==0.1.0.post1
37 authomatic==0.1.0.post1;
8 Babel==1.3
38 backport-ipaddress==0.1
9 backport-ipaddress==0.1
10 Beaker==1.7.0
39 celery==2.2.10
11 celery==2.2.10
12 Chameleon==2.24
40 channelstream==0.5.2
13 channelstream==0.5.2
41 click==5.1
14 click==5.1
42 colander==1.2
15 colander==1.2
@@ -47,33 +20,42 docutils==0.12
47 dogpile.cache==0.6.1
20 dogpile.cache==0.6.1
48 dogpile.core==0.4.1
21 dogpile.core==0.4.1
49 ecdsa==0.11
22 ecdsa==0.11
23 FormEncode==1.2.4
50 future==0.14.3
24 future==0.14.3
51 futures==3.0.2
25 futures==3.0.2
52 gnureadline==6.3.3
26 gnureadline==6.3.3
53 infrae.cache==1.0.1
27 infrae.cache==1.0.1
54 iso8601==0.1.11
28 iso8601==0.1.11
55 itsdangerous==0.24
29 itsdangerous==0.24
30 Jinja2==2.7.3
56 kombu==1.5.1
31 kombu==1.5.1
57 Mako==1.0.6
32 Mako==1.0.6
33 Markdown==2.6.7
34 MarkupSafe==0.23
58 meld3==1.0.2
35 meld3==1.0.2
59 msgpack-python==0.4.8
36 msgpack-python==0.4.8
37 MySQL-python==1.2.5
60 nose==1.3.6
38 nose==1.3.6
61 objgraph==2.0.0
39 objgraph==2.0.0
62 packaging==15.2
40 packaging==15.2
63 paramiko==1.15.1
41 paramiko==1.15.1
42 Paste==2.0.2
43 PasteDeploy==1.5.2
44 PasteScript==1.7.5
64 psutil==4.3.1
45 psutil==4.3.1
65 psycopg2==2.6.1
46 psycopg2==2.6.1
66 py-bcrypt==0.4
47 py-bcrypt==0.4
67 py-gfm==0.1.3
68 pycrypto==2.6.1
48 pycrypto==2.6.1
69 pycurl==7.19.5
49 pycurl==7.19.5
70 pyflakes==0.8.1
50 pyflakes==0.8.1
51 pygments-markdown-lexer==0.1.0.dev39
52 Pygments==2.1.3
71 pyparsing==1.5.7
53 pyparsing==1.5.7
72 pyramid==1.6.1
73 pyramid-beaker==0.8
54 pyramid-beaker==0.8
74 pyramid-debugtoolbar==2.4.2
55 pyramid-debugtoolbar==2.4.2
75 pyramid-jinja2==2.5
56 pyramid-jinja2==2.5
76 pyramid-mako==1.0.2
57 pyramid-mako==1.0.2
58 pyramid==1.6.1
77 pysqlite==2.6.3
59 pysqlite==2.6.3
78 python-dateutil==1.5
60 python-dateutil==1.5
79 python-ldap==2.4.19
61 python-ldap==2.4.19
@@ -84,18 +66,24 pyzmq==14.6.0
84 recaptcha-client==1.0.6
66 recaptcha-client==1.0.6
85 repoze.lru==0.6
67 repoze.lru==0.6
86 requests==2.9.1
68 requests==2.9.1
69 Routes==1.13
87 setproctitle==1.1.8
70 setproctitle==1.1.8
88 simplejson==3.7.2
71 simplejson==3.7.2
89 six==1.9.0
72 six==1.9.0
73 Sphinx==1.2.2
74 SQLAlchemy==0.9.9
90 subprocess32==3.2.6
75 subprocess32==3.2.6
91 supervisor==3.3.1
76 supervisor==3.3.1
92
77 Tempita==0.5.2
93 translationstring==1.3
78 translationstring==1.3
94 trollius==1.0.4
79 trollius==1.0.4
95 uWSGI==2.0.11.2
96 urllib3==1.16
80 urllib3==1.16
81 URLObject==2.4.0
97 venusian==1.0
82 venusian==1.0
98
83 WebError==0.10.3
84 WebHelpers2==2.0
85 WebHelpers==1.3
86 WebOb==1.3.1
99 Whoosh==2.7.4
87 Whoosh==2.7.4
100 wsgiref==0.1.2
88 wsgiref==0.1.2
101 zope.cachedescriptors==4.0.0
89 zope.cachedescriptors==4.0.0
@@ -103,19 +91,27 zope.deprecation==4.1.2
103 zope.event==4.0.3
91 zope.event==4.0.3
104 zope.interface==4.1.3
92 zope.interface==4.1.3
105
93
106 # cli tools
94 ## customized/patched libs
95 # our patched version of Pylons==1.0.2
96 https://code.rhodecode.com/upstream/pylons/archive/707354ee4261b9c10450404fc9852ccea4fd667d.tar.gz?md5=f26633726fa2cd3a340316ee6a5d218f#egg=Pylons==1.0.2.rhodecode-patch-1
97 # not released py-gfm==0.1.3
98 https://code.rhodecode.com/upstream/py-gfm/archive/0d66a19bc16e3d49de273c0f797d4e4781e8c0f2.tar.gz?md5=0d0d5385bfb629eea636a80b9c2bfd16#egg=py-gfm==0.1.3.rhodecode-upstream1
99
100
101 ## cli tools
107 alembic==0.8.4
102 alembic==0.8.4
108 invoke==0.13.0
103 invoke==0.13.0
109 bumpversion==0.5.3
104 bumpversion==0.5.3
110 transifex-client==0.10
105 transifex-client==0.10
111
106
112 # http servers
107 ## http servers
113 gevent==1.1.2
108 gevent==1.1.2
114 greenlet==0.4.10
109 greenlet==0.4.10
115 gunicorn==19.6.0
110 gunicorn==19.6.0
116 waitress==1.0.1
111 waitress==1.0.1
112 uWSGI==2.0.11.2
117
113
118 # debug
114 ## debug
119 ipdb==0.10.1
115 ipdb==0.10.1
120 ipython==5.1.0
116 ipython==5.1.0
121 CProfileV==1.0.6
117 CProfileV==1.0.6
@@ -124,5 +120,12 bottle==0.12.8
124 ## rhodecode-tools, special case
120 ## rhodecode-tools, special case
125 https://code.rhodecode.com/rhodecode-tools-ce/archive/v0.11.0.tar.gz?md5=e5fd0a8363af08a0ced71b50ca9cce15#egg=rhodecode-tools==0.11.0
121 https://code.rhodecode.com/rhodecode-tools-ce/archive/v0.11.0.tar.gz?md5=e5fd0a8363af08a0ced71b50ca9cce15#egg=rhodecode-tools==0.11.0
126
122
127 # test related requirements
123 ## appenlight
124 appenlight-client==0.6.14
125
126 # Pyro/Deprecated TODO(Marcink): remove in 4.7 release.
127 Pyro4==4.41
128 serpent==1.15
129
130 ## test related requirements
128 -r requirements_test.txt
131 -r requirements_test.txt
@@ -1,12 +1,14
1 # test related requirements
1 pytest==3.0.5
2 pytest==3.0.5
2 py==1.4.31
3 py==1.4.31
4 pytest-cov==2.4.0
5 pytest-sugar==0.7.1
3 pytest-runner==2.9.0
6 pytest-runner==2.9.0
4 pytest-catchlog==1.2.2
7 pytest-catchlog==1.2.2
5 pytest-cov==2.4.0
6 pytest-profiling==1.2.2
8 pytest-profiling==1.2.2
7 gprof2dot==2016.10.13
9 gprof2dot==2016.10.13
8 pytest-timeout==1.2.0
10 pytest-timeout==1.2.0
9 pytest-sugar==0.7.1
11
10 mock==1.0.1
12 mock==1.0.1
11 WebTest==1.4.3
13 WebTest==1.4.3
12 cov-core==1.15.0
14 cov-core==1.15.0
General Comments 0
You need to be logged in to leave comments. Login now