Merge pull request #89 from sunqm/pep-625

PEP 625
pyscf · Dec 18, 2024 · 6c1acbd · 6c1acbd
2 parents 8ed37ed + 0d89553
commit 6c1acbd
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 20 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -31,15 +31,11 @@ jobs:
         run: |
             ls ${{ github.workspace }}/linux-wheels
       - name: Publish to PyPI
-        # if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
-        uses: pypa/gh-action-pypi-publish@release/v1
-        with:
-          user: __token__
-          #password: ${{ secrets.PYPI_TEST_API_TOKEN }}
-          #repository_url: https://test.pypi.org/legacy/
-          password: ${{ secrets.PYPI_API_TOKEN }}
-          packages-dir: ${{ github.workspace }}/linux-wheels
-          verbose: true
+        run: |
+            pip3 install twine
+            export TWINE_USERNAME=__token__
+            export TWINE_PASSWORD="${{ secrets.PYPI_API_TOKEN }}"
+            twine upload --verbose linux-wheels/*
 
   release-pypi-aarch64:
     runs-on: ubuntu-latest
@@ -64,7 +60,6 @@ jobs:
             mkdir -p /root/wheelhouse $src/linux-wheels && \
             sed -i "/if basename(fn) not in needed_libs:/s/basename.*libs/1/" /opt/_internal/pipx/venvs/auditwheel/lib/python*/site-packages/auditwheel/wheel_abi.py && \
             sed -i "/if src_path is None/a\                    continue" /opt/_internal/pipx/venvs/auditwheel/lib/python*/site-packages/auditwheel/repair.py && \
-            sed -i "s/numpy/h5py==3.10/" $src/pyproject.toml && \
             export PATH=/opt/python/cp39-cp39/bin:$PATH && \
             /opt/python/cp39-cp39/bin/pip wheel -v --no-deps --no-clean -w /root/wheelhouse $src && \
             export whl=`ls /root/wheelhouse/pyscf_forge-*-linux_*.whl` && \
@@ -73,15 +68,11 @@ jobs:
       run: |
         ls ${{ github.workspace }}/linux-wheels
     - name: Publish to PyPI
-      # if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
-      uses: pypa/gh-action-pypi-publish@release/v1
-      with:
-        user: __token__
-        #password: ${{ secrets.PYPI_TEST_API_TOKEN }}
-        #repository_url: https://test.pypi.org/legacy/
-        password: ${{ secrets.PYPI_API_TOKEN }}
-        packages-dir: ${{ github.workspace }}/linux-wheels
-        verbose: true
+      run: |
+          pip3 install twine
+          export TWINE_USERNAME=__token__
+          export TWINE_PASSWORD="${{ secrets.PYPI_API_TOKEN }}"
+          twine upload --verbose linux-wheels/*
 
   release-pypi-sdist:
     runs-on: ubuntu-latest
@@ -103,6 +94,12 @@ jobs:
           password: ${{ secrets.PYPI_API_TOKEN }}
           packages-dir: ${{ github.workspace }}/dist
           verbose: true
+      - name: Publish to PyPI
+        run: |
+            pip3 install twine
+            export TWINE_USERNAME=__token__
+            export TWINE_PASSWORD="${{ secrets.PYPI_API_TOKEN }}"
+            twine upload --verbose linux-wheels/*
 
 #  release-pypi-macos-x86:
 #    name: Build wheels for macos

diff --git a/setup.py b/setup.py
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-NAME = 'pyscf-forge'
+NAME = 'pyscf_forge'
 AUTHOR = 'Pyscf Developer'
 AUTHOR_EMAIL = None
 DESCRIPTION  = 'Staging ground for PySCF core features'