Merge pull request #482 from HXLStandard/dev

dev into prod
HXLStandard · Jan 18, 2024 · 03a7b23 · 03a7b23
2 parents 90b2e8d + 60baa91
commit 03a7b23
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 7 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,8 @@
+2024-01-18 Release 2.2:
+    - fix pcodes urls
+	- require libhxl==5.2:
+	  - update URLs for test files on GitHub
+	  - fixed bug in aggregators that excluded tag patterns ending in "!"
 2023-09-26 Release 2.1:
 	- remove all SQL support
 	- require libhxl==5.1 to reduce logging output

diff --git a/hxl_proxy/__init__.py b/hxl_proxy/__init__.py
@@ -8,7 +8,7 @@
 
 """
 
-__version__="2.1.1"
+__version__="2.2"
 """Module version number
 See https://www.python.org/dev/peps/pep-0396/
 

diff --git a/hxl_proxy/pcodes.py b/hxl_proxy/pcodes.py
@@ -16,19 +16,19 @@
 #
 # Constants
 #
-COUNTRY_URL_PATTERN = 'http://gistmaps.itos.uga.edu/arcgis/rest/services/COD_External/{country}_pcode/MapServer/layers?f=pjson'
+COUNTRY_URL_PATTERN = 'https://codgis.itos.uga.edu/arcgis/rest/services/COD_External/{country}_pcode/MapServer/layers?f=pjson'
 """Pattern for constructing an iTOS URL for country metadata"""
 
-PCODES_URL_PATTERN = 'http://gistmaps.itos.uga.edu/arcgis/rest/services/COD_External/{country}_pcode/MapServer/{level}/query?where=1%3D1&outFields=*&returnGeometry=false&f=pjson'
+PCODES_URL_PATTERN = 'https://codgis.itos.uga.edu/arcgis/rest/services/COD_External/{country}_pcode/MapServer/{level}/query?where=1%3D1&outFields=*&returnGeometry=false&f=pjson'
 """Pattern for constructing an iTOS URL for P-codes"""
 
 PCODE_HEADER_PATTERNS = {
     r'^admin0RefName$': '#country+name+ref',
     r'^admin0Name_([a-z]{2})$': '#country+i_\\1+name',
-    r'^admin0Pcode$': '#country+code+iso2',
+    r'^ADM0_PCODE$': '#country+code+iso2',
     r'^admin([1-9])RefName$': '#adm\\1+name+ref',
     r'^admin([1-9])Name_([a-z]{2})$': '#adm\\1+i_\\2+name',
-    r'^admin([1-9])Pcode$': '#adm\\1+code',
+    r'^ADM([1-9])_PCODE$': '#adm\\1+code',
 }
 """Regular expressions mapping iTOS headers to HXL hashtags"""
 

diff --git a/requirements.txt b/requirements.txt
@@ -3,7 +3,7 @@ requests_cache
 ckanapi>=3.5
 flask>=2.2.5<2.3      # 2.3 messes up pip dependencies
 #git+https://github.com/HXLStandard/libhxl-python.git@dev#egg=libhxl # for development
-libhxl==5.1         # for release
+libhxl==5.2         # for release
 flask-caching
 redis
 requests

diff --git a/setup.cfg b/setup.cfg
@@ -26,7 +26,7 @@ install_requires =
     ckanapi>=3.5
     flask>=2.2.5<2.3     # 2.3 messes up pip dependencies
     #libhxl @ git+https://github.com/HXLStandard/libhxl-python.git@dev # for development
-    libhxl==5.1        # for release
+    libhxl==5.2        # for release
     flask-caching
     redis
     structlog