Skip to content

Commit bec06af

Browse files
Fix ci release (#250)
* ci: align wheel building to kiwi * pyproject: fix licence fields * ci: fix duplicate builds in release
1 parent 3e69445 commit bec06af

File tree

3 files changed

+8
-16
lines changed

3 files changed

+8
-16
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ jobs:
107107
python-version: ${{ matrix.python-version }}
108108
- name: Install dependencies
109109
run: |
110-
python -m pip install --upgrade pip
110+
python -m pip install --upgrade pip setuptools
111111
pip install setuptools-scm[toml]
112112
pip install git+https://github.com/nucleic/cppy@main
113113
- name: Install project

.github/workflows/release.yml

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ jobs:
4545
strategy:
4646
matrix:
4747
os: [windows-latest, ubuntu-latest, macos-latest]
48-
python: [310, 311, 312, 313, 314]
4948
steps:
5049
- name: Checkout
5150
uses: actions/checkout@v5
@@ -63,19 +62,12 @@ jobs:
6362
python -m pip install wheel cibuildwheel
6463
- name: Build wheels
6564
env:
66-
# On Windows, we explicitly request MSVC compilers (as GitHub Action runners have
67-
# MinGW on PATH that would be picked otherwise), switch to a static build for
68-
# runtimes, but use dynamic linking for `VCRUNTIME140.dll`, `VCRUNTIME140_1.dll`,
69-
# and the UCRT. This avoids requiring specific versions of `MSVCP140.dll`, while
70-
# keeping shared state with the rest of the Python process/extensions.
71-
CIBW_CONFIG_SETTINGS_WINDOWS: >-
72-
setup-args="--vsenv"
73-
setup-args="-Db_vscrt=mt"
74-
setup-args="-Dcpp_link_args=['ucrt.lib','vcruntime.lib','/nodefaultlib:libucrt.lib','/nodefaultlib:libvcruntime.lib']"
75-
CIBW_BUILD: cp${{ matrix.python }}-*
65+
CIBW_BUILD: "cp311-* cp312-* cp313-* cp314-*"
66+
CIBW_ARCHS_MACOS: x86_64 universal2 arm64
67+
CIBW_ARCHS_LINUX: ${{ matrix.archs }}
68+
CIBW_ARCHS_WINDOWS: auto64
7669
CIBW_TEST_REQUIRES: pytest
7770
CIBW_TEST_COMMAND: python -m pytest {package}/tests -v
78-
CIBW_ARCHS_MACOS: x86_64 universal2 arm64
7971
run: |
8072
python -m cibuildwheel . --output-dir dist
8173
- name: Store artifacts

pyproject.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
description = "Memory efficient Python objects"
1212
readme = "README.rst"
1313
requires-python = ">=3.10"
14-
license = { file = "LICENSE" }
14+
license = "BSD-3-Clause"
15+
license-files = ["LICENSE"]
1516
authors = [{ name = "The Nucleic Development Team", email = "sccolbert@gmail.com" }]
1617
maintainers = [{ name = "Matthieu C. Dartiailh", email = "m.dartiailh@gmail.com" }]
1718
classifiers = [
18-
"License :: OSI Approved :: BSD License",
1919
"Programming Language :: Python",
2020
"Programming Language :: Python :: 3",
2121
"Programming Language :: Python :: 3.10",
@@ -35,7 +35,7 @@
3535
changelog = "https://github.com/nucleic/atom/blob/main/releasenotes.rst"
3636

3737
[build-system]
38-
requires = ["setuptools>=61.2", "wheel", "setuptools_scm[toml]>=3.4.3", "cppy>=1.2.0"]
38+
requires = ["setuptools>=77.0", "wheel", "setuptools_scm[toml]>=3.4.3", "cppy>=1.2.0"]
3939
build-backend = "setuptools.build_meta"
4040

4141
[tool.setuptools]

0 commit comments

Comments
 (0)