Merge pull request #697 from libAtoms/fix-pypi-version-override

Fix PyPI version override for tagged releases

Author: jameskermode

.github/workflows/Build.yml

@@ -60,7 +60,7 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           pip install numpy ase meson-python build
-          pip install 'git+https://github.com/jameskermode/f90wrap.git@master'
+          pip install 'f90wrap>=0.3.0'
         env:
           FC: gfortran
           CC: gcc
@@ -92,10 +92,11 @@ jobs:
 
   # Builds the QUIP docs webpage image. This only happens ON the public
   # branch, after tests pass and pull requests are completed
+  # TEMPORARILY DISABLED - needs investigation
   docs:
     runs-on: ubuntu-latest
     needs: build
-    if: github.ref == 'refs/heads/public'
+    if: false  # github.ref == 'refs/heads/public'
 
     steps:
       - name: Checkout repository
@@ -141,10 +142,11 @@ jobs:
   # Builds the QUIP docker image. This takes about 1h 20min
   # this only happens ON the public branch, after pull requests
   # are completed
+  # TEMPORARILY DISABLED - needs investigation
   docker:
     runs-on: ubuntu-latest
     needs: build # depends on the previous matrix jobs to succeed
-    if: github.ref == 'refs/heads/public'
+    if: false  # github.ref == 'refs/heads/public'
 
     steps:
       - name: Checkout repository

.github/workflows/build-wheels.yml

@@ -34,6 +34,19 @@ jobs:
       - name: Install cibuildwheel
         run: python -m pip install cibuildwheel==2.21.1
 
+      - name: Set version from git tag
+        if: startsWith(github.ref, 'refs/tags/v')
+        run: |
+          VERSION="${GITHUB_REF#refs/tags/v}"
+          echo "Setting version to $VERSION from tag"
+          echo "$VERSION" > quippy/VERSION
+          # Update meson.build version (meson-python reads from project() call)
+          # Only update the project version line, not meson_version
+          sed -i.bak "s/^  version: '[^']*'/  version: '$VERSION'/" quippy/meson.build
+          rm -f quippy/meson.build.bak
+          echo "Updated quippy/meson.build:"
+          head -5 quippy/meson.build
+
       - name: Determine architecture
         id: arch
         run: |
@@ -69,7 +82,7 @@ jobs:
         env:
           # Skip Python 2.7, 3.5, 3.6, 3.7, 3.8, PyPy, and musllinux (requires Python >=3.9)
           CIBW_SKIP: "cp27-* cp35-* cp36-* cp37-* cp38-* pp* *musllinux*"
-          CIBW_BUILD_VERBOSITY: 3
+          CIBW_BUILD_VERBOSITY: 1
 
           # Use manylinux2014 for Linux
           CIBW_MANYLINUX_X86_64_IMAGE: "manylinux2014"