Better dynamic version handling

arista-eosplus · May 2, 2024 · 909d4af · 909d4af
1 parent 62809f6
commit 909d4af
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/.github/workflows/publish-to-pypi.yml b/.github/workflows/publish-to-pypi.yml
@@ -28,10 +28,8 @@ jobs:
           pip install
           dunamai
           --user
-      - name: Fix version
-        run: dunamai from git --no-metadata > VERSION
       - name: Build a binary wheel and a source tarball
-        run: python3 -m build
+        run: DYNAMIC_VERSION=$(dunamai from git --no-metadata) python3 -m build
       - name: Store the distribution packages
         uses: actions/upload-artifact@v4
         with:

diff --git a/Makefile b/Makefile
@@ -96,10 +96,10 @@ install:
 	$(PYTHON) setup.py install
 
 sdist: clean ztpserver.spec
-	$(PYTHON) setup.py sdist
+	DYNAMIC_VERSION=$$(dunamai from git --no-metadata) $(PYTHON) setup.py sdist
 
 sdist-dev: clean ztpserver.spec
-	DEV_VERSION_HASH=$$(git rev-parse --short HEAD) $(PYTHON) setup.py sdist
+	DYNAMIC_VERSION=$$(dunamai from git) $(PYTHON) setup.py sdist
 
 docker_dev: sdist
 	@docker build -t ${IMG} .

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.0.1.dev0
+0.0.0 #uses dynamic version with: dunamai from git --no-metadata
diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -1 +1,2 @@
 mock
+dunamai
diff --git a/setup.py b/setup.py
@@ -99,6 +99,8 @@ def get_long_description():
     x.strip() for x in install_requirements if x.strip() and "dev only" not in x
 ]
 version = open("VERSION").read().split()[0].strip()
+if os.environ.get("DYNAMIC_VERSION"):
+    version = os.environ.get("DYNAMIC_VERSION")
 if os.environ.get("DEV_VERSION_HASH"):
     version = f"{version}+{os.environ.get('DEV_VERSION_HASH')}"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		2.0.1.dev0
		0.0.0 #uses dynamic version with: dunamai from git --no-metadata