Merge pull request #1166 from OpenDataServices/upgrade-libs

Upgrade libs

cove_360/tests_functional.py

@@ -407,17 +407,17 @@ def test_error_modal(server_url, browser, httpserver, source_filename):
             section.click()
         time.sleep(0.5)
 
-    browser.find_element_by_css_selector('a[data-target=".validation-errors-3"]').click()
+    browser.find_element_by_css_selector('a[data-target=".validation-errors-7"]').click()
 
-    modal = browser.find_element_by_css_selector('.validation-errors-3')
+    modal = browser.find_element_by_css_selector('.validation-errors-7')
     assert "in" in modal.get_attribute("class").split()
     modal_text = modal.text
     assert "24/07/2014" in modal_text
     assert "grants/0/awardDate" in modal_text
-    table_rows = browser.find_elements_by_css_selector('.validation-errors-4 tbody tr')
+    table_rows = browser.find_elements_by_css_selector('.validation-errors-7 tbody tr')
     assert len(table_rows) == 4
 
-    browser.find_element_by_css_selector('div.modal.validation-errors-3 button.close').click()
+    browser.find_element_by_css_selector('div.modal.validation-errors-7 button.close').click()
     browser.find_element_by_css_selector('a[data-target=".additional-checks-3"]').click()
 
     modal_additional_checks = browser.find_element_by_css_selector('.additional-checks-3')

cove_ocds/fixtures/badfile_all_validation_errors_results.json

