From 02748d25cc9772939eb07a5f74037bb905e3cc30 Mon Sep 17 00:00:00 2001 From: Ben Webb Date: Fri, 25 Oct 2019 11:59:09 +0100 Subject: [PATCH 1/5] [#1220] Update lib-cove to 1220-improve-non-unique-elements-error branch --- requirements.in | 2 +- requirements.txt | 2 +- requirements_dev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements.in b/requirements.in index 64a4b263a..b4084baaa 100644 --- a/requirements.in +++ b/requirements.in @@ -4,7 +4,7 @@ Django<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@v0.7.1#egg=libcoveocds -e git+https://github.com/OpenDataServices/lib-cove-web.git@v0.9.2#egg=libcoveweb --e git+https://github.com/OpenDataServices/lib-cove.git@v0.11.0#egg=libcove +-e git+https://github.com/OpenDataServices/lib-cove.git@558fe20caf3ad8da94cf079a78ffc579d7915db5#egg=libcove django-bootstrap3 django-debug-toolbar requests diff --git a/requirements.txt b/requirements.txt index b3455a542..3b261d642 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,7 +3,7 @@ Django==1.11.24 # 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@4fbdd620f40698e1566deae159e356250ed869cf#egg=libcoveocds -e git+https://github.com/OpenDataServices/lib-cove-web.git@62663c3dd6f71c57d53dc5ea7a285210b140f4ab#egg=libcoveweb --e git+https://github.com/OpenDataServices/lib-cove.git@b6323033a8634f03121b099937551e8003bb66d9#egg=libcove +-e git+https://github.com/OpenDataServices/lib-cove.git@558fe20caf3ad8da94cf079a78ffc579d7915db5#egg=libcove django-bootstrap3==11.1.0 django-debug-toolbar==2.0 requests==2.22.0 diff --git a/requirements_dev.txt b/requirements_dev.txt index b908c168a..d6313633d 100644 --- a/requirements_dev.txt +++ b/requirements_dev.txt @@ -3,7 +3,7 @@ Django==1.11.24 # 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@4fbdd620f40698e1566deae159e356250ed869cf#egg=libcoveocds -e git+https://github.com/OpenDataServices/lib-cove-web.git@62663c3dd6f71c57d53dc5ea7a285210b140f4ab#egg=libcoveweb --e git+https://github.com/OpenDataServices/lib-cove.git@b6323033a8634f03121b099937551e8003bb66d9#egg=libcove +-e git+https://github.com/OpenDataServices/lib-cove.git@558fe20caf3ad8da94cf079a78ffc579d7915db5#egg=libcove django-bootstrap3==11.1.0 django-debug-toolbar==2.0 requests==2.22.0 From e4439163e13a66bd5e8b8fd7267d30433d9b8074 Mon Sep 17 00:00:00 2001 From: Ben Webb Date: Wed, 30 Oct 2019 16:57:25 +0000 Subject: [PATCH 2/5] [#1220] Update tests with new non-unique elements errors from lib-cove --- cove_360/tests_functional.py | 2 +- .../fixtures/badfile_all_validation_errors_results.json | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/cove_360/tests_functional.py b/cove_360/tests_functional.py index 2583d0310..21c0ddea7 100644 --- a/cove_360/tests_functional.py +++ b/cove_360/tests_functional.py @@ -44,7 +44,7 @@ def server_url(request, live_server): 'Data does not use the 360Giving Standard 15 Errors', 'your data is not yet using the 360Giving standard', 'Incorrect Formats', - 'Non-unique ID Values', + 'Non-unique id values', '100% of grants do not contain any beneficiary location fields', 'Grant identifiers: 2', 'Funder organisation identifiers: 1', diff --git a/cove_ocds/fixtures/badfile_all_validation_errors_results.json b/cove_ocds/fixtures/badfile_all_validation_errors_results.json index e92fca4b1..3dc8a9965 100644 --- a/cove_ocds/fixtures/badfile_all_validation_errors_results.json +++ b/cove_ocds/fixtures/badfile_all_validation_errors_results.json @@ -91,6 +91,13 @@ "field": "releases/tender/title", "type": "string" }, + { + "description": "Array has non-unique elements", + "field": "releases", + "path": "releases", + "type": "uniqueItems", + "value": "" + }, { "value": "Last Tuesday", "description": "Date is not in the correct format", From 14080d3eacd75a2ddcbebbc81d20927452b2a901 Mon Sep 17 00:00:00 2001 From: Ben Webb Date: Thu, 31 Oct 2019 11:38:48 +0000 Subject: [PATCH 3/5] [#1220] Update lib-cove-ocds to lookup_schema-error branch --- requirements.in | 2 +- requirements.txt | 2 +- requirements_dev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements.in b/requirements.in index b4084baaa..40f04437a 100644 --- a/requirements.in +++ b/requirements.in @@ -2,7 +2,7 @@ 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@v0.7.1#egg=libcoveocds +-e git+https://github.com/open-contracting/lib-cove-ocds.git@2ca41563d8d293955c86ea6e8a9b059d6f8a138d#egg=libcoveocds -e git+https://github.com/OpenDataServices/lib-cove-web.git@v0.9.2#egg=libcoveweb -e git+https://github.com/OpenDataServices/lib-cove.git@558fe20caf3ad8da94cf079a78ffc579d7915db5#egg=libcove django-bootstrap3 diff --git a/requirements.txt b/requirements.txt index 3b261d642..65f82a761 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ pip==19.2.3 Django==1.11.24 # 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@4fbdd620f40698e1566deae159e356250ed869cf#egg=libcoveocds +-e git+https://github.com/open-contracting/lib-cove-ocds.git@2ca41563d8d293955c86ea6e8a9b059d6f8a138d#egg=libcoveocds -e git+https://github.com/OpenDataServices/lib-cove-web.git@62663c3dd6f71c57d53dc5ea7a285210b140f4ab#egg=libcoveweb -e git+https://github.com/OpenDataServices/lib-cove.git@558fe20caf3ad8da94cf079a78ffc579d7915db5#egg=libcove django-bootstrap3==11.1.0 diff --git a/requirements_dev.txt b/requirements_dev.txt index d6313633d..192e7b42f 100644 --- a/requirements_dev.txt +++ b/requirements_dev.txt @@ -1,7 +1,7 @@ pip==19.2.3 Django==1.11.24 # 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@4fbdd620f40698e1566deae159e356250ed869cf#egg=libcoveocds +-e git+https://github.com/open-contracting/lib-cove-ocds.git@2ca41563d8d293955c86ea6e8a9b059d6f8a138d#egg=libcoveocds -e git+https://github.com/OpenDataServices/lib-cove-web.git@62663c3dd6f71c57d53dc5ea7a285210b140f4ab#egg=libcoveweb -e git+https://github.com/OpenDataServices/lib-cove.git@558fe20caf3ad8da94cf079a78ffc579d7915db5#egg=libcove django-bootstrap3==11.1.0 From 2ddab9602fc963906cadc642033f87babffe237c Mon Sep 17 00:00:00 2001 From: Ben Webb Date: Thu, 31 Oct 2019 12:22:33 +0000 Subject: [PATCH 4/5] [#1220] Update lib-cove to released version 0.12.0 --- requirements.in | 2 +- requirements.txt | 3 +-- requirements_dev.txt | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/requirements.in b/requirements.in index 40f04437a..0a454c247 100644 --- a/requirements.in +++ b/requirements.in @@ -4,7 +4,7 @@ Django<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@2ca41563d8d293955c86ea6e8a9b059d6f8a138d#egg=libcoveocds -e git+https://github.com/OpenDataServices/lib-cove-web.git@v0.9.2#egg=libcoveweb --e git+https://github.com/OpenDataServices/lib-cove.git@558fe20caf3ad8da94cf079a78ffc579d7915db5#egg=libcove +-e git+https://github.com/OpenDataServices/lib-cove.git@v0.12.0#egg=libcove django-bootstrap3 django-debug-toolbar requests diff --git a/requirements.txt b/requirements.txt index 65f82a761..821ff8469 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,7 +3,7 @@ Django==1.11.24 # 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@2ca41563d8d293955c86ea6e8a9b059d6f8a138d#egg=libcoveocds -e git+https://github.com/OpenDataServices/lib-cove-web.git@62663c3dd6f71c57d53dc5ea7a285210b140f4ab#egg=libcoveweb --e git+https://github.com/OpenDataServices/lib-cove.git@558fe20caf3ad8da94cf079a78ffc579d7915db5#egg=libcove +-e git+https://github.com/OpenDataServices/lib-cove.git@b4b0cceecf644c2e8cd48f9eaa03eea9825d36bd#egg=libcove django-bootstrap3==11.1.0 django-debug-toolbar==2.0 requests==2.22.0 @@ -34,7 +34,6 @@ jdcal==1.4.1 jsonref==0.2 LEPL==5.1.3 lxml==4.4.1 - pyrsistent==0.15.4 pytz==2019.2 schema==0.7.1 diff --git a/requirements_dev.txt b/requirements_dev.txt index 192e7b42f..3f70bac96 100644 --- a/requirements_dev.txt +++ b/requirements_dev.txt @@ -3,7 +3,7 @@ Django==1.11.24 # 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@2ca41563d8d293955c86ea6e8a9b059d6f8a138d#egg=libcoveocds -e git+https://github.com/OpenDataServices/lib-cove-web.git@62663c3dd6f71c57d53dc5ea7a285210b140f4ab#egg=libcoveweb --e git+https://github.com/OpenDataServices/lib-cove.git@558fe20caf3ad8da94cf079a78ffc579d7915db5#egg=libcove +-e git+https://github.com/OpenDataServices/lib-cove.git@b4b0cceecf644c2e8cd48f9eaa03eea9825d36bd#egg=libcove django-bootstrap3==11.1.0 django-debug-toolbar==2.0 requests==2.22.0 @@ -67,7 +67,7 @@ MarkupSafe==1.1.1 mccabe==0.6.1 more-itertools==7.2.0 packaging==19.2 - +pathlib2==2.3.5 pluggy==0.13.0 py==1.8.0 pycodestyle==2.5.0 From bf2284481abf1850377aea3986281eb8b20dd12d Mon Sep 17 00:00:00 2001 From: Ben Webb Date: Fri, 1 Nov 2019 16:31:34 +0000 Subject: [PATCH 5/5] [#1220] Update lib-cove-ocds to released version 0.7.4 --- requirements.in | 2 +- requirements.txt | 2 +- requirements_dev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements.in b/requirements.in index 0a454c247..37cadefcd 100644 --- a/requirements.in +++ b/requirements.in @@ -2,7 +2,7 @@ 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@2ca41563d8d293955c86ea6e8a9b059d6f8a138d#egg=libcoveocds +-e git+https://github.com/open-contracting/lib-cove-ocds.git@0.7.4#egg=libcoveocds -e git+https://github.com/OpenDataServices/lib-cove-web.git@v0.9.2#egg=libcoveweb -e git+https://github.com/OpenDataServices/lib-cove.git@v0.12.0#egg=libcove django-bootstrap3 diff --git a/requirements.txt b/requirements.txt index 821ff8469..ea427df41 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ pip==19.2.3 Django==1.11.24 # 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@2ca41563d8d293955c86ea6e8a9b059d6f8a138d#egg=libcoveocds +-e git+https://github.com/open-contracting/lib-cove-ocds.git@56bbc1b75c86330536885c2ea4f03432c69c2579#egg=libcoveocds -e git+https://github.com/OpenDataServices/lib-cove-web.git@62663c3dd6f71c57d53dc5ea7a285210b140f4ab#egg=libcoveweb -e git+https://github.com/OpenDataServices/lib-cove.git@b4b0cceecf644c2e8cd48f9eaa03eea9825d36bd#egg=libcove django-bootstrap3==11.1.0 diff --git a/requirements_dev.txt b/requirements_dev.txt index 3f70bac96..3e5191473 100644 --- a/requirements_dev.txt +++ b/requirements_dev.txt @@ -1,7 +1,7 @@ pip==19.2.3 Django==1.11.24 # 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@2ca41563d8d293955c86ea6e8a9b059d6f8a138d#egg=libcoveocds +-e git+https://github.com/open-contracting/lib-cove-ocds.git@56bbc1b75c86330536885c2ea4f03432c69c2579#egg=libcoveocds -e git+https://github.com/OpenDataServices/lib-cove-web.git@62663c3dd6f71c57d53dc5ea7a285210b140f4ab#egg=libcoveweb -e git+https://github.com/OpenDataServices/lib-cove.git@b4b0cceecf644c2e8cd48f9eaa03eea9825d36bd#egg=libcove django-bootstrap3==11.1.0