diff --git a/.github/workflows/publish_to_pypi.yml b/.github/workflows/publish_to_pypi.yml index 71c73d0d..69611614 100644 --- a/.github/workflows/publish_to_pypi.yml +++ b/.github/workflows/publish_to_pypi.yml @@ -30,16 +30,16 @@ jobs: # This job has several steps steps: - # Checks out the master branch and then activates a relatively recent version of Python + # Checks out the master branch and then activates a recent version of Python - uses: actions/checkout@v4 with: fetch-depth: 0 - + fetch-tags: true - name: Setup the Python install uses: actions/setup-python@v4 with: - python-version: 3.8 + python-version: 3.12 # The next two chunks set up PIP properly and build the module - name: Install pypa/build @@ -50,12 +50,12 @@ jobs: --user # This SHOULD set the correct version in setup.py, taken from the tag - - name: Extract tag name - id: tag - run: echo ::set-output name=TAG_NAME::$(echo $GITHUB_REF | cut -d / -f 3) - - name: Update version in setup.py - run: >- - sed -i "s/{{VERSION_PLACEHOLDER}}/${{ steps.tag.outputs.TAG_NAME }}/g" setup.py +# - name: Extract tag name +# id: tag +# run: echo ::set-output name=TAG_NAME::$(echo $GITHUB_REF | cut -d / -f 3) +# - name: Update version in setup.py +# run: >- +# sed -i "s/{{VERSION_PLACEHOLDER}}/${{ steps.tag.outputs.TAG_NAME }}/g" setup.py - name: Build a binary wheel and source tarball run: >- diff --git a/daxa/_version.py b/daxa/_version.py index 97112426..7ed02498 100644 --- a/daxa/_version.py +++ b/daxa/_version.py @@ -1,6 +1,6 @@ # This code is a part of the Democratising Archival X-ray Astronomy (DAXA) module. -# Last modified by David J Turner (turne540@msu.edu) 09/08/2024, 15:37. Copyright (c) The Contributors +# Last modified by David J Turner (turne540@msu.edu) 23/08/2024, 16:43. Copyright (c) The Contributors # This file helps to compute a version number in source trees obtained from # git-archive tarball (such as those provided by githubs download-from-tag @@ -287,7 +287,7 @@ def git_pieces_from_vcs( # if there isn't one, this yields HEX[-dirty] (no NUM) describe_out, rc = runner(GITS, [ "describe", "--tags", "--dirty", "--always", "--long", - "--match", f"{tag_prefix}[[:digit:]]*" + "--match", f"v*" # TODO THIS IS WHERE I BODGED IT ], cwd=root) # --long was added in git-1.5.5 if describe_out is None: diff --git a/versioneer.py b/versioneer.py index 2a877f33..ac28a27c 100644 --- a/versioneer.py +++ b/versioneer.py @@ -1,6 +1,6 @@ # This code is a part of the Democratising Archival X-ray Astronomy (DAXA) module. -# Last modified by David J Turner (turne540@msu.edu) 09/08/2024, 15:37. Copyright (c) The Contributors +# Last modified by David J Turner (turne540@msu.edu) 23/08/2024, 16:43. Copyright (c) The Contributors # Version: 0.29 @@ -1325,7 +1325,7 @@ def git_pieces_from_vcs( # if there isn't one, this yields HEX[-dirty] (no NUM) describe_out, rc = runner(GITS, [ "describe", "--tags", "--dirty", "--always", "--long", - "--match", f"{tag_prefix}[[:digit:]]*" + "--match", f"v*" # TODO THIS IS WHERE I BODGED IT - IDENTICAL TO _version.py ], cwd=root) # --long was added in git-1.5.5 if describe_out is None: