Merge pull request #367 from HXLStandard/dev

Prepare 5.2 release
HXLStandard · Jan 10, 2024 · cc34c0c · cc34c0c
2 parents 115809f + 50e7ac5
commit cc34c0c
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 8 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,7 @@
+2024-01-10 Release 5.2
+	- update URLs for test files on GitHub
+	- fixed bug in aggregators that excluded tag patterns ending in "!"
+
 2023-09-25 Release 5.1
 	- reduce log level for failed number conversion from INFO to DEBUG
 

diff --git a/Makefile b/Makefile
@@ -48,6 +48,7 @@ test-install:
 publish-pypi: $(VENV)
 	rm -rf dist/*
 	git checkout upstream/prod
+	git pull upstream prod
 	. $(VENV) \
 	  && pip install twine \
 	  && python setup.py sdist && twine upload dist/*

diff --git a/hxl/__init__.py b/hxl/__init__.py
@@ -81,7 +81,7 @@
 if sys.version_info < (3,):
     raise RuntimeError("libhxl requires Python 3 or higher")
 
-__version__="5.1"
+__version__="5.2"
 """Module version number
 see https://www.python.org/dev/peps/pep-0396/
 """

diff --git a/hxl/filters.py b/hxl/filters.py
@@ -512,7 +512,7 @@ def lt(a, b):
         else:
             raise HXLFilterException("Bad aggregator type for count filter: {}".format(type))
 
-    TAG_PATTERN = r'#?{token}(?:\s*[+-]{token})*'.format(token=hxl.datatypes.TOKEN_PATTERN)
+    TAG_PATTERN = r'#?{token}(?:\s*[+-]{token})*!?'.format(token=hxl.datatypes.TOKEN_PATTERN)
     """Regular expression for a tag pattern"""
 
     COL_PATTERN = r'#{token}(?:\s*\+{token})*'.format(token=hxl.datatypes.TOKEN_PATTERN)

diff --git a/setup.py b/setup.py
@@ -11,7 +11,7 @@
 
 setup(
     name='libhxl',
-    version="5.1",
+    version="5.2",
     description='Python support library for the Humanitarian Exchange Language (HXL). See http://hxlstandard.org and https://github.com/HXLStandard/libhxl-python',
     long_description=long_description,
     long_description_content_type="text/markdown",

diff --git a/tests/test_filters.py b/tests/test_filters.py
@@ -131,7 +131,7 @@ def test_count(self):
         filtered = self.source.recipe({
             'filter': 'count',
             'patterns': 'sector',
-            'aggregators': 'sum(affected)'
+            'aggregators': 'sum(#affected!)'
         })
         self.assertEqual(type(filtered).__name__, 'CountFilter')
 

diff --git a/tests/test_input.py b/tests/test_input.py
@@ -62,11 +62,11 @@ def _resolve_file(filename):
 FILE_NOTAG2 = _resolve_file('./files/test_io/input-notag2.html')
 FILE_BINARY_INVALID = _resolve_file('./files/test_io/input-invalid.png')
 
-URL_CSV = 'https://raw.githubusercontent.com/HXLStandard/libhxl-python/main/tests/files/test_io/input-valid.csv'
+URL_CSV = 'https://raw.githubusercontent.com/HXLStandard/libhxl-python/prod/tests/files/test_io/input-valid.csv'
 URL_CSV_HXL_EXT = 'https://ourairports.com/countries/CA/airports.hxl'
-URL_XLSX = 'https://raw.githubusercontent.com/HXLStandard/libhxl-python/main/tests/files/test_io/input-valid.xlsx'
-URL_XLS = 'https://raw.githubusercontent.com/HXLStandard/libhxl-python/test/tests/files/test_io/input-valid.xls'
-URL_JSON = 'https://raw.githubusercontent.com/HXLStandard/libhxl-python/main/tests/files/test_io/input-valid.json'
+URL_XLSX = 'https://raw.githubusercontent.com/HXLStandard/libhxl-python/prod/tests/files/test_io/input-valid.xlsx'
+URL_XLS = 'https://raw.githubusercontent.com/HXLStandard/libhxl-python/prod/tests/files/test_io/input-valid.xls'
+URL_JSON = 'https://raw.githubusercontent.com/HXLStandard/libhxl-python/prod/tests/files/test_io/input-valid.json'
 URL_GOOGLE_SHEET_NOHASH = 'https://docs.google.com/spreadsheets/d/1VTswL-w9EI0IdGIBFZoZ-2RmIiebXKsrhv03yd7LlIg/edit'
 URL_GOOGLE_SHEET_HASH = 'https://docs.google.com/spreadsheets/d/1VTswL-w9EI0IdGIBFZoZ-2RmIiebXKsrhv03yd7LlIg/edit#gid=299366282'
 URL_GOOGLE_FILE = 'https://drive.google.com/file/d/1iA0QU0CEywwCr-zDswg7C_RwZgLqS3gb/view'