Update for PyPI publish.

CLQCD · Nov 4, 2024 · aac8d39 · aac8d39
1 parent ec161f8
commit aac8d39
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 16 deletions.
diff --git a/.github/workflows/PyQUDA-Utils.yaml b/.github/workflows/PyQUDA-Utils.yaml
@@ -1,4 +1,4 @@
-name: PyQUDA-Utils sdist
+name: PyQUDA-Utils publish
 
 on:
   workflow_dispatch:
@@ -9,10 +9,17 @@ on:
         default: 0.0.0
 
 jobs:
-  build:
+  pypi-publish:
 
     runs-on: ubuntu-latest
 
+    environment:
+      name: pypi
+      url: https://pypi.org/p/PyQUDA-Utils
+
+    permissions:
+      id-token: write  # IMPORTANT: this permission is mandatory for trusted publishing
+
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -34,6 +41,8 @@ jobs:
         if: github.event_name == 'workflow_dispatch' && github.event.inputs.tag != ''
         uses: softprops/action-gh-release@v1
         with:
-          tag_name: v${{ github.event.inputs.tag }}
           files: dist/pyquda_utils-${{ github.event.inputs.tag }}.tar.gz
           fail_on_unmatched_files: true
+
+    - name: Publish sdist
+      uses: pypa/gh-action-pypi-publish@release/v1
diff --git a/.github/workflows/PyQUDA.yaml b/.github/workflows/PyQUDA.yaml
@@ -1,4 +1,4 @@
-name: PyQUDA sdist
+name: PyQUDA publish
 
 on:
   workflow_dispatch:
@@ -9,10 +9,17 @@ on:
         default: 0.0.0
 
 jobs:
-  build:
+  pypi-publish:
 
     runs-on: ubuntu-latest
 
+    environment:
+      name: pypi
+      url: https://pypi.org/p/PyQUDA
+
+    permissions:
+      id-token: write  # IMPORTANT: this permission is mandatory for trusted publishing
+
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -28,7 +35,7 @@ jobs:
         run: python -m pip install --upgrade pip setuptools wheel Cython build
 
       - name: Build sdist
-        run: cd pyquda_core && python -m build . --sdist
+        run: python -m build ./pyquda_core --sdist
 
       - name: Upload sdist
         if: github.event_name == 'workflow_dispatch' && github.event.inputs.tag != ''
@@ -37,3 +44,9 @@ jobs:
           tag_name: v${{ github.event.inputs.tag }}
           files: pyquda_core/dist/pyquda-${{ github.event.inputs.tag }}.tar.gz
           fail_on_unmatched_files: true
+
+      - name: Prepare sdist
+        run: mv ./pyquda_core/sdist ./
+
+    - name: Publish sdist
+      uses: pypa/gh-action-pypi-publish@release/v1
diff --git a/example/1_Quenched_HMC.py b/example/1_Quenched_HMC.py
@@ -3,8 +3,8 @@
 from time import perf_counter
 
 from pyquda import init
-from pyquda.utils import io
 from pyquda.field import LatticeInfo, LatticeGauge, Nc
+from pyquda_utils import io
 
 from hmc import HMC
 

diff --git a/example/2_Quark_Propagator.py b/example/2_Quark_Propagator.py
@@ -3,9 +3,9 @@
 from opt_einsum import contract
 from matplotlib import pyplot as plt
 
-from pyquda import init, core, LatticeInfo
-from pyquda.utils import io, gamma, source
+from pyquda import init, LatticeInfo
 from pyquda.field import LatticePropagator, Ns, Nc
+from pyquda_utils import core, io, gamma, source
 
 init([1, 1, 1, 2], resource_path=".cache")
 

diff --git a/example/3_Pion_Proton_2pt.py b/example/3_Pion_Proton_2pt.py
@@ -4,8 +4,8 @@
 from opt_einsum import contract
 from matplotlib import pyplot as plt
 
-from pyquda import init, core, LatticeInfo
-from pyquda.utils import io, gamma
+from pyquda import init, LatticeInfo
+from pyquda_utils import core, io, gamma
 
 init([1, 1, 1, 2], resource_path=".cache")
 

diff --git a/example/4_Pion_PCAC.py b/example/4_Pion_PCAC.py
@@ -3,8 +3,8 @@
 from opt_einsum import contract
 from matplotlib import pyplot as plt
 
-from pyquda import init, core, LatticeInfo
-from pyquda.utils import io, gamma
+from pyquda import init, LatticeInfo
+from pyquda_utils import core, io, gamma
 
 init([1, 1, 1, 2], resource_path=".cache")
 

diff --git a/example/5_Pion_Dispersion.py b/example/5_Pion_Dispersion.py
@@ -3,8 +3,8 @@
 from opt_einsum import contract
 from matplotlib import pyplot as plt
 
-from pyquda import init, core, LatticeInfo
-from pyquda.utils import io, gamma, phase
+from pyquda import init, LatticeInfo
+from pyquda_utils import core, io, gamma, phase
 
 init([1, 1, 1, 2], resource_path=".cache")
 

diff --git a/setup.py b/setup.py
@@ -7,6 +7,6 @@
     if describe != "":
         tag, post, hash = describe.strip().split("-")
         with open(os.path.join(os.path.dirname(__file__), "pyquda_utils", "_version.py"), "w") as f:
-            f.write(f'__version__ = "{tag[1:]}.post{post}+{hash}"\n')
+            f.write(f'__version__ = "{tag[1:]}.dev{post}"\n')
 
 setup()