versioning updates

Author: rweigel

.zenodo.json

@@ -2,7 +2,7 @@
     "description": "Python client for HAPI", 
     "license": "other-open", 
     "title": "hapi-server/client-python:", 
-    "version": "v0.2.1", 
+    "version": "0.2.8b1", 
     "upload_type": "software", 
     "publication_date": "2021-10-06", 
     "creators": [
@@ -13,11 +13,6 @@
     ], 
     "access_right": "open", 
     "related_identifiers": [
-        {
-            "scheme": "url", 
-            "identifier": "https://github.com/hapi-server/client-python/tree/v0.2.1", 
-            "relation": "isSupplementTo"
-        }, 
         {
             "scheme": "doi", 
             "identifier": "10.5281/zenodo.5553155", 

CHANGES.txt

@@ -112,3 +112,6 @@ v0.2.7b1:
 v0.2.7:
 	2026-05-02 -- Support for Python 2.7 dropped. This is last release with support for 3.5 through 3.8.
 v0.2.8b0:
+	2026-05-02 -- Documentation
+v0.2.8b1:
+	2026-05-02 -- Versioning updates

Makefile

@@ -50,7 +50,7 @@ PYTHONVERS=python3.14 python3.13 python3.12 python3.11 python3.10 python3.9 pyth
 
 # VERSION is updated in "make version-update" step and derived
 # from CHANGES.txt. Do not edit.
-VERSION=0.2.8b0
+VERSION=0.2.8b1
 SHELL:= /bin/bash
 
 LONG_TESTS=false

hapiclient/__init__.py

@@ -10,7 +10,7 @@
 # Allow "from hapiclient import HAPIError"
 from hapiclient.util import HAPIError
 
-__version__ = '0.2.8b0'
+__version__ = '0.2.8b1'
 
 import sys
 import platform

hapiclient/hapi.py

@@ -177,7 +177,7 @@ def hapiopts():
 def hapi(*args, **kwargs):
     """Request data from a HAPI server.
 
-    Version: 0.2.8b0
+    Version: 0.2.8b1
 
 
     Examples

misc/version.py

@@ -23,16 +23,27 @@
 version = version.rstrip()
 print("Using version = " + version)
 
-fnames = ["Makefile", "setup.py", "hapiclient/hapi.py", "hapiclient/__init__.py"]
-regexes = ["VERSION=(.*)", "version=(.*)", "Version: (.*)", "__version__ = (.*)"]
-replaces = ["VERSION=" + version, "version='" + version + "',", "Version: " + version, "__version__ = '" + version + "'"]
-for i in range(len(fnames)):
+fnames = {
+	"Makefile": r"^(VERSION=)(.*)$",
+	"setup.py": r"^(\s*version=')(.*)(',\s*)$",
+	"hapiclient/hapi.py": r"^(\s*Version: )(.*)$",
+	"hapiclient/__init__.py": r"^(__version__ = ')(.*)('$)",
+	".zenodo.json": r'^(\s*"version": ")(.*)(",?\s*)$'
+}
+
+def replace_version(match):
+	prefix = match.group(1)
+	suffix = match.group(3) if match.lastindex == 3 else ''
+	return prefix + version + suffix
+
+
+for fname, regex in fnames.items():
 	updated = False
 	lines = ''
-	fin = open(fnames[i])
-	print("Scanning " + fnames[i])
+	fin = open(fname)
+	print("Scanning " + fname)
 	for lineo in fin:
-		line1 = re.sub(regexes[i], replaces[i], lineo)
+		line1 = re.sub(regex, replace_version, lineo)
 		if lineo != line1:
 			print("Original: " + lineo.rstrip())
 			print("Modified: " + line1.rstrip())
@@ -44,10 +55,10 @@
 		print("  Version in file was already up-to-date.")
 		continue
 
-	with open(fnames[i] + ".tmp", "w") as fout:
+	with open(fname + ".tmp", "w") as fout:
 		fout.write(lines)
-	print("Wrote " + fnames[i] + ".tmp")
+	print("Wrote " + fname + ".tmp")
 
 	if overwrite:
-		os.rename(fnames[i] + ".tmp", fnames[i])
-		print("  Renamed " + fnames[i] + ".tmp" + " to " + fnames[i])
+		os.rename(fname + ".tmp", fname)
+		print("  Renamed " + fname + ".tmp" + " to " + fname)

setup.py

@@ -32,7 +32,7 @@
 # version is modified by misc/version.py (executed from Makefile). Do not edit.
 setup(
     name='hapiclient',
-    version='0.2.8b0',
+    version='0.2.8b1',
     author='Bob Weigel',
     author_email='rweigel@gmu.edu',
     packages=find_packages(),