Skip to content

Commit a4c5589

Browse files
committed
Remove the need for pypyp
Signed-off-by: cobalt <61329810+cobaltt7@users.noreply.github.com>
1 parent 40b1c63 commit a4c5589

2 files changed

Lines changed: 14 additions & 12 deletions

File tree

.github/workflows/pypi_upload.yml

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@ jobs:
3636
run: |
3737
{
3838
cibuildwheel --print-build-identifiers --platform linux \
39-
| pyp 'json.dumps({"only": x, "os": "ubuntu-latest"})' \
40-
&& cibuildwheel --print-build-identifiers --platform macos \
41-
| pyp 'json.dumps({"only": x, "os": "macos-latest"})' \
42-
&& cibuildwheel --print-build-identifiers --platform windows \
43-
| pyp 'json.dumps({"only": x, "os": "windows-latest"})' \
44-
&& cibuildwheel --print-build-identifiers --platform windows --archs ARM64 \
45-
| pyp 'json.dumps({"only": x, "os": "windows-11-arm"})'
46-
} | pyp 'json.dumps(list(map(json.loads, lines)))' > /tmp/matrix
39+
| jq -Rn '[{"only": inputs, "os": "ubuntu-latest"}]'
40+
cibuildwheel --print-build-identifiers --platform macos \
41+
| jq -Rn '[{"only": inputs, "os": "macos-latest"}]'
42+
cibuildwheel --print-build-identifiers --platform windows \
43+
| jq -Rn '[{"only": inputs, "os": "windows-latest"}]'
44+
cibuildwheel --print-build-identifiers --platform windows --archs ARM64 \
45+
| jq -Rn '[{"only": inputs, "os": "windows-11-arm"}]'
46+
} | jq -cs 'add' > /tmp/matrix
4747
env:
4848
CIBW_ARCHS_LINUX: x86_64
4949
CIBW_ARCHS_MACOS: x86_64 arm64
@@ -54,9 +54,11 @@ jobs:
5454
github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'ci: build all wheels')
5555
run: |
5656
{
57-
CIBW_BUILD="cp310-*" cibuildwheel --print-build-identifiers --platform linux | pyp 'json.dumps({"only": x, "os": "ubuntu-latest"})'
58-
CIBW_BUILD="cp314-*" cibuildwheel --print-build-identifiers --platform windows | pyp 'json.dumps({"only": x, "os": "windows-latest"})'
59-
} | pyp 'json.dumps(list(map(json.loads, lines)))' > /tmp/matrix
57+
CIBW_BUILD="cp310-*" cibuildwheel --print-build-identifiers --platform linux \
58+
| jq -Rn '[{"only": inputs, "os": "ubuntu-latest"}]'
59+
CIBW_BUILD="cp314-*" cibuildwheel --print-build-identifiers --platform windows \
60+
| jq -Rn '[{"only": inputs, "os": "windows-latest"}]'
61+
} | jq -cs 'add' > /tmp/matrix
6062
env:
6163
CIBW_ARCHS_LINUX: x86_64
6264

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ jupyter = ["ipython>=7.8.0", "tokenize-rt>=3.2.0"]
7676

7777
[dependency-groups]
7878
hatch = ["hatch==1.15.1", "hatch-fancy-pypi-readme", "hatch-vcs", "virtualenv<21.0.0"]
79-
cibw = ["cibuildwheel==3.4.0", "pypyp"]
79+
cibw = ["cibuildwheel==3.4.0"]
8080
pyinstaller = ["pyinstaller"]
8181

8282
dev = [{ include-group = "cov-tests" }, { include-group = "tox" }, "pre-commit"]

0 commit comments

Comments
 (0)