Merge pull request #464 from HXLStandard/HDX-73

Hdx 73

hxl_proxy/controllers.py

@@ -13,7 +13,7 @@
 
 from hxl_proxy import admin, app, auth, cache, caching, dao, exceptions, filters, pcodes, preview, recipes, util, validate
 
-import datetime, flask, hxl, io, json, logging, requests, requests_cache, signal, werkzeug, csv, urllib
+import datetime, flask, hxl, importlib, io, json, logging, requests, requests_cache, signal, werkzeug, csv, urllib
 
 from hxl.util import logup
 
@@ -205,12 +205,9 @@ def about():
     we can tell easily what's deployed.
     """
     # include version information for these packages
-    releases = {
-        'hxl-proxy': hxl_proxy.__version__,
-        'libhxl': hxl.__version__,
-        'flask': flask.__version__,
-        'requests': requests.__version__
-    }
+    releases = {}
+    for package in ['hxl-proxy', 'libhxl', 'flask', 'flask-caching', 'redis', 'requests', 'requests_cache', 'structlog', 'urllib3',]:
+        releases[package] = importlib.metadata.version(package)
 
     # draw the web page
     return flask.render_template('about.html', releases=releases)

requirements.txt

@@ -1,11 +1,11 @@
-urllib3==2.0.2
-git+https://github.com/HXLStandard/libhxl-python.git@dev#egg=libhxl # for development
-#libhxl==5.0 # for release
+urllib3==1.25.5       # avoid caching bug
+requests_cache==0.9.8 # avoid caching bug
 ckanapi>=3.5
-flask-caching
 flask>=2.1.2
 mysql-connector-python>=8.0.29
+git+https://github.com/HXLStandard/libhxl-python.git@dev#egg=libhxl # for development
+#libhxl==5.01 # for release
+flask-caching
 redis
-requests==2.31.0
-requests_cache
+requests
 structlog

setup.py

@@ -31,16 +31,16 @@
     include_package_data = True,
     zip_safe = False,
     install_requires=[
-        'urllib3', # version required by requests
-        'libhxl @ git+https://github.com/HXLStandard/libhxl-python.git@dev', # for development
-        #'libhxl==5.0', # for release
+        'urllib3==1.25.5',       # avoid caching bug
+        'requests_cache==0.9.8', # avoid caching bug
         'ckanapi>=3.5',
-        'flask-caching',
         'flask>=2.1.2',
         'mysql-connector-python>=8.0.29',
+        'libhxl @ git+https://github.com/HXLStandard/libhxl-python.git@dev', # for development
+        #'libhxl==5.01', # for release
+        'flask-caching',
         'redis',
         'requests',
-        'requests_cache',
         'structlog',
     ],
     dependency_links=[