Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve non unique elements errors #1241

Merged
merged 6 commits into from
Nov 5, 2019
Merged

Improve non unique elements errors #1241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
02748d2
[#1220] Update lib-cove to 1220-improve-non-unique-elements-error branch
Bjwebb Oct 25, 2019
e443916
[#1220] Update tests with new non-unique elements errors from lib-cove
Bjwebb Oct 30, 2019
14080d3
[#1220] Update lib-cove-ocds to lookup_schema-error branch
Bjwebb Oct 31, 2019
2ddab96
[#1220] Update lib-cove to released version 0.12.0
Bjwebb Oct 31, 2019
bf22844
[#1220] Update lib-cove-ocds to released version 0.7.4
Bjwebb Nov 1, 2019
81ab7e9
Merge branch 'master' into 1220-improve-non-unique-elements-error
Bjwebb Nov 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cove_360/tests_functional.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
7 changes: 7 additions & 0 deletions cove_ocds/fixtures/badfile_all_validation_errors_results.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions requirements.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ 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@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.11.0#egg=libcove
-e git+https://github.com/OpenDataServices/lib-cove.git@v0.12.0#egg=libcove
django-bootstrap3
django-debug-toolbar
requests
Expand Down
5 changes: 2 additions & 3 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
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@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@b6323033a8634f03121b099937551e8003bb66d9#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
Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions requirements_dev.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
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@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@b6323033a8634f03121b099937551e8003bb66d9#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
Expand Down Expand Up @@ -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
Expand Down