Merge pull request #77 from OpenDataServices/variable-name-typo

lib.common: Fix typo of var name, so messages are grouped correctly.

.github/workflows/integration.yml

@@ -44,6 +44,14 @@ jobs:
         pip install -e ./lib-cove-${{ matrix.cove }}/
         pip list
 
+    - name: Compile Messages
+      if: matrix.cove == 'ocds'
+      run: |
+        cd cove-${{ matrix.cove }}
+        python manage.py compilemessages
+        # Ensure that compilemessages gets run for lib-cove-web
+        pushd /opt/hostedtoolcache; pwd; django-admin compilemessages; popd
+
     - name: Test cove instance
       run: |
         cd cove-${{ matrix.cove }}

CHANGELOG.md

@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [0.22.1] - 2021-04-08
+
+### Fixed
+
+- Fix a typo of a variable name, that meant `date-time` and `uri` validation messages were incorrectly grouped
+
 ## [0.22.0] - 2021-02-25
 
 ### Changed

libcove/lib/common.py

@@ -849,7 +849,7 @@ def get_schema_validation_errors(
         ]:
             instance = e.instance
 
-        if e.validator == "format" and e.validator not in ["date-time", "uri"]:
+        if e.validator == "format" and validator_type not in ["date-time", "uri"]:
             instance = e.instance
 
         if getattr(e, "error_id", None) in ["oneOf_any", "oneOf_each"]:

setup.py

@@ -2,7 +2,7 @@
 
 setup(
     name="libcove",
-    version="0.22.0",
+    version="0.22.1",
     author="Open Data Services",
     author_email="[email protected]",
     url="https://github.com/OpenDataServices/lib-cove",