Skip to content

Commit b78c007

Browse files
committed
.github/workflows/dist.yml: Customize, replace pythonpublish.yml
1 parent a7a25a2 commit b78c007

File tree

2 files changed

+8
-34
lines changed

2 files changed

+8
-34
lines changed

.github/workflows/dist.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
name: Build sdist (and upload to PyPI on release tags)
1717
runs-on: ubuntu-latest
1818
env:
19-
CAN_DEPLOY: ${{ secrets.SAGEMATH_PYPI_API_TOKEN != '' }}
19+
CAN_DEPLOY: ${{ secrets.PYPI_PASSWORD != '' }}
2020
steps:
2121
- uses: actions/checkout@v4
2222
- uses: actions/setup-python@v4
@@ -30,8 +30,8 @@ jobs:
3030
name: dist
3131
- uses: pypa/gh-action-pypi-publish@release/v1
3232
with:
33-
user: __token__
34-
password: ${{ secrets.SAGEMATH_PYPI_API_TOKEN }}
33+
user: ${{ secrets.PYPI_USERNAME }}
34+
password: ${{ secrets.PYPI_PASSWORD }}
3535
skip_existing: true
3636
verbose: true
3737
if: env.CAN_DEPLOY == 'true' && github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
@@ -56,7 +56,7 @@ jobs:
5656
# SPKGs to install as system packages
5757
SPKGS: _bootstrap _prereq
5858
# Non-Python packages to install as spkgs
59-
TARGETS_PRE: PyNormaliz-build-deps
59+
TARGETS_PRE: gmp mpfr normaliz
6060
# Disable building PyPy wheels on all platforms
6161
# Disable musllinux until #33083 provides alpine package information
6262
CIBW_SKIP: "pp* *-musllinux*"
@@ -99,7 +99,7 @@ jobs:
9999
export PATH=build/bin:$PATH
100100
export CIBW_BEFORE_ALL="( $(sage-print-system-package-command debian --yes --no-install-recommends install $(sage-get-system-packages debian $SPKGS)) || $(sage-print-system-package-command fedora --yes --no-install-recommends install $(sage-get-system-packages fedora $SPKGS | sed s/pkg-config/pkgconfig/)) || ( $(sage-print-system-package-command homebrew --yes --no-install-recommends install $(sage-get-system-packages homebrew $SPKGS)) || $(sage-print-system-package-command alpine --yes --no-install-recommends install $(sage-get-system-packages alpine $SPKGS)) || echo error ignored) ) && ./bootstrap && ./configure --enable-build-as-root --enable-fat-binary && MAKE=\"make -j6\" make V=0 $TARGETS_PRE"
101101
mkdir -p unpacked
102-
for pkg in PyNormaliz; do
102+
for pkg in pynormaliz; do
103103
(cd unpacked && tar xfz - ) < dist/$pkg*.tar.gz
104104
"${{ steps.python.outputs.python-path }}" -m pipx run cibuildwheel==2.18.0 unpacked/$pkg*
105105
done
@@ -117,7 +117,7 @@ jobs:
117117
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
118118
runs-on: ubuntu-latest
119119
env:
120-
CAN_DEPLOY: ${{ secrets.SAGEMATH_PYPI_API_TOKEN != '' }}
120+
CAN_DEPLOY: ${{ secrets.PYPI_PASSWORD != '' }}
121121
steps:
122122

123123
- uses: actions/download-artifact@v4
@@ -129,8 +129,8 @@ jobs:
129129
- name: Publish package distributions to PyPI
130130
uses: pypa/gh-action-pypi-publish@release/v1
131131
with:
132-
user: __token__
133-
password: ${{ secrets.SAGEMATH_PYPI_API_TOKEN }}
132+
user: ${{ secrets.PYPI_USERNAME }}
133+
password: ${{ secrets.PYPI_PASSWORD }}
134134
packages_dir: wheelhouse/
135135
skip_existing: true
136136
verbose: true

.github/workflows/pythonpublish.yml

Lines changed: 0 additions & 26 deletions
This file was deleted.

0 commit comments

Comments
 (0)