@@ -1,5 +1,11 @@
 {
   "extensions": {},
+  "additional_checks": {
+    "empty_field": [
+      {"json_location": "releases/0/id"},
+      {"json_location": "releases/0/tag"}
+    ]
+  },
   "additional_closed_codelist_values": {
     "releases/tender/value/currency": {
       "isopen": false,

cove_ocds/lib/exceptions.py

@@ -1,7 +1,7 @@
 from django.utils.translation import ugettext_lazy as _
 from django.utils.html import mark_safe, format_html
 
-from libcoveocds.libcore.exceptions import CoveInputDataError
+from libcove.lib.exceptions import CoveInputDataError
 
 
 def raise_invalid_version_argument(version):

cove_ocds/tests.py

@@ -19,8 +19,8 @@
 from libcoveocds.lib.common_checks import get_releases_aggregates, get_bad_ocds_prefixes
 from libcoveocds.schema import SchemaOCDS
 from cove.input.models import SuppliedData
-from libcoveocds.libcore.converters import convert_json, convert_spreadsheet
-from libcoveocds.libcore.tools import cached_get_request
+from libcove.lib.converters import convert_json, convert_spreadsheet
+from libcove.lib.tools import cached_get_request
 
 
 OCDS_DEFAULT_SCHEMA_VERSION = settings.COVE_CONFIG['schema_version']

cove_ocds/views.py

@@ -17,9 +17,9 @@
 from libcoveocds.common_checks import common_checks_ocds
 from libcoveocds.schema import SchemaOCDS
 from libcoveocds.config import LibCoveOCDSConfig
-from libcoveocds.libcore.common import get_spreadsheet_meta_data
-from libcoveocds.libcore.converters import convert_spreadsheet, convert_json
-from libcoveocds.libcore.exceptions import CoveInputDataError
+from libcove.lib.common import get_spreadsheet_meta_data
+from libcove.lib.converters import convert_spreadsheet, convert_json
+from libcove.lib.exceptions import CoveInputDataError
 from . lib.ocds_show_extra import add_extra_fields
 from cove.views import explore_data_context
 

get_secret_data.sh

@@ -3,5 +3,5 @@ wget http://travis:[email protected]
 unzip ocdstestdata.zip
 wget http://travis:$TRAVIS_SECRET_FILES_PASSWORD@travis-secret-files.live3.default.opendataservices.uk0.bigv.io/360testdata.zip
 unzip 360testdata.zip
-wget http://travis:$TRAVIS_SECRET_FILES_PASSWORD@travis-secret-files.live3.default.opendataservices.uk0.bigv.io/secret_data_test_archive_7.zip
-unzip secret_data_test_archive_7.zip
+wget http://travis:$TRAVIS_SECRET_FILES_PASSWORD@travis-secret-files.live3.default.opendataservices.uk0.bigv.io/secret_data_test_archive_9.zip
+unzip secret_data_test_archive_9.zip

requirements.in

@@ -2,14 +2,15 @@ pip
 Django<1.12
 #^^ rq.filter: <1.12
 -e git+https://github.com/OpenDataServices/[email protected]#egg=flattentool
--e git+https://github.com/open-contracting/lib-cove-ocds.git@v0.2.1#egg=libcoveocds
+-e git+https://github.com/open-contracting/lib-cove-ocds.git@v0.4.0#egg=libcoveocds
 -e git+https://github.com/OpenDataServices/[email protected]#egg=libcoveweb
--e git+https://github.com/OpenDataServices/lib-cove.git@v0.3.1#egg=libcove
+-e git+https://github.com/OpenDataServices/lib-cove.git@v0.6.0#egg=libcove
 django-bootstrap3
 django-debug-toolbar
 requests
 cached-property
-dealer
+# Locking dealer as v2.1 up has some issues with Middleware
+dealer==2.0.5
 django-environ
 jsonschema
 json-merge-patch

requirements.txt

@@ -1,41 +1,43 @@
-pip==9.0.3
+pip==19.0.3
 Django==1.11.20 # rq.filter: <1.12
--e git+https://github.com/OpenDataServices/flatten-tool.git@v0.7.0#egg=flattentool
--e git+https://github.com/open-contracting/lib-cove-ocds.git@v0.2.1#egg=libcoveocds
--e git+https://github.com/OpenDataServices/lib-cove-web.git@v0.6.0#egg=libcoveweb
--e git+https://github.com/OpenDataServices/lib-cove.git@v0.3.1#egg=libcove
-django-bootstrap3==9.1.0
-django-debug-toolbar==1.9.1
+-e git+https://github.com/OpenDataServices/flatten-tool.git@524f437abe48d7f9b8a2d6a1cf6fa9a49d002b0f#egg=flattentool
+-e git+https://github.com/open-contracting/lib-cove-ocds.git@8a3d696eb614063bdec1790c0e3fda68d0445040#egg=libcoveocds
+-e git+https://github.com/OpenDataServices/lib-cove-web.git@9e75c72f7a7a255aad10d100360e85fae35f2d94#egg=libcoveweb
+-e git+https://github.com/OpenDataServices/lib-cove.git@52acb2f0dcd296b9d952ff2adbae61dc4f8dd296#egg=libcove
+django-bootstrap3==11.0.0
+django-debug-toolbar==1.11
 requests==2.21.0
-cached-property==1.4.0
+cached-property==1.5.1
+# Locking dealer as v2.1 up has some issues with Middleware
 dealer==2.0.5
-django-environ==0.4.4
-jsonschema==2.6.0
+django-environ==0.4.5
+jsonschema==3.0.1
 json-merge-patch==0.2
-python-dateutil==2.7.3
-raven==6.6.0
+python-dateutil==2.8.0
+raven==6.10.0
 strict-rfc3339==0.7
-rfc3987==1.3.7
+rfc3987==1.3.8
 rfc6266==0.0.4
-CommonMark==0.7.4
-bleach==2.1.3
-xmltodict==0.11.0
+bleach==3.1.0
+xmltodict==0.12.0
 ## The following requirements were added by pip freeze:
-certifi==2018.1.18
+attrs==19.1.0
+certifi==2019.3.9
 chardet==3.0.4
+commonmark==0.8.1
+contextlib2==0.5.5
 et-xmlfile==1.0.1
-future==0.16.0
-html5lib==1.0.1
-idna==2.6
-jdcal==1.3
-jsonref==0.1
+future==0.17.1
+idna==2.8
+jdcal==1.4
+jsonref==0.2
 LEPL==5.1.3
-lxml==4.3.0
+lxml==4.3.3
 openpyxl==2.6.2
-
-pytz==2018.3
-schema==0.6.7
-six==1.11.0
-sqlparse==0.2.4
+pyrsistent==0.14.11
+pytz==2019.1
+schema==0.7.0
+six==1.12.0
+sqlparse==0.3.0
 urllib3==1.24.1
 webencodings==0.5.1

requirements_dev.in

@@ -1,6 +1,7 @@
 -r requirements.in
 
-flake8
+# Lock to 3.5.0 as later versions catch more errors, and we'll need to fix some code to upgrade to them.
+flake8==3.5.0
 pytest
 pytest-django
 pytest-cov
@@ -13,5 +14,6 @@ libsass
 Sphinx
 -e git+https://github.com/rtfd/recommonmark.git@3238b029b6e19b9cbceb9b85d81304f86b12c012#egg=recommonmark
 sphinx_rtd_theme
-hypothesis
+# Lock as later versions have a problem with slow generation of data
+hypothesis==3.52.3
 

requirements_dev.txt

@@ -1,83 +1,93 @@
-pip==9.0.3
+pip==19.0.3
 Django==1.11.20 # rq.filter: <1.12
--e git+https://github.com/OpenDataServices/flatten-tool.git@v0.7.0#egg=flattentool
--e git+https://github.com/open-contracting/lib-cove-ocds.git@v0.2.1#egg=libcoveocds
--e git+https://github.com/OpenDataServices/lib-cove-web.git@v0.6.0#egg=libcoveweb
--e git+https://github.com/OpenDataServices/lib-cove.git@v0.3.1#egg=libcove
-django-bootstrap3==9.1.0
-django-debug-toolbar==1.9.1
+-e git+https://github.com/OpenDataServices/flatten-tool.git@524f437abe48d7f9b8a2d6a1cf6fa9a49d002b0f#egg=flattentool
+-e git+https://github.com/open-contracting/lib-cove-ocds.git@8a3d696eb614063bdec1790c0e3fda68d0445040#egg=libcoveocds
+-e git+https://github.com/OpenDataServices/lib-cove-web.git@9e75c72f7a7a255aad10d100360e85fae35f2d94#egg=libcoveweb
+-e git+https://github.com/OpenDataServices/lib-cove.git@52acb2f0dcd296b9d952ff2adbae61dc4f8dd296#egg=libcove
+django-bootstrap3==11.0.0
+django-debug-toolbar==1.11
 requests==2.21.0
-cached-property==1.4.0
+cached-property==1.5.1
+# Locking dealer as v2.1 up has some issues with Middleware
 dealer==2.0.5
-django-environ==0.4.4
-jsonschema==2.6.0
+django-environ==0.4.5
+jsonschema==3.0.1
 json-merge-patch==0.2
-python-dateutil==2.7.3
-raven==6.6.0
+python-dateutil==2.8.0
+raven==6.10.0
 strict-rfc3339==0.7
-rfc3987==1.3.7
+rfc3987==1.3.8
 rfc6266==0.0.4
-CommonMark==0.7.4
-bleach==2.1.3
-xmltodict==0.11.0
+bleach==3.1.0
+xmltodict==0.12.0
 
 
+# Lock to 3.5.0 as later versions catch more errors, and we'll need to fix some code to upgrade to them.
 flake8==3.5.0
-pytest==3.5.0
-pytest-django==3.1.2
-pytest-cov==2.5.1
-pytest-localserver==0.4.1
-pytest-xdist==1.22.2
-coveralls==1.3.0
-selenium==3.11.0
-transifex-client==0.13.1
-libsass==0.14.2
-Sphinx==1.7.2
+pytest==4.4.1
+pytest-django==3.4.8
+pytest-cov==2.6.1
+pytest-localserver==0.5.0
+pytest-xdist==1.28.0
+coveralls==1.7.0
+selenium==3.141.0
+transifex-client==0.13.6
+libsass==0.18.0
+Sphinx==2.0.1
 -e git+https://github.com/rtfd/recommonmark.git@3238b029b6e19b9cbceb9b85d81304f86b12c012#egg=recommonmark
-sphinx-rtd-theme==0.2.4
-hypothesis==3.52.0
+sphinx-rtd-theme==0.4.3
+# Lock as later versions have a problem with slow generation of data
+hypothesis==3.52.3
 ## The following requirements were added by pip freeze:
-alabaster==0.7.10
-apipkg==1.4
-attrs==17.4.0
-Babel==2.5.3
-certifi==2018.1.18
+alabaster==0.7.12
+apipkg==1.5
+atomicwrites==1.3.0
+attrs==19.1.0
+Babel==2.6.0
+certifi==2019.3.9
 chardet==3.0.4
-coverage==4.5.1
+commonmark==0.8.1
+contextlib2==0.5.5
+coverage==4.5.3
 docopt==0.6.2
 docutils==0.14
 et-xmlfile==1.0.1
-execnet==1.5.0
-future==0.16.0
-html5lib==1.0.1
-idna==2.6
-imagesize==1.0.0
-jdcal==1.3
-Jinja2==2.10
-jsonref==0.1
+execnet==1.6.0
+future==0.17.1
+idna==2.8
+imagesize==1.1.0
+jdcal==1.4
+Jinja2==2.10.1
+jsonref==0.2
 LEPL==5.1.3
-lxml==4.3.0
-MarkupSafe==1.0
+lxml==4.3.3
+MarkupSafe==1.1.1
 mccabe==0.6.1
-more-itertools==4.1.0
+more-itertools==7.0.0
 openpyxl==2.6.2
-packaging==17.1
-
-pluggy==0.6.0
-py==1.5.3
+packaging==19.0
+pathlib2==2.3.3
+pluggy==0.9.0
+py==1.8.0
 pycodestyle==2.3.1
 pyflakes==1.6.0
-Pygments==2.2.0
-pyparsing==2.2.0
-pytest-forked==0.2
-python-slugify==1.2.5
-pytz==2018.3
-schema==0.6.7
-six==1.11.0
+Pygments==2.3.1
+pyparsing==2.4.0
+pyrsistent==0.14.11
+pytest-forked==1.0.2
+python-slugify==1.2.6
+pytz==2019.1
+schema==0.7.0
+six==1.12.0
 snowballstemmer==1.2.1
-sphinxcontrib-websupport==1.0.1
-sqlparse==0.2.4
-Unidecode==1.0.22
+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.0.23
 urllib3==1.24.1
 webencodings==0.5.1
-Werkzeug==0.14.1
+Werkzeug==0.15.2