From 961faa8b3d639928ac9b3fab12bb8966fa10fab8 Mon Sep 17 00:00:00 2001 From: Graeme Watt Date: Wed, 1 Dec 2021 13:58:45 +0000 Subject: [PATCH 1/2] requirements: bump hepdata-validator to v0.3.2 --- hepdata/version.py | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hepdata/version.py b/hepdata/version.py index 39419666..aa9e9764 100644 --- a/hepdata/version.py +++ b/hepdata/version.py @@ -28,4 +28,4 @@ and parsed by ``setup.py``. """ -__version__ = "0.9.4dev20211130" +__version__ = "0.9.4dev20211201" diff --git a/requirements.txt b/requirements.txt index 9914e5a0..5ceddde1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -14,7 +14,7 @@ Flask-Login==0.3.2 gevent==1.4.0 gunicorn==19.5.0 hepdata-converter-ws-client==0.2.2 -hepdata-validator==0.3.1 +hepdata-validator==0.3.2 invenio-access==1.4.2 # Indirect (needed by invenio-admin) invenio-accounts==1.4.6 invenio-admin==1.3.0 From 9dbaf6f43d02a3c05da865d1adea7d6ee4de338d Mon Sep 17 00:00:00 2001 From: Graeme Watt Date: Wed, 1 Dec 2021 14:07:45 +0000 Subject: [PATCH 2/2] tests: modify test_old_submission_yaml * cmenergies 1.383-1.481 passes after fix HEPData/hepdata-validator#42. * Change test data to an invalid value of '1.383-1.481 GeV' instead. --- tests/submission_test.py | 2 +- tests/test_data/test_v0_submission/submission.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/submission_test.py b/tests/submission_test.py index 9f0f1943..6f50b293 100644 --- a/tests/submission_test.py +++ b/tests/submission_test.py @@ -274,7 +274,7 @@ def test_old_submission_yaml(app, admin_idx): )) assert(errors['submission.yaml'][1]['level'] == 'error') assert(errors['submission.yaml'][1]['message'].startswith( - "Invalid value (in GeV) for cmenergies: '1.383-1.481'" + "Invalid value (in GeV) for cmenergies: '1.383-1.481 GeV'" )) # Use old schema - should now work diff --git a/tests/test_data/test_v0_submission/submission.yaml b/tests/test_data/test_v0_submission/submission.yaml index 77505082..c8ff918a 100644 --- a/tests/test_data/test_v0_submission/submission.yaml +++ b/tests/test_data/test_v0_submission/submission.yaml @@ -17,6 +17,6 @@ keywords: - name: phrases values: [Exclusive, Polarization, Photoproduction] - name: cmenergies - values: [1.383-1.481] + values: [1.383-1.481 GeV] name: Table 1 table_doi: 10.17182/hepdata.21754.v1/t1