Skip to content

Commit 58ceced

Browse files
committed
ci: use cibuildwheel, refresh matrix
1 parent 88cc1f4 commit 58ceced

File tree

1 file changed

+27
-53
lines changed

1 file changed

+27
-53
lines changed

.github/workflows/ci.yml

Lines changed: 27 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ jobs:
1717
strategy:
1818
matrix:
1919
test:
20-
- {PY: "3.8", TOXENV: "lint"}
20+
- {PY: "3.10", TOXENV: "lint"}
2121
steps:
2222
- name: "Checkout"
23-
uses: actions/checkout@v2
23+
uses: actions/checkout@v3
2424

2525
- name: "Setup Python ${{matrix.test.PY}}"
2626
uses: actions/setup-python@v2
@@ -41,20 +41,17 @@ jobs:
4141
strategy:
4242
matrix:
4343
test:
44-
- {os: "ubuntu-18.04", osname: "Ubuntu 18.04", PY: "3.6", TOXENV: "py36", arch: "x64"}
45-
- {os: "ubuntu-18.04", osname: "Ubuntu 18.04", PY: "3.7", TOXENV: "py37", arch: "x64"}
46-
- {os: "ubuntu-20.04", osname: "Ubuntu 20.04", PY: "3.8", TOXENV: "py38", arch: "x64"}
47-
- {os: "ubuntu-20.04", osname: "Ubuntu 20.04", PY: "3.9", TOXENV: "py39", arch: "x64"}
48-
- {os: "macos-10.15", osname: "MacOS 10.15", PY: "3.8", TOXENV: "py38", arch: "x64"}
49-
- {os: "windows-2016", osname: "Windows 2016", PY: "3.6", TOXENV: "py36", arch: "x86"}
50-
- {os: "windows-2016", osname: "Windows 2016", PY: "3.7", TOXENV: "py37", arch: "x64"}
51-
- {os: "windows-2019", osname: "Windows 2019", PY: "3.8", TOXENV: "py38", arch: "x86"}
52-
- {os: "windows-2019", osname: "Windows 2019", PY: "3.9", TOXENV: "py39", arch: "x64"}
53-
- {os: "ubuntu-20.04", osname: "Ubuntu 20.04", PY: "pypy-3.6", TOXENV: "pypy36", arch: "x64"}
54-
- {os: "ubuntu-20.04", osname: "Ubuntu 20.04", PY: "pypy-3.7", TOXENV: "pypy37", arch: "x64"}
44+
- {os: "ubuntu-latest", osname: "Linux", PY: "3.7", TOXENV: "py37", arch: "x64"}
45+
- {os: "ubuntu-latest", osname: "Linux", PY: "3.8", TOXENV: "py38", arch: "x64"}
46+
- {os: "ubuntu-latest", osname: "Linux", PY: "3.9", TOXENV: "py39", arch: "x64"}
47+
- {os: "ubuntu-latest", osname: "Linux", PY: "3.10", TOXENV: "py310", arch: "x64"}
48+
- {os: "macos-latest", osname: "MacOS", PY: "3.10", TOXENV: "py310", arch: "x64"}
49+
- {os: "windows-latest", osname: "Windows", PY: "3.9", TOXENV: "py39", arch: "x86"}
50+
- {os: "windows-latest", osname: "Windows", PY: "3.10", TOXENV: "py310", arch: "x64"}
51+
#- {os: "ubuntu-latest", osname: "Linux", PY: "pypy-3.9", TOXENV: "pypy39", arch: "x64"}
5552
steps:
5653
- name: "Checkout"
57-
uses: actions/checkout@v2
54+
uses: actions/checkout@v3
5855

5956
- name: "Setup Python ${{matrix.test.PY}}"
6057
uses: actions/setup-python@v2
@@ -78,14 +75,14 @@ jobs:
7875
#if: false
7976
#name: "database test (disabled)"
8077
name: "PostgreSQL ${{matrix.test.PG}} + Python ${{matrix.test.PY}}"
81-
runs-on: ubuntu-20.04
78+
runs-on: ubuntu-latest
8279
strategy:
8380
matrix:
8481
test:
85-
- {PY: "3.8", PG: "12", TOXENV: "py38"}
82+
- {PY: "3.10", PG: "14", TOXENV: "py310"}
8683
steps:
8784
- name: "Checkout"
88-
uses: actions/checkout@v2
85+
uses: actions/checkout@v3
8986

9087
- name: "Setup Python ${{matrix.test.PY}}"
9188
uses: actions/setup-python@v2
@@ -139,47 +136,24 @@ jobs:
139136
pg_ctl -D data stop
140137
rm -rf data log /tmp/.s.PGSQL*
141138
142-
test_linux_wheels:
143-
name: "Wheel: manylinux2014"
144-
runs-on: ubuntu-20.04
145-
steps:
146-
- uses: actions/checkout@v2
147-
- uses: actions/setup-python@v2
148-
with:
149-
python-version: "3.8"
150-
- run: |
151-
python setup.py sdist
152-
mv dist sdist
153-
- uses: "docker://quay.io/pypa/manylinux2014_x86_64:latest"
154-
with: {entrypoint: "./.github/workflows/manylinux.sh"}
155-
- uses: "docker://quay.io/pypa/manylinux2014_i686:latest"
156-
with: {entrypoint: "./.github/workflows/manylinux.sh"}
157-
- uses: actions/upload-artifact@v2
158-
with: {name: "dist", path: "dist"}
159-
160-
test_other_wheels:
161-
name: "Wheel: ${{matrix.sys.name}}-${{matrix.sys.pyarch}}-${{matrix.pyver}}"
139+
cibuildwheel:
140+
name: "Wheels: ${{matrix.sys.name}}"
162141
runs-on: ${{matrix.sys.os}}
163142
strategy:
164143
matrix:
165144
sys:
166-
- {os: "macos-10.15", name: "MacOS 10.15", pyarch: "x64"}
167-
- {os: "windows-2019", name: "Windows 2019", pyarch: "x86"}
168-
- {os: "windows-2019", name: "Windows 2019", pyarch: "x64"}
169-
pyver: ["3.6"]
145+
- {os: "ubuntu-latest", name: "Linux", arches: "auto"}
146+
- {os: "macos-latest", name: "MacOS", arches: "x86_64 arm64 universal2"}
147+
- {os: "windows-latest", name: "Windows", arches: "auto"}
170148
steps:
171-
- uses: actions/checkout@v2
172-
- uses: actions/setup-python@v2
173-
with: {architecture: "${{matrix.sys.pyarch}}", python-version: "${{matrix.pyver}}"}
174-
- run: |
175-
python setup.py sdist
176-
mv dist sdist
177-
- name: "Build"
149+
- uses: actions/checkout@v3
150+
- uses: pypa/cibuildwheel@v2.8.0
151+
env:
152+
CIBW_ARCHS: ${{matrix.sys.arches}}
153+
- name: "Check"
178154
shell: bash
179155
run: |
180-
pip install --disable-pip-version-check -U wheel
181-
pip wheel -v --disable-pip-version-check --build-option --py-limited-api=cp36 -w dist sdist/*.tar.gz
182-
ls -l dist
183-
- uses: actions/upload-artifact@v2
184-
with: {name: "dist", path: "dist"}
156+
ls -l wheelhouse
157+
- uses: actions/upload-artifact@v3
158+
with: {name: "dist", path: "wheelhouse"}
185159

0 commit comments

Comments
 (0)