Skip to content

Commit

Permalink
Update CI
Browse files Browse the repository at this point in the history
  • Loading branch information
@Erotemic
Erotemic committed Sep 15, 2024
1 parent c1f8cec commit 42d65a5
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 28 deletions.
71 changes: 43 additions & 28 deletions .github/workflows/tests.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- name: Checkout source
uses: actions/checkout@v4.1.1
- name: Set up Python 3.12 for linting
uses: actions/setup-python@v5.0.0
uses: actions/setup-python@v5.1.1
with:
python-version: '3.12'
- name: Install dependencies
Expand Down Expand Up @@ -51,7 +51,7 @@ jobs:
- name: Checkout source
uses: actions/checkout@v4.1.1
- name: Set up Python 3.12
uses: actions/setup-python@v5.0.0
uses: actions/setup-python@v5.1.1
with:
python-version: '3.12'
- name: Upgrade pip
Expand All @@ -62,9 +62,9 @@ jobs:
- name: Build sdist
shell: bash
run: |-
python -m pip install pip -U
python -m pip install setuptools>=0.8 wheel build
python -m pip install setuptools>=0.8 wheel build twine
python -m build --sdist --outdir wheelhouse
python -m twine check ./wheelhouse/xdoctest*.tar.gz
- name: Install sdist
run: |-
ls -al wheelhouse
Expand Down Expand Up @@ -98,11 +98,11 @@ jobs:
echo "MOD_DPATH = $MOD_DPATH"
python -m pytest --verbose --cov=xdoctest $MOD_DPATH ../tests
cd ..
- uses: actions/upload-artifact@v3.1.3
- uses: actions/upload-artifact@v4.3.1
name: Upload sdist artifact
with:
name: sdist_wheels
path: wheelhouse/*.tar.gz
path: ./wheelhouse/xdoctest*.tar.gz
build_purepy_wheels:
##
# Download and test the pure-python wheels that were build in the
Expand All @@ -128,7 +128,7 @@ jobs:
with:
platforms: all
- name: Setup Python
uses: actions/setup-python@v5.0.0
uses: actions/setup-python@v5.1.1
with:
python-version: ${{ matrix.python-version }}
- name: Build pure wheel
Expand All @@ -140,10 +140,10 @@ jobs:
- name: Show built files
shell: bash
run: ls -la wheelhouse
- uses: actions/upload-artifact@v3.1.3
- uses: actions/upload-artifact@v4.3.1
name: Upload wheels artifact
with:
name: wheels
name: wheels-${{ matrix.os }}-${{ matrix.arch }}
path: ./wheelhouse/xdoctest*.whl
test_purepy_wheels:
name: ${{ matrix.python-version }} on ${{ matrix.os }}, arch=${{ matrix.arch }} with ${{ matrix.install-extras }}
Expand Down Expand Up @@ -273,13 +273,14 @@ jobs:
with:
platforms: all
- name: Setup Python
uses: actions/setup-python@v5.0.0
uses: actions/setup-python@v5.1.1
with:
python-version: ${{ matrix.python-version }}
- uses: actions/download-artifact@v2.1.1
- uses: actions/download-artifact@v4.1.2
name: Download wheels
with:
name: wheels
pattern: wheels-*
merge-multiple: true
path: wheelhouse
- name: Install wheel ${{ matrix.install-extras }}
shell: bash
Expand All @@ -291,11 +292,23 @@ jobs:
echo "Installing helpers"
pip install setuptools>=0.8 setuptools_scm wheel build -U
pip install tomli pkginfo
export WHEEL_FPATH=$(python -c "import pathlib; print(str(sorted(pathlib.Path('wheelhouse').glob('xdoctest*.whl'))[-1]).replace(chr(92), chr(47)))")
export MOD_VERSION=$(python -c "from pkginfo import Wheel; print(Wheel('$WHEEL_FPATH').version)")
echo "$WHEEL_FPATH=WHEEL_FPATH"
echo "$INSTALL_EXTRAS=INSTALL_EXTRAS"
echo "$MOD_VERSION=MOD_VERSION"
export WHEEL_FPATH=$(python -c "if 1:
import pathlib
dist_dpath = pathlib.Path('wheelhouse')
candidates = list(dist_dpath.glob('xdoctest*.whl'))
candidates += list(dist_dpath.glob('xdoctest*.tar.gz'))
fpath = sorted(candidates)[-1]
print(str(fpath).replace(chr(92), chr(47)))
")
export MOD_VERSION=$(python -c "if 1:
from pkginfo import Wheel, SDist
fpath = '$WHEEL_FPATH'
cls = Wheel if fpath.endswith('.whl') else SDist
print(cls(fpath).version)
")
echo "WHEEL_FPATH=$WHEEL_FPATH"
echo "INSTALL_EXTRAS=$INSTALL_EXTRAS"
echo "MOD_VERSION=$MOD_VERSION"
pip install --prefer-binary "xdoctest[$INSTALL_EXTRAS]==$MOD_VERSION" -f wheelhouse
echo "Install finished."
- name: Test wheel ${{ matrix.install-extras }}
Expand Down Expand Up @@ -350,7 +363,7 @@ jobs:
file: ./coverage.xml
token: ${{ secrets.CODECOV_TOKEN }}
test_deploy:
name: Uploading Test to PyPi
name: Deploy Test
runs-on: ubuntu-latest
if: github.event_name == 'push' && ! startsWith(github.event.ref, 'refs/tags') && ! startsWith(github.event.ref, 'refs/heads/release')
needs:
Expand All @@ -359,12 +372,13 @@ jobs:
steps:
- name: Checkout source
uses: actions/checkout@v4.1.1
- uses: actions/download-artifact@v2.1.1
- uses: actions/download-artifact@v4.1.2
name: Download wheels
with:
name: wheels
pattern: wheels-*
merge-multiple: true
path: wheelhouse
- uses: actions/download-artifact@v2.1.1
- uses: actions/download-artifact@v4.1.2
name: Download sdist
with:
name: sdist_wheels
Expand Down Expand Up @@ -413,7 +427,7 @@ jobs:
ots stamp wheelhouse/*.whl wheelhouse/*.tar.gz wheelhouse/*.asc
ls -la wheelhouse
twine upload --username __token__ --password "$TWINE_PASSWORD" --repository-url "$TWINE_REPOSITORY_URL" wheelhouse/*.whl wheelhouse/*.tar.gz --skip-existing --verbose || { echo "failed to twine upload" ; exit 1; }
- uses: actions/upload-artifact@v3.1.3
- uses: actions/upload-artifact@v4.3.1
name: Upload deploy artifacts
with:
name: deploy_artifacts
Expand All @@ -424,7 +438,7 @@ jobs:
wheelhouse/*.asc
wheelhouse/*.ots
live_deploy:
name: Uploading Live to PyPi
name: Deploy Live
runs-on: ubuntu-latest
if: github.event_name == 'push' && (startsWith(github.event.ref, 'refs/tags') || startsWith(github.event.ref, 'refs/heads/release'))
needs:
Expand All @@ -433,12 +447,13 @@ jobs:
steps:
- name: Checkout source
uses: actions/checkout@v4.1.1
- uses: actions/download-artifact@v2.1.1
- uses: actions/download-artifact@v4.1.2
name: Download wheels
with:
name: wheels
pattern: wheels-*
merge-multiple: true
path: wheelhouse
- uses: actions/download-artifact@v2.1.1
- uses: actions/download-artifact@v4.1.2
name: Download sdist
with:
name: sdist_wheels
Expand Down Expand Up @@ -487,7 +502,7 @@ jobs:
ots stamp wheelhouse/*.whl wheelhouse/*.tar.gz wheelhouse/*.asc
ls -la wheelhouse
twine upload --username __token__ --password "$TWINE_PASSWORD" --repository-url "$TWINE_REPOSITORY_URL" wheelhouse/*.whl wheelhouse/*.tar.gz --skip-existing --verbose || { echo "failed to twine upload" ; exit 1; }
- uses: actions/upload-artifact@v3.1.3
- uses: actions/upload-artifact@v4.3.1
name: Upload deploy artifacts
with:
name: deploy_artifacts
Expand All @@ -508,7 +523,7 @@ jobs:
steps:
- name: Checkout source
uses: actions/checkout@v4.1.1
- uses: actions/download-artifact@v2.1.1
- uses: actions/download-artifact@v4.1.2
name: Download artifacts
with:
name: deploy_artifacts
Expand Down
1 change: 1 addition & 0 deletions pyproject.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ url = "https://github.com/Erotemic/xdoctest"
license = "Apache 2"
dev_status = "stable"
typed = true
skip_overwrite = ["MANIFEST.in"]
classifiers = [
"Development Status :: 5 - Production/Stable",
"Intended Audience :: Developers",
Expand Down
Empty file modified setup.py
100644 → 100755
View file
Empty file.

0 comments on commit 42d65a5

Please sign in to comment.