##// END OF EJS Templates
deps: bumped pyparsing for EE edition
super-admin -
r5100:21ffe335 default
parent child Browse files
Show More
@@ -1,58 +1,57 b''
1
2 # Copyright (C) 2010-2023 RhodeCode GmbH
1 # Copyright (C) 2010-2023 RhodeCode GmbH
3 #
2 #
4 # This program is free software: you can redistribute it and/or modify
3 # This program is free software: you can redistribute it and/or modify
5 # it under the terms of the GNU Affero General Public License, version 3
4 # it under the terms of the GNU Affero General Public License, version 3
6 # (only), as published by the Free Software Foundation.
5 # (only), as published by the Free Software Foundation.
7 #
6 #
8 # This program is distributed in the hope that it will be useful,
7 # This program is distributed in the hope that it will be useful,
9 # but WITHOUT ANY WARRANTY; without even the implied warranty of
8 # but WITHOUT ANY WARRANTY; without even the implied warranty of
10 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
9 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 # GNU General Public License for more details.
10 # GNU General Public License for more details.
12 #
11 #
13 # You should have received a copy of the GNU Affero General Public License
12 # You should have received a copy of the GNU Affero General Public License
14 # along with this program. If not, see <http://www.gnu.org/licenses/>.
13 # along with this program. If not, see <http://www.gnu.org/licenses/>.
15 #
14 #
16 # This program is dual-licensed. If you wish to learn more about the
15 # This program is dual-licensed. If you wish to learn more about the
17 # RhodeCode Enterprise Edition, including its added features, Support services,
16 # RhodeCode Enterprise Edition, including its added features, Support services,
18 # and proprietary license terms, please see https://rhodecode.com/licenses/
17 # and proprietary license terms, please see https://rhodecode.com/licenses/
19
18
20 import pytest # noqa
19 import pytest # noqa
21
20
22 # keep the imports to have a toplevel conftest.py but still importable from EE edition
21 # keep the imports to have a toplevel conftest.py but still importable from EE edition
23 from rhodecode.tests.conftest_common import ( # noqa
22 from rhodecode.tests.conftest_common import ( # noqa
24 pytest_generate_tests,
23 pytest_generate_tests,
25 pytest_runtest_makereport,
24 pytest_runtest_makereport,
26 pytest_addoption
25 pytest_addoption
27 )
26 )
28
27
29
28
30 pytest_plugins = [
29 pytest_plugins = [
31 "rhodecode.tests.fixture_mods.fixture_pyramid",
30 "rhodecode.tests.fixture_mods.fixture_pyramid",
32 "rhodecode.tests.fixture_mods.fixture_utils",
31 "rhodecode.tests.fixture_mods.fixture_utils",
33 ]
32 ]
34
33
35
34
36 def pytest_configure(config):
35 def pytest_configure(config):
37 from rhodecode.config import patches # noqa
36 from rhodecode.config import patches # noqa
38
37
39
38
40 def pytest_collection_modifyitems(session, config, items):
39 def pytest_collection_modifyitems(session, config, items):
41 # nottest marked, compare nose, used for transition from nose to pytest
40 # nottest marked, compare nose, used for transition from nose to pytest
42 remaining = [
41 remaining = [
43 i for i in items if getattr(i.obj, '__test__', True)]
42 i for i in items if getattr(i.obj, '__test__', True)]
44 items[:] = remaining
43 items[:] = remaining
45
44
46 # NOTE(marcink): custom test ordering, db tests and vcstests are slowest and should
45 # NOTE(marcink): custom test ordering, db tests and vcstests are slowest and should
47 # be executed at the end for faster test feedback
46 # be executed at the end for faster test feedback
48 def sorter(item):
47 def sorter(item):
49 pos = 0
48 pos = 0
50 key = item._nodeid
49 key = item._nodeid
51 if key.startswith('rhodecode/tests/database'):
50 if key.startswith('rhodecode/tests/database'):
52 pos = 1
51 pos = 1
53 elif key.startswith('rhodecode/tests/vcs_operations'):
52 elif key.startswith('rhodecode/tests/vcs_operations'):
54 pos = 2
53 pos = 2
55
54
56 return pos
55 return pos
57
56
58 items.sort(key=sorter)
57 items.sort(key=sorter)
@@ -1,274 +1,274 b''
1 # deps, generated via pipdeptree --exclude setuptools,wheel,pipdeptree,pip -f | tr '[:upper:]' '[:lower:]'
1 # deps, generated via pipdeptree --exclude setuptools,wheel,pipdeptree,pip -f | tr '[:upper:]' '[:lower:]'
2
2
3 alembic==1.11.1
3 alembic==1.11.1
4 mako==1.2.4
4 mako==1.2.4
5 markupsafe==2.1.2
5 markupsafe==2.1.2
6 sqlalchemy==1.4.49
6 sqlalchemy==1.4.49
7 greenlet==2.0.2
7 greenlet==2.0.2
8 typing_extensions==4.7.1
8 typing_extensions==4.7.1
9 async-timeout==4.0.2
9 async-timeout==4.0.2
10 babel==2.12.1
10 babel==2.12.1
11 celery==5.3.1
11 celery==5.3.1
12 billiard==4.1.0
12 billiard==4.1.0
13 click==8.1.3
13 click==8.1.3
14 click-didyoumean==0.3.0
14 click-didyoumean==0.3.0
15 click==8.1.3
15 click==8.1.3
16 click-plugins==1.1.1
16 click-plugins==1.1.1
17 click==8.1.3
17 click==8.1.3
18 click-repl==0.2.0
18 click-repl==0.2.0
19 click==8.1.3
19 click==8.1.3
20 prompt-toolkit==3.0.38
20 prompt-toolkit==3.0.38
21 wcwidth==0.2.6
21 wcwidth==0.2.6
22 six==1.16.0
22 six==1.16.0
23 kombu==5.3.1
23 kombu==5.3.1
24 amqp==5.1.1
24 amqp==5.1.1
25 vine==5.0.0
25 vine==5.0.0
26 vine==5.0.0
26 vine==5.0.0
27 python-dateutil==2.8.2
27 python-dateutil==2.8.2
28 six==1.16.0
28 six==1.16.0
29 tzdata==2023.3
29 tzdata==2023.3
30 vine==5.0.0
30 vine==5.0.0
31 channelstream==0.7.1
31 channelstream==0.7.1
32 gevent==23.7.0
32 gevent==23.7.0
33 greenlet==2.0.2
33 greenlet==2.0.2
34 zope.event==5.0.0
34 zope.event==5.0.0
35 zope.interface==6.0.0
35 zope.interface==6.0.0
36 itsdangerous==1.1.0
36 itsdangerous==1.1.0
37 marshmallow==2.18.0
37 marshmallow==2.18.0
38 pyramid==2.0.1
38 pyramid==2.0.1
39 hupper==1.12
39 hupper==1.12
40 plaster==1.1.2
40 plaster==1.1.2
41 plaster-pastedeploy==1.0.1
41 plaster-pastedeploy==1.0.1
42 pastedeploy==3.0.1
42 pastedeploy==3.0.1
43 plaster==1.1.2
43 plaster==1.1.2
44 translationstring==1.4
44 translationstring==1.4
45 venusian==3.0.0
45 venusian==3.0.0
46 webob==1.8.7
46 webob==1.8.7
47 zope.deprecation==5.0.0
47 zope.deprecation==5.0.0
48 zope.interface==6.0.0
48 zope.interface==6.0.0
49 pyramid-apispec==0.3.3
49 pyramid-apispec==0.3.3
50 apispec==1.3.3
50 apispec==1.3.3
51 pyramid-jinja2==2.10
51 pyramid-jinja2==2.10
52 jinja2==3.1.2
52 jinja2==3.1.2
53 markupsafe==2.1.2
53 markupsafe==2.1.2
54 markupsafe==2.1.2
54 markupsafe==2.1.2
55 pyramid==2.0.1
55 pyramid==2.0.1
56 hupper==1.12
56 hupper==1.12
57 plaster==1.1.2
57 plaster==1.1.2
58 plaster-pastedeploy==1.0.1
58 plaster-pastedeploy==1.0.1
59 pastedeploy==3.0.1
59 pastedeploy==3.0.1
60 plaster==1.1.2
60 plaster==1.1.2
61 translationstring==1.4
61 translationstring==1.4
62 venusian==3.0.0
62 venusian==3.0.0
63 webob==1.8.7
63 webob==1.8.7
64 zope.deprecation==5.0.0
64 zope.deprecation==5.0.0
65 zope.interface==6.0.0
65 zope.interface==6.0.0
66 zope.deprecation==5.0.0
66 zope.deprecation==5.0.0
67 python-dateutil==2.8.2
67 python-dateutil==2.8.2
68 six==1.16.0
68 six==1.16.0
69 requests==2.28.2
69 requests==2.28.2
70 certifi==2022.12.7
70 certifi==2022.12.7
71 charset-normalizer==3.1.0
71 charset-normalizer==3.1.0
72 idna==3.4
72 idna==3.4
73 urllib3==1.26.14
73 urllib3==1.26.14
74 ws4py==0.5.1
74 ws4py==0.5.1
75 deform==2.0.15
75 deform==2.0.15
76 chameleon==3.10.2
76 chameleon==3.10.2
77 colander==2.0
77 colander==2.0
78 iso8601==1.1.0
78 iso8601==1.1.0
79 translationstring==1.4
79 translationstring==1.4
80 iso8601==1.1.0
80 iso8601==1.1.0
81 peppercorn==0.6
81 peppercorn==0.6
82 translationstring==1.4
82 translationstring==1.4
83 zope.deprecation==5.0.0
83 zope.deprecation==5.0.0
84 diskcache==5.6.1
84 diskcache==5.6.1
85 docutils==0.19
85 docutils==0.19
86 dogpile.cache==1.2.2
86 dogpile.cache==1.2.2
87 decorator==5.1.1
87 decorator==5.1.1
88 stevedore==5.0.0
88 stevedore==5.0.0
89 pbr==5.11.1
89 pbr==5.11.1
90 formencode==2.0.1
90 formencode==2.0.1
91 six==1.16.0
91 six==1.16.0
92 gunicorn==21.0.1
92 gunicorn==21.0.1
93 packaging==23.1
93 packaging==23.1
94 infrae.cache==1.0.1
94 infrae.cache==1.0.1
95 beaker==1.12.1
95 beaker==1.12.1
96 repoze.lru==0.7
96 repoze.lru==0.7
97 markdown==3.4.3
97 markdown==3.4.3
98 msgpack==1.0.5
98 msgpack==1.0.5
99 mysqlclient==2.1.1
99 mysqlclient==2.1.1
100 nbconvert==7.2.9
100 nbconvert==7.2.9
101 beautifulsoup4==4.11.2
101 beautifulsoup4==4.11.2
102 soupsieve==2.4
102 soupsieve==2.4
103 bleach==6.0.0
103 bleach==6.0.0
104 six==1.16.0
104 six==1.16.0
105 webencodings==0.5.1
105 webencodings==0.5.1
106 defusedxml==0.7.1
106 defusedxml==0.7.1
107 jinja2==3.1.2
107 jinja2==3.1.2
108 markupsafe==2.1.2
108 markupsafe==2.1.2
109 jupyter_core==5.2.0
109 jupyter_core==5.2.0
110 platformdirs==3.5.1
110 platformdirs==3.5.1
111 traitlets==5.9.0
111 traitlets==5.9.0
112 jupyterlab-pygments==0.2.2
112 jupyterlab-pygments==0.2.2
113 markupsafe==2.1.2
113 markupsafe==2.1.2
114 mistune==2.0.5
114 mistune==2.0.5
115 nbclient==0.7.2
115 nbclient==0.7.2
116 jupyter_client==8.0.3
116 jupyter_client==8.0.3
117 jupyter_core==5.2.0
117 jupyter_core==5.2.0
118 platformdirs==3.5.1
118 platformdirs==3.5.1
119 traitlets==5.9.0
119 traitlets==5.9.0
120 python-dateutil==2.8.2
120 python-dateutil==2.8.2
121 six==1.16.0
121 six==1.16.0
122 pyzmq==25.0.0
122 pyzmq==25.0.0
123 tornado==6.2
123 tornado==6.2
124 traitlets==5.9.0
124 traitlets==5.9.0
125 jupyter_core==5.2.0
125 jupyter_core==5.2.0
126 platformdirs==3.5.1
126 platformdirs==3.5.1
127 traitlets==5.9.0
127 traitlets==5.9.0
128 nbformat==5.7.3
128 nbformat==5.7.3
129 fastjsonschema==2.16.3
129 fastjsonschema==2.16.3
130 jsonschema==4.17.3
130 jsonschema==4.17.3
131 attrs==22.2.0
131 attrs==22.2.0
132 pyrsistent==0.19.3
132 pyrsistent==0.19.3
133 jupyter_core==5.2.0
133 jupyter_core==5.2.0
134 platformdirs==3.5.1
134 platformdirs==3.5.1
135 traitlets==5.9.0
135 traitlets==5.9.0
136 traitlets==5.9.0
136 traitlets==5.9.0
137 traitlets==5.9.0
137 traitlets==5.9.0
138 nbformat==5.7.3
138 nbformat==5.7.3
139 fastjsonschema==2.16.3
139 fastjsonschema==2.16.3
140 jsonschema==4.17.3
140 jsonschema==4.17.3
141 attrs==22.2.0
141 attrs==22.2.0
142 pyrsistent==0.19.3
142 pyrsistent==0.19.3
143 jupyter_core==5.2.0
143 jupyter_core==5.2.0
144 platformdirs==3.5.1
144 platformdirs==3.5.1
145 traitlets==5.9.0
145 traitlets==5.9.0
146 traitlets==5.9.0
146 traitlets==5.9.0
147 packaging==23.1
147 packaging==23.1
148 pandocfilters==1.5.0
148 pandocfilters==1.5.0
149 pygments==2.15.1
149 pygments==2.15.1
150 tinycss2==1.2.1
150 tinycss2==1.2.1
151 webencodings==0.5.1
151 webencodings==0.5.1
152 traitlets==5.9.0
152 traitlets==5.9.0
153 orjson==3.9.2
153 orjson==3.9.2
154 pastescript==3.3.0
154 pastescript==3.3.0
155 paste==3.5.3
155 paste==3.5.3
156 six==1.16.0
156 six==1.16.0
157 pastedeploy==3.0.1
157 pastedeploy==3.0.1
158 six==1.16.0
158 six==1.16.0
159 premailer==3.10.0
159 premailer==3.10.0
160 cachetools==5.3.1
160 cachetools==5.3.1
161 cssselect==1.2.0
161 cssselect==1.2.0
162 cssutils==2.6.0
162 cssutils==2.6.0
163 lxml==4.9.2
163 lxml==4.9.2
164 requests==2.28.2
164 requests==2.28.2
165 certifi==2022.12.7
165 certifi==2022.12.7
166 charset-normalizer==3.1.0
166 charset-normalizer==3.1.0
167 idna==3.4
167 idna==3.4
168 urllib3==1.26.14
168 urllib3==1.26.14
169 psutil==5.9.5
169 psutil==5.9.5
170 psycopg2==2.9.6
170 psycopg2==2.9.6
171 py-bcrypt==0.4
171 py-bcrypt==0.4
172 pycmarkgfm==1.2.0
172 pycmarkgfm==1.2.0
173 cffi==1.15.1
173 cffi==1.15.1
174 pycparser==2.21
174 pycparser==2.21
175 pycryptodome==3.17
175 pycryptodome==3.17
176 pycurl==7.45.2
176 pycurl==7.45.2
177 pymysql==1.0.3
177 pymysql==1.0.3
178 pyotp==2.8.0
178 pyotp==2.8.0
179 pyparsing==3.0.9
179 pyparsing==3.1.0
180 pyramid-debugtoolbar==4.10
180 pyramid-debugtoolbar==4.10
181 pygments==2.15.1
181 pygments==2.15.1
182 pyramid==2.0.1
182 pyramid==2.0.1
183 hupper==1.12
183 hupper==1.12
184 plaster==1.1.2
184 plaster==1.1.2
185 plaster-pastedeploy==1.0.1
185 plaster-pastedeploy==1.0.1
186 pastedeploy==3.0.1
186 pastedeploy==3.0.1
187 plaster==1.1.2
187 plaster==1.1.2
188 translationstring==1.4
188 translationstring==1.4
189 venusian==3.0.0
189 venusian==3.0.0
190 webob==1.8.7
190 webob==1.8.7
191 zope.deprecation==5.0.0
191 zope.deprecation==5.0.0
192 zope.interface==6.0.0
192 zope.interface==6.0.0
193 pyramid-mako==1.1.0
193 pyramid-mako==1.1.0
194 mako==1.2.4
194 mako==1.2.4
195 markupsafe==2.1.2
195 markupsafe==2.1.2
196 pyramid==2.0.1
196 pyramid==2.0.1
197 hupper==1.12
197 hupper==1.12
198 plaster==1.1.2
198 plaster==1.1.2
199 plaster-pastedeploy==1.0.1
199 plaster-pastedeploy==1.0.1
200 pastedeploy==3.0.1
200 pastedeploy==3.0.1
201 plaster==1.1.2
201 plaster==1.1.2
202 translationstring==1.4
202 translationstring==1.4
203 venusian==3.0.0
203 venusian==3.0.0
204 webob==1.8.7
204 webob==1.8.7
205 zope.deprecation==5.0.0
205 zope.deprecation==5.0.0
206 zope.interface==6.0.0
206 zope.interface==6.0.0
207 pyramid-mailer==0.15.1
207 pyramid-mailer==0.15.1
208 pyramid==2.0.1
208 pyramid==2.0.1
209 hupper==1.12
209 hupper==1.12
210 plaster==1.1.2
210 plaster==1.1.2
211 plaster-pastedeploy==1.0.1
211 plaster-pastedeploy==1.0.1
212 pastedeploy==3.0.1
212 pastedeploy==3.0.1
213 plaster==1.1.2
213 plaster==1.1.2
214 translationstring==1.4
214 translationstring==1.4
215 venusian==3.0.0
215 venusian==3.0.0
216 webob==1.8.7
216 webob==1.8.7
217 zope.deprecation==5.0.0
217 zope.deprecation==5.0.0
218 zope.interface==6.0.0
218 zope.interface==6.0.0
219 repoze.sendmail==4.4.1
219 repoze.sendmail==4.4.1
220 transaction==3.1.0
220 transaction==3.1.0
221 zope.interface==6.0.0
221 zope.interface==6.0.0
222 zope.interface==6.0.0
222 zope.interface==6.0.0
223 transaction==3.1.0
223 transaction==3.1.0
224 zope.interface==6.0.0
224 zope.interface==6.0.0
225 python-ldap==3.4.3
225 python-ldap==3.4.3
226 pyasn1==0.4.8
226 pyasn1==0.4.8
227 pyasn1-modules==0.2.8
227 pyasn1-modules==0.2.8
228 pyasn1==0.4.8
228 pyasn1==0.4.8
229 python-memcached==1.59
229 python-memcached==1.59
230 six==1.16.0
230 six==1.16.0
231 python-pam==2.0.2
231 python-pam==2.0.2
232 python3-saml==1.15.0
232 python3-saml==1.15.0
233 isodate==0.6.1
233 isodate==0.6.1
234 six==1.16.0
234 six==1.16.0
235 lxml==4.9.2
235 lxml==4.9.2
236 xmlsec==1.3.13
236 xmlsec==1.3.13
237 lxml==4.9.2
237 lxml==4.9.2
238 pyyaml==6.0.1
238 pyyaml==6.0.1
239 redis==4.6.0
239 redis==4.6.0
240 regex==2022.10.31
240 regex==2022.10.31
241 routes==2.5.1
241 routes==2.5.1
242 repoze.lru==0.7
242 repoze.lru==0.7
243 six==1.16.0
243 six==1.16.0
244 simplejson==3.19.1
244 simplejson==3.19.1
245 sshpubkeys==3.3.1
245 sshpubkeys==3.3.1
246 cryptography==40.0.2
246 cryptography==40.0.2
247 cffi==1.15.1
247 cffi==1.15.1
248 pycparser==2.21
248 pycparser==2.21
249 ecdsa==0.18.0
249 ecdsa==0.18.0
250 six==1.16.0
250 six==1.16.0
251 sqlalchemy==1.4.49
251 sqlalchemy==1.4.49
252 greenlet==2.0.2
252 greenlet==2.0.2
253 typing_extensions==4.7.1
253 typing_extensions==4.7.1
254 supervisor==4.2.5
254 supervisor==4.2.5
255 tzlocal==4.3
255 tzlocal==4.3
256 pytz-deprecation-shim==0.1.0.post0
256 pytz-deprecation-shim==0.1.0.post0
257 tzdata==2023.3
257 tzdata==2023.3
258 unidecode==1.3.6
258 unidecode==1.3.6
259 urlobject==2.4.3
259 urlobject==2.4.3
260 waitress==2.1.2
260 waitress==2.1.2
261 weberror==0.13.1
261 weberror==0.13.1
262 paste==3.5.3
262 paste==3.5.3
263 six==1.16.0
263 six==1.16.0
264 pygments==2.15.1
264 pygments==2.15.1
265 tempita==0.5.2
265 tempita==0.5.2
266 webob==1.8.7
266 webob==1.8.7
267 webhelpers2==2.0
267 webhelpers2==2.0
268 markupsafe==2.1.2
268 markupsafe==2.1.2
269 six==1.16.0
269 six==1.16.0
270 whoosh==2.7.4
270 whoosh==2.7.4
271 zope.cachedescriptors==5.0.0
271 zope.cachedescriptors==5.0.0
272
272
273 ## uncomment to add the debug libraries
273 ## uncomment to add the debug libraries
274 #-r requirements_debug.txt
274 #-r requirements_debug.txt
General Comments 0
You need to be logged in to leave comments. Login now