Skip to content

Commit

Permalink
chore(ci): update actions (#2417)
Browse files Browse the repository at this point in the history
  • Loading branch information
mayeut authored May 18, 2024
1 parent 1c7cb0a commit 5530985
Show file tree
Hide file tree
Showing 4 changed files with 41 additions and 15 deletions.
46 changes: 34 additions & 12 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,20 +37,30 @@ jobs:
archs: "x86"
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v4

# see https://cibuildwheel.pypa.io/en/stable/faq/#macos-building-cpython-38-wheels-on-arm64
- name: "Install python 3.8 universal2 on macOS arm64"
if: runner.os == 'macOS' && runner.arch == 'ARM64'
uses: actions/setup-python@v5
env:
PIP_DISABLE_PIP_VERSION_CHECK: 1
with:
python-version: 3.8

- uses: actions/setup-python@v5
with:
python-version: 3.11

- name: Create wheels + run tests
uses: pypa/cibuildwheel@v2.17.0
uses: pypa/cibuildwheel@v2.18.0
env:
CIBW_ARCHS: "${{ matrix.archs }}"
CIBW_PRERELEASE_PYTHONS: True

- name: Upload wheels
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: wheels
name: wheels-py3-${{ matrix.os }}-${{ startsWith(matrix.os, 'ubuntu') && 'all' || matrix.archs }}
path: wheelhouse

- name: Generate .tar.gz
Expand Down Expand Up @@ -78,17 +88,17 @@ jobs:

steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: 3.9

- name: Create wheels + run tests
uses: pypa/[email protected]

- name: Upload wheels
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: wheels
name: wheels-py2-${{ matrix.os }}
path: wheelhouse

- name: Generate .tar.gz
Expand All @@ -103,24 +113,36 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: 3.x
- name: 'Run linters'
run: |
python3 -m pip install ruff==0.3.4 black rstcheck toml-sort sphinx
python3 -m pip install ruff==0.4.4 black rstcheck toml-sort sphinx
make lint-all
# upload weels as a single artefact
upload-wheels:
needs: [py2, py3]
runs-on: ubuntu-latest
steps:
- uses: actions/upload-artifact/merge@v4
with:
name: wheels
pattern: wheels-*
separate-directories: false
delete-merged: true

# Check sanity of .tar.gz + wheel files
check-dist:
needs: [py2, py3]
needs: [upload-wheels]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: 3.x
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: wheels
path: wheelhouse
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/issues.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
# install python
- uses: actions/checkout@v4
- name: Install Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: '3.x'

Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ PY3_DEPS = \
pypinfo \
requests \
rstcheck \
ruff==0.3.4 \
ruff==0.4.4 \
setuptools \
sphinx_rtd_theme \
teyit \
Expand Down
6 changes: 5 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,11 @@ spaces_indent_inline_array = 4
trailing_comma_inline_array = true

[tool.cibuildwheel]
skip = ["*-musllinux*", "pp*"]
skip = [
"*-musllinux*",
"cp313-win*", # pywin32 is not available on cp313 yet
"pp*",
]
test-command = [
"env PYTHONWARNINGS=always PYTHONUNBUFFERED=1 PSUTIL_DEBUG=1 PSUTIL_SCRIPTS_DIR={project}/scripts python {project}/psutil/tests/runner.py",
"env PYTHONWARNINGS=always PYTHONUNBUFFERED=1 PSUTIL_DEBUG=1 PSUTIL_SCRIPTS_DIR={project}/scripts python {project}/psutil/tests/test_memleaks.py",
Expand Down

0 comments on commit 5530985

Please sign in to comment.