Parse DJ_VERSION from pyproject.toml

datajoint · Sep 19, 2024 · 9dbc10e · 9dbc10e
1 parent 16e4347
commit 9dbc10e
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/development.yaml b/.github/workflows/development.yaml
@@ -34,7 +34,7 @@ jobs:
           python-version: ${{matrix.py_ver}}
       - name: Validate version and release notes
         run: |
-          DJ_VERSION=$(grep -oP '\d+\.\d+\.\d+' datajoint/version.py)
+          DJ_VERSION=$(grep -m 1 version pyproject.toml | grep -oP '\d+\.\d+\.\d+')
           RELEASE_BODY=$(python3 -c \
             'print(open("./CHANGELOG.md").read().split("\n\n")[1].split("\n", 1)[1])' \
           )
@@ -167,7 +167,7 @@ jobs:
           python-version: ${{matrix.py_ver}}
       - name: Determine package version
         run: |
-          DJ_VERSION=$(grep -oP '\d+\.\d+\.\d+' datajoint/version.py)
+          DJ_VERSION=$(grep -m 1 version pyproject.toml | grep -oP '\d+\.\d+\.\d+')
           RELEASE_BODY=$(python -c \
             'print(open("./CHANGELOG.md").read().split("\n\n")[1].split("\n", 1)[1])' \
           )

diff --git a/datajoint/version.py b/datajoint/version.py
@@ -1,10 +1,10 @@
 try:
-	# Use datajoint/_version.py written by setuptools_scm if it exists
-	# This module is not tracked in VCS and defines a __version_tuple__ like
-	# (0, 14, 3, 'dev224', 'g0812fe17.d20240919')
+    # Use datajoint/_version.py written by setuptools_scm if it exists
+    # This module is not tracked in VCS and defines a __version_tuple__ like
+    # (0, 14, 3, 'dev224', 'g0812fe17.d20240919')
     from ._version import __version_tuple__ as version_tuple
 except ImportError:
-	version_tuple = (0, 14, 3)
+    version_tuple = (0, 14, 3)
 
 __version__ = ".".join(str(x) for x in version_tuple[:3])
 

diff --git a/docker-compose-build.yaml b/docker-compose-build.yaml
@@ -1,4 +1,4 @@
-# PY_VER=3.9 IMAGE=djbase DISTRO=debian DJ_VERSION=$(grep -oP '\d+\.\d+\.\d+' datajoint/version.py) HOST_UID=$(id -u) docker compose -f docker-compose-build.yaml up --exit-code-from app --build
+# PY_VER=3.9 IMAGE=djbase DISTRO=debian DJ_VERSION=$(grep -m 1 version pyproject.toml | grep -oP '\d+\.\d+\.\d+') HOST_UID=$(id -u) docker compose -f docker-compose-build.yaml up --exit-code-from app --build
 #
 # Intended for updating dependencies and docker image.
 # Used to build release artifacts.

diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -1,4 +1,4 @@
-# DJ_VERSION=$(grep -oP '\d+\.\d+\.\d+' datajoint/version.py) docker compose --profile test up --build --exit-code-from djtest djtest
+# DJ_VERSION=$(grep -m 1 version pyproject.toml | grep -oP '\d+\.\d+\.\d+') docker compose --profile test up --build --exit-code-from djtest djtest
 services:
   db:
     image: datajoint/mysql:${MYSQL_VER:-8.0}

diff --git a/docs/docker-compose.yaml b/docs/docker-compose.yaml
@@ -27,7 +27,7 @@ services:
         elif echo "$${MODE}" | grep -iE "qa|build" &>/dev/null; then
             git branch -D gh-pages || true
             git fetch $${UPSTREAM_REPO} gh-pages:gh-pages || true
-            mike deploy --config-file ./docs/mkdocs.yaml -u $$(grep -oE '\d+\.\d+' /main/$${PACKAGE}/version.py) latest
+            mike deploy --config-file ./docs/mkdocs.yaml -u $$(grep -m 1 version /main/pyproject.toml | grep -oP '\d+\.\d+\.\d+') latest
             mike set-default --config-file ./docs/mkdocs.yaml latest
             if echo "$${MODE}" | grep -i qa &>/dev/null; then
                 mike serve --config-file ./docs/mkdocs.yaml -a 0.0.0.0:80