Skip to content

Commit

Permalink
Merge pull request #5 from open-contracting/update-reqs
Browse files Browse the repository at this point in the history
Update libcove, and other requirements
  • Loading branch information
rhiaro authored Jan 9, 2020
2 parents 399104e + 08a8eca commit e0cc950
Show file tree
Hide file tree
Showing 5 changed files with 37 additions and 55 deletions.
4 changes: 2 additions & 2 deletions cove_ocds/test_hypothesis.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ def test_get_releases_aggregates_dict(json_data):

@pytest.mark.xfail
@pytest.mark.django_db
@pytest.mark.parametrize("current_app", ["cove-ocds"]) # , 'cove-360'])
@pytest.mark.parametrize("current_app", ["cove-ocds"])
@given(
general_json
| st.fixed_dictionaries({"releases": general_json})
Expand All @@ -51,7 +51,7 @@ def test_explore_page(client, current_app, json_data):


@pytest.mark.django_db
@pytest.mark.parametrize("current_app", ["cove-ocds"]) # , 'cove-360'])
@pytest.mark.parametrize("current_app", ["cove-ocds"])
@given(general_json)
@example(1)
@settings(max_examples=50, deadline=None)
Expand Down
6 changes: 3 additions & 3 deletions requirements.in
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
pip
Django<1.12
#^^ rq.filter: <1.12
-e git+https://github.com/OpenDataServices/flatten-tool.git@v0.9.0#egg=flattentool
-e git+https://github.com/open-contracting/lib-cove-ocds.git@0.7.4#egg=libcoveocds
flattentool>=0.9.0
libcoveocds>=0.7.4
libcove>=0.13.0
-e git+https://github.com/OpenDataServices/lib-cove-web.git@v0.10.0#egg=libcoveweb
-e git+https://github.com/OpenDataServices/lib-cove.git@v0.12.2#egg=libcove
django-bootstrap3
django-debug-toolbar
requests
Expand Down
16 changes: 8 additions & 8 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
pip==19.3.1
Django==1.11.26 # rq.filter: <1.12
-e git+https://github.com/OpenDataServices/flatten-tool.git@511cc6d1ee83d77aa7a1efe965eb3dd7e4940c1b#egg=flattentool
-e git+https://github.com/open-contracting/lib-cove-ocds.git@56bbc1b75c86330536885c2ea4f03432c69c2579#egg=libcoveocds
Django==1.11.27 # rq.filter: <1.12
flattentool==0.9.0
libcoveocds==0.7.4
libcove==0.13.0
-e git+https://github.com/OpenDataServices/lib-cove-web.git@55dad570493c9429a4821760c599b4a84f099304#egg=libcoveweb
-e git+https://github.com/OpenDataServices/lib-cove.git@269934219a1b20f1334518d3514493c48da309df#egg=libcove
django-bootstrap3==12.0.0
django-bootstrap3==12.0.3
django-debug-toolbar==2.1
requests==2.22.0
cached-property==1.5.1
Expand All @@ -29,13 +29,13 @@ commonmark==0.9.1
contextlib2==0.5.5
et-xmlfile==1.0.1
idna==2.8
importlib-metadata==1.1.0
importlib-metadata==1.3.0
jdcal==1.4.1
jsonref==0.2
LEPL==5.1.3
lxml==4.4.2
more-itertools==8.0.0
pyrsistent==0.15.6
more-itertools==8.0.2
pyrsistent==0.15.7
pytz==2019.3
schema==0.7.1
six==1.13.0
Expand Down
6 changes: 5 additions & 1 deletion requirements_dev.in
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,8 @@ pytest-django
flake8
pytest-localserver
selenium
transifex-client
transifex-client
# Lock as later versions have a problem with slow generation of data
hypothesis==3.52.3
# Lock as coverage 5 breaks hypothesis tests?
coverage<=4.5.4
60 changes: 19 additions & 41 deletions requirements_dev.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
pip==19.3.1
Django==1.11.26 # rq.filter: <1.12
-e git+https://github.com/OpenDataServices/flatten-tool.git@511cc6d1ee83d77aa7a1efe965eb3dd7e4940c1b#egg=flattentool
-e git+https://github.com/open-contracting/lib-cove-ocds.git@56bbc1b75c86330536885c2ea4f03432c69c2579#egg=libcoveocds
Django==1.11.27 # rq.filter: <1.12
flattentool==0.9.0
libcoveocds==0.7.4
libcove==0.13.0
-e git+https://github.com/OpenDataServices/lib-cove-web.git@55dad570493c9429a4821760c599b4a84f099304#egg=libcoveweb
-e git+https://github.com/OpenDataServices/lib-cove.git@269934219a1b20f1334518d3514493c48da309df#egg=libcove
django-bootstrap3==12.0.0
django-bootstrap3==12.0.3
django-debug-toolbar==2.1
requests==2.22.0
cached-property==1.5.1
Expand All @@ -22,72 +22,50 @@ xmltodict==0.12.0
rangedict==0.1.6
openpyxl==2.6.4


flake8==3.7.9
pytest==5.3.1
pytest-django==3.7.0
coveralls==1.10.0
pytest==5.3.2
pytest-cov==2.8.1
pytest-django==3.7.0
flake8==3.7.9
pytest-localserver==0.5.0
pytest-xdist==1.30.0
coveralls==1.9.2
selenium==3.141.0
transifex-client==0.13.6
libsass==0.19.4
Sphinx==2.2.2
recommonmark==0.6.0
sphinx-rtd-theme==0.4.3
transifex-client==0.13.7
# Lock as later versions have a problem with slow generation of data
hypothesis==3.52.3
# Lock as coverage 5 breaks hypothesis tests?
coverage==4.5.4
## The following requirements were added by pip freeze:
alabaster==0.7.12
apipkg==1.5
attrs==19.3.0
Babel==2.7.0
certifi==2019.11.28
chardet==3.0.4
commonmark==0.9.1
contextlib2==0.5.5
coverage==4.5.4
docopt==0.6.2
docutils==0.15.2
entrypoints==0.3
et-xmlfile==1.0.1
execnet==1.7.1
idna==2.8
imagesize==1.1.0
importlib-metadata==1.1.0
importlib-metadata==1.3.0
jdcal==1.4.1
Jinja2==2.10.3
jsonref==0.2
LEPL==5.1.3
lxml==4.4.2
MarkupSafe==1.1.1
mccabe==0.6.1
more-itertools==8.0.0
packaging==19.2
more-itertools==8.0.2
packaging==20.0
pluggy==0.13.1
py==1.8.0
py==1.8.1
pycodestyle==2.5.0
pyflakes==2.1.1
Pygments==2.5.2
pyparsing==2.4.5
pyrsistent==0.15.6
pytest-forked==1.1.3
pyparsing==2.4.6
pyrsistent==0.15.7
python-slugify==1.2.6
pytz==2019.3
schema==0.7.1
six==1.13.0
snowballstemmer==2.0.0
sphinxcontrib-applehelp==1.0.1
sphinxcontrib-devhelp==1.0.1
sphinxcontrib-htmlhelp==1.0.2
sphinxcontrib-jsmath==1.0.1
sphinxcontrib-qthelp==1.0.2
sphinxcontrib-serializinghtml==1.1.3
sqlparse==0.3.0
Unidecode==1.1.1
urllib3==1.25.7
wcwidth==0.1.7
wcwidth==0.1.8
webencodings==0.5.1
Werkzeug==0.16.0
zipp==0.6.0

0 comments on commit e0cc950

Please sign in to comment.