Merge pull request #328 from zivid/MISC-2025-07-03-drop-local-version-on-master

Do not add local version on master branch

Author: johningve

continuous-integration/deployment/check_expected_artifacts.py

@@ -13,8 +13,9 @@ def _expected_artifacts(repository, commit_hash, ref):
     version = version_file.read_text().strip()
     if repository != ZIVID_PYTHON or ref != MASTER_REF:
         # On all branches but master in the zivid/zivid-python repo, a .dev0 suffix will be added to the version.
-        version += ".dev0"
-    return [artifact.format(version=version, commit_hash=commit_hash[:8]) for artifact in artifacts]
+        version += ".dev0" + f"+{commit_hash[:8]}"
+
+    return [artifact.format(version=version) for artifact in artifacts]
 
 
 def _present_artifacts():

continuous-integration/deployment/expected-artifacts.txt

@@ -1,8 +1,8 @@
-zivid-{version}+{commit_hash}-cp37-cp37m-win_amd64.whl
-zivid-{version}+{commit_hash}-cp38-cp38-win_amd64.whl
-zivid-{version}+{commit_hash}-cp39-cp39-win_amd64.whl
-zivid-{version}+{commit_hash}-cp310-cp310-win_amd64.whl
-zivid-{version}+{commit_hash}-cp311-cp311-win_amd64.whl
-zivid-{version}+{commit_hash}-cp312-cp312-win_amd64.whl
-zivid-{version}+{commit_hash}-cp313-cp313-win_amd64.whl
-zivid-{version}+{commit_hash}.tar.gz
+zivid-{version}-cp37-cp37m-win_amd64.whl
+zivid-{version}-cp38-cp38-win_amd64.whl
+zivid-{version}-cp39-cp39-win_amd64.whl
+zivid-{version}-cp310-cp310-win_amd64.whl
+zivid-{version}-cp311-cp311-win_amd64.whl
+zivid-{version}-cp312-cp312-win_amd64.whl
+zivid-{version}-cp313-cp313-win_amd64.whl
+zivid-{version}.tar.gz

setup.py

@@ -31,10 +31,6 @@ def _determine_package_version():
     github_repository = os.getenv("GITHUB_REPOSITORY")
     github_ref = os.getenv("GITHUB_REF")
 
-    if github_repository != "zivid/zivid-python" or github_ref != "refs/heads/master":
-        # Only the master branch of the zivid-python repository is considered stable.
-        version_segments.append("dev0")
-
     local_version_segments = []
 
     if sdk_version.get("pre_release"):
@@ -50,7 +46,15 @@ def _determine_package_version():
     else:
         local_version_segments.append("unofficial")
 
-    version = ".".join(version_segments) + "+" + ".".join(local_version_segments)
+    if github_repository != "zivid/zivid-python" or github_ref != "refs/heads/master":
+        # Only the master branch of the zivid-python repository is considered stable.
+        # Anywhere else the version will be a development version, and we add the local version.
+        version_segments.append("dev0")
+        version = ".".join(version_segments) + "+" + ".".join(local_version_segments)
+    else:
+        # Stable releases must not include a local version to be allowed to upload to PyPI.
+        version = ".".join(version_segments)
+
 
     return canonicalize_version(version, strip_trailing_zero=False)