Skip to content

Commit

Permalink
Merge branch 'main' into wrapper
Browse files Browse the repository at this point in the history
  • Loading branch information
mgei01 committed Sep 26, 2024
2 parents dfee7a5 + ea75604 commit 42d28b6
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docs-gh-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
runs-on: [ubuntu-latest]
container: python:3.10-bookworm
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install dependencies
run: |
apt-get update
Expand Down
33 changes: 23 additions & 10 deletions .github/workflows/pypi-deploy.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
name: Build and upload to PyPI

on:
workflow_dispatch:
release:
type: [published]
types: [published]

env:
CIBW_BUILD: cp37-* cp38-* cp39-* cp310-*
Expand All @@ -18,11 +19,11 @@ jobs:
matrix:
os: [ubuntu-latest] #, windows-latest]
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
fetch-depth: 0

- uses: actions/setup-python@v2
- uses: actions/setup-python@v5
name: Install Python
with:
python-version: '3.10'
Expand All @@ -35,20 +36,21 @@ jobs:
run: |
# python -m cibuildwheel --output-dir wheelhouse
python setup.py bdist_wheel
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v4
with:
name: artifact-wheel-${{ matrix.os }}
path: ./dist/*.whl


build_sdist:
name: Build source distribution
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
fetch-depth: 0

- uses: actions/setup-python@v2
- uses: actions/setup-python@v5
name: Install Python
with:
python-version: '3.10'
Expand All @@ -60,21 +62,32 @@ jobs:
- name: Build sdist
run: python setup.py sdist

- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v4
with:
name: artifact-sdist
path: dist/*.tar.gz

upload_pypi:
needs: [build_wheels, build_sdist]
runs-on: ubuntu-latest
if: github.event_name == 'release' && github.event.action == 'published'
steps:
- uses: actions/download-artifact@v2
- uses: actions/download-artifact@v4
with:
name: artifact
name: artifact-sdist
path: dist

- uses: pypa/gh-action-pypi-publish@master
# - uses: actions/download-artifact@v4
# with:
# name: artifact-wheel-windows-latest
# path: dist

- uses: actions/download-artifact@v4
with:
name: artifact-wheel-ubuntu-latest
path: dist

- uses: pypa/[email protected]
with:
user: __token__
password: ${{ secrets.upload_pypi }}
4 changes: 2 additions & 2 deletions .github/workflows/pytest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ jobs:
python-version: ["3.8", "3.9", "3.10"]

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
Expand Down

0 comments on commit 42d28b6

Please sign in to comment.