Compare commits

...
47 Commits
Author SHA1 Message Date
Joe Rickerby 9f18d385cb Bump version: v2.12.2 2023-04-18 21:11:25 +01:00
Joe Rickerby dfbc6c3902 Merge pull request #1476 from henryiii/henryiii/chore/ruff_ex
chore: ruff and typing updates
2023-04-18 20:58:15 +01:00
Henry Schreiner 8c5f89c035 chore: update typing to be generic on function args
Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com>
2023-04-18 13:06:17 -04:00
Henry Schreiner 6d038dfbdf chore: update typing to collections.abc
Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com>
2023-04-18 12:38:21 -04:00
Henry Schreiner ec9919a088 chore: add Ruff logging format check
Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com>
2023-04-18 12:01:08 -04:00
Henry Schreiner 1512427455 chore: touch up Ruff, add exe check
Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com>
2023-04-18 12:00:35 -04:00
Henry Schreiner 440e18c275 chore: minor cleanup (#1475) 2023-04-18 06:06:18 -07:00
pre-commit-ci[bot]pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>Henry Schreiner
063161f5af [pre-commit.ci] pre-commit autoupdate (#1468)
* [pre-commit.ci] pre-commit autoupdate

updates:
- [github.com/charliermarsh/ruff-pre-commit: v0.0.260 → v0.0.261](https://github.com/charliermarsh/ruff-pre-commit/compare/v0.0.260...v0.0.261)
- [github.com/pre-commit/mirrors-mypy: v1.1.1 → v1.2.0](https://github.com/pre-commit/mirrors-mypy/compare/v1.1.1...v1.2.0)

* chore: update for mypy bug

Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com>

---------

Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Henry Schreiner <henryschreineriii@gmail.com>
2023-04-17 14:06:56 -04:00
Henry Schreiner 2246313344 fix: verbosity isn't supported for pypa/build (#1474)
This was incorrectly adding an empty config setting, and it was not correct if included for build - it's a pip wheel only setting. Reported in #1471.

Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com>
2023-04-17 14:06:45 -04:00
cibuildwheel-bot[bot]andcibuildwheel-bot[bot] <83877280+cibuildwheel-bot[bot]@users.noreply.github.com> fdc0eae932 [Bot] Update dependencies (#1472)
Update dependencies

Co-authored-by: cibuildwheel-bot[bot] <83877280+cibuildwheel-bot[bot]@users.noreply.github.com>
2023-04-17 14:06:31 -04:00
David Lechner fa72100d49 fix: overwriting wheel on windows shouldn't break (#1464)
fix overwriting wheel on windows

This is the same fix as #1129 but for Windows this time.
2023-04-17 14:06:14 -04:00
Joe Rickerby 7c9b837780 Merge pull request #1461 from hoodmane/platform-interface
chore: Add a PlatformModule type
2023-04-14 12:50:42 +01:00
Joe Rickerby 1c1df68a50 Merge pull request #1469 from hoodmane/remove-pydantic-from-examples
Remove pydantic from example lists
2023-04-14 12:49:48 +01:00
Joe Rickerby 4a9d2a37a9 Merge pull request #1462 from hoodmane/default-build-frontend
Set the default build_frontend to be "default" (which is still "pip")
2023-04-14 12:44:21 +01:00
Hood Chatham 05bf46f059 Remove pydantic from example lists 2023-04-10 15:13:41 -07:00
Joe Rickerby 420ef86679 Apply @henryiii's suggestion 2023-04-10 22:24:20 +01:00
Joe Rickerby ae0ac92167 Use the platform object itself as the interface 2023-04-10 22:20:04 +01:00
Hood Chatham 26dd3f399e chore: Add a platform_interface type to export from each platform
This avoids the repetition of the platform checks in __main__.py
by defining a dataclass with `get_python_configurations` and `build`.
2023-04-10 13:30:23 -07:00
Joe Rickerby 33f642dc0b Merge pull request #1460 from hoodmane/chore-compute-platform 2023-04-10 22:22:04 +02:00
dependabot[bot]anddependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 3ed1b65b3e build(deps): bump peter-evans/create-pull-request from 4 to 5 (#1467)
Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 4 to 5.
- [Release notes](https://github.com/peter-evans/create-pull-request/releases)
- [Commits](https://github.com/peter-evans/create-pull-request/compare/v4...v5)

---
updated-dependencies:
- dependency-name: peter-evans/create-pull-request
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-04-10 18:53:08 +02:00
dependabot[bot]anddependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> e0a01d9986 build(deps): bump pypa/gh-action-pypi-publish from 1.8.4 to 1.8.5 (#1466)
Bumps [pypa/gh-action-pypi-publish](https://github.com/pypa/gh-action-pypi-publish) from 1.8.4 to 1.8.5.
- [Release notes](https://github.com/pypa/gh-action-pypi-publish/releases)
- [Commits](https://github.com/pypa/gh-action-pypi-publish/compare/v1.8.4...v1.8.5)

---
updated-dependencies:
- dependency-name: pypa/gh-action-pypi-publish
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-04-10 18:49:01 +02:00
cibuildwheel-bot[bot]andcibuildwheel-bot[bot] <83877280+cibuildwheel-bot[bot]@users.noreply.github.com> c0873c9198 [Bot] Update dependencies (#1465)
Update dependencies

Co-authored-by: cibuildwheel-bot[bot] <83877280+cibuildwheel-bot[bot]@users.noreply.github.com>
2023-04-10 18:48:35 +02:00
Hood Chatham 374d786812 Set pip as the default value of default 2023-04-08 18:26:09 -07:00
Hood Chatham 8a307031a9 Set the defualt build_frontend to be "default" (which is still "pip")
Instead of using pip as the default, set it to default. This way
each platform can choose independently what to do as the default
behavior.

This is intended as part of adding Pyodide support. Pyodide cannot
use pip as the build frontend. It always uses a modified pypa/build.
So if the build_frontend is explicitly set to pip we want to raise
an error. But if it's unset, then we should be able to tell and just
do what we want.
2023-04-07 15:56:17 -07:00
Hood Chatham 0036ac5254 Fix lints 2023-04-07 13:56:49 -07:00
Hood Chatham 2f3949953a chore: factor out _compute_platform from build_in_directory
build_in_directory was ~140 lines long which is a bit long for my taste.
It also has a bunch of nested if statements which I don't prefer.
The first ~60 lines are computing the platform, so I factored those out
into helper methods which have clearer intent and less indentation.
2023-04-07 13:30:03 -07:00
Hood Chatham d018570bc4 chore: add structurally typed GenericPythonConfiguration (#1458)
* Add structually typed GenericPythonConfiguration

Use structural typing for the return value of get_python_configurations
so that we don't have to specify a union of all possible PythonConfiguration
types

* address henryiii's comments

* Use Set in more places
2023-04-06 14:40:25 -04:00
Henry Schreiner bd5294b3f3 tests: use uppercase envvar on Windows (#1455)
Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com>
2023-04-04 17:55:51 -04:00
Joe Rickerby f16ccf4e3d Merge pull request #1453 from pypa/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2023-04-04 10:27:42 +02:00
Joe Rickerby e6c926f7f8 Merge pull request #1452 from pypa/dependabot/github_actions/pypa/gh-action-pypi-publish-1.8.4
build(deps): bump pypa/gh-action-pypi-publish from 1.8.1 to 1.8.4
2023-04-04 10:27:33 +02:00
Joe Rickerby 7c64170c33 Merge pull request #1451 from pypa/update-dependencies-pr
[Bot] Update dependencies
2023-04-04 10:27:24 +02:00
Joe Rickerby 177cb142b5 Merge pull request #1450 from pypa/joerick-patch-1
add warning about `cd /d` in test-command
2023-04-04 10:27:09 +02:00
pre-commit-ci[bot] 2d89ecc140 [pre-commit.ci] pre-commit autoupdate
updates:
- [github.com/psf/black: 23.1.0 → 23.3.0](https://github.com/psf/black/compare/23.1.0...23.3.0)
- [github.com/charliermarsh/ruff-pre-commit: v0.0.259 → v0.0.260](https://github.com/charliermarsh/ruff-pre-commit/compare/v0.0.259...v0.0.260)
2023-04-03 23:10:41 +00:00
dependabot[bot] 7106da2c6b build(deps): bump pypa/gh-action-pypi-publish from 1.8.1 to 1.8.4
Bumps [pypa/gh-action-pypi-publish](https://github.com/pypa/gh-action-pypi-publish) from 1.8.1 to 1.8.4.
- [Release notes](https://github.com/pypa/gh-action-pypi-publish/releases)
- [Commits](https://github.com/pypa/gh-action-pypi-publish/compare/v1.8.1...v1.8.4)

---
updated-dependencies:
- dependency-name: pypa/gh-action-pypi-publish
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-04-03 13:57:34 +00:00
cibuildwheel-bot[bot] 03ece1f81d Update dependencies 2023-04-03 06:13:24 +00:00
Joe Rickerby 93e1464e6a some changes after seeing how this renders 2023-04-01 11:06:53 +01:00
Joe Rickerby 6e4dfaefad add warning about cd /d in test-command
I wouldn't normally document OS features/quirks in our documentation, but here, it wasn't the user that changed the working dir to another drive, it was cibuildwheel, so it seems fair to note some gotchas.
2023-04-01 10:54:13 +01:00
cibuildwheel-bot[bot]andcibuildwheel-bot[bot] <83877280+cibuildwheel-bot[bot]@users.noreply.github.com> a2efed2aeb [Bot] Update dependencies (#1443)
Update dependencies

Co-authored-by: cibuildwheel-bot[bot] <83877280+cibuildwheel-bot[bot]@users.noreply.github.com>
2023-03-29 10:40:16 -04:00
pre-commit-ci[bot]andpre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> 8812101cc6 [pre-commit.ci] pre-commit autoupdate (#1444)
* [pre-commit.ci] pre-commit autoupdate

updates:
- [github.com/charliermarsh/ruff-pre-commit: v0.0.257 → v0.0.259](https://github.com/charliermarsh/ruff-pre-commit/compare/v0.0.257...v0.0.259)

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2023-03-29 10:39:57 -04:00
pre-commit-ci[bot]andpre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> a6028923d6 [pre-commit.ci] pre-commit autoupdate (#1437)
updates:
- [github.com/charliermarsh/ruff-pre-commit: v0.0.255 → v0.0.257](https://github.com/charliermarsh/ruff-pre-commit/compare/v0.0.255...v0.0.257)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2023-03-20 21:11:04 -04:00
dependabot[bot]anddependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> cd6c1409fb build(deps): bump pypa/gh-action-pypi-publish from 1.7.1 to 1.8.1 (#1436)
Bumps [pypa/gh-action-pypi-publish](https://github.com/pypa/gh-action-pypi-publish) from 1.7.1 to 1.8.1.
- [Release notes](https://github.com/pypa/gh-action-pypi-publish/releases)
- [Commits](https://github.com/pypa/gh-action-pypi-publish/compare/v1.7.1...v1.8.1)

---
updated-dependencies:
- dependency-name: pypa/gh-action-pypi-publish
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-03-20 12:32:32 -04:00
Joe Rickerby e049c2bd83 Merge pull request #1435 from pypa/update-dependencies-pr
[Bot] Update dependencies
2023-03-20 15:16:40 +00:00
cibuildwheel-bot[bot] 37c749e507 Update dependencies 2023-03-20 06:15:07 +00:00
cibuildwheel-bot[bot]andcibuildwheel-bot[bot] <83877280+cibuildwheel-bot[bot]@users.noreply.github.com> 04a0ca0e04 [Bot] Update dependencies (#1431)
Update dependencies

Co-authored-by: cibuildwheel-bot[bot] <83877280+cibuildwheel-bot[bot]@users.noreply.github.com>
2023-03-14 15:22:33 -04:00
pre-commit-ci[bot]pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>Grzegorz Bokota
2c3e01287a [pre-commit.ci] pre-commit autoupdate (#1433)
* [pre-commit.ci] pre-commit autoupdate

updates:
- [github.com/charliermarsh/ruff-pre-commit: v0.0.254 → v0.0.255](https://github.com/charliermarsh/ruff-pre-commit/compare/v0.0.254...v0.0.255)
- [github.com/pre-commit/mirrors-mypy: v1.0.1 → v1.1.1](https://github.com/pre-commit/mirrors-mypy/compare/v1.0.1...v1.1.1)
- [github.com/codespell-project/codespell: v2.2.2 → v2.2.4](https://github.com/codespell-project/codespell/compare/v2.2.2...v2.2.4)

* clean ruff warnings

* revert C4 -> C40 rename

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Grzegorz Bokota <bokota+github@gmail.com>
2023-03-14 15:22:17 -04:00
dependabot[bot] b2d0292204 Merge pull request #1432 from pypa/dependabot/github_actions/pypa/gh-action-pypi-publish-1.7.1 2023-03-13 15:59:35 +00:00
dependabot[bot] cd32569937 build(deps): bump pypa/gh-action-pypi-publish from 1.6.4 to 1.7.1
Bumps [pypa/gh-action-pypi-publish](https://github.com/pypa/gh-action-pypi-publish) from 1.6.4 to 1.7.1.
- [Release notes](https://github.com/pypa/gh-action-pypi-publish/releases)
- [Commits](https://github.com/pypa/gh-action-pypi-publish/compare/v1.6.4...v1.7.1)

---
updated-dependencies:
- dependency-name: pypa/gh-action-pypi-publish
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-03-13 13:57:27 +00:00
60 changed files with 453 additions and 402 deletions
+1 -1
View File
@@ -34,7 +34,7 @@ jobs:
name: artifact
path: dist
- uses: pypa/gh-action-pypi-publish@v1.6.4
- uses: pypa/gh-action-pypi-publish@v1.8.5
with:
user: __token__
password: ${{ secrets.pypi_password }}
+1 -1
View File
@@ -44,7 +44,7 @@ jobs:
- name: Create Pull Request
if: github.ref == 'refs/heads/main' && github.repository == 'pypa/cibuildwheel'
uses: peter-evans/create-pull-request@v4
uses: peter-evans/create-pull-request@v5
with:
commit-message: Update dependencies
title: '[Bot] Update dependencies'
+7 -9
View File
@@ -14,15 +14,15 @@ repos:
- id: trailing-whitespace
- repo: https://github.com/psf/black
rev: 23.1.0
rev: 23.3.0
hooks:
- id: black
- repo: https://github.com/charliermarsh/ruff-pre-commit
rev: v0.0.254
rev: v0.0.261
hooks:
- id: ruff
args: ["--fix"]
args: ["--fix", "--show-fixes"]
- repo: https://github.com/asottile/setup-cfg-fmt
rev: v2.2.0
@@ -31,7 +31,7 @@ repos:
args: [--include-version-classifiers, --max-py-version=3.11]
- repo: https://github.com/pre-commit/mirrors-mypy
rev: v1.0.1
rev: v1.2.0
hooks:
- id: mypy
name: mypy 3.7 on cibuildwheel/
@@ -46,16 +46,14 @@ repos:
- tomli_w
- types-certifi
- types-click
- types-dataclasses
- types-jinja2
- types-pyyaml
- types-requests
- bracex
- dataclasses
- id: mypy
name: mypy 3.10
name: mypy 3.11
exclude: ^cibuildwheel/resources/.*py$
args: ["--python-version=3.10"]
args: ["--python-version=3.11"]
additional_dependencies: *mypy-dependencies
- repo: https://github.com/shellcheck-py/shellcheck-py
@@ -79,7 +77,7 @@ repos:
files: ^docs/changelog.md$
- repo: https://github.com/codespell-project/codespell
rev: v2.2.2
rev: v2.2.4
hooks:
- id: codespell
args: ["-L", "sur"]
+11 -15
View File
@@ -94,7 +94,7 @@ jobs:
- uses: actions/setup-python@v3
- name: Install cibuildwheel
run: python -m pip install cibuildwheel==2.12.1
run: python -m pip install cibuildwheel==2.12.2
- name: Build wheels
run: python -m cibuildwheel --output-dir wheelhouse
@@ -166,7 +166,7 @@ Here are some repos that use cibuildwheel.
| [Kivy][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Open source UI framework written in Python, running on Windows, Linux, macOS, Android and iOS |
| [Prophet][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Tool for producing high quality forecasts for time series data that has multiple seasonality with linear or non-linear growth. |
| [MyPy][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | The compiled version of MyPy using MyPyC. |
| [pydantic][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Data validation using Python type hints |
| [MemRay][] | ![github icon][] | ![linux icon][] | Memray is a memory profiler for Python |
[scikit-learn]: https://github.com/scikit-learn/scikit-learn
[NumPy]: https://github.com/numpy/numpy
@@ -177,7 +177,7 @@ Here are some repos that use cibuildwheel.
[Kivy]: https://github.com/kivy/kivy
[Prophet]: https://github.com/facebook/prophet
[MyPy]: https://github.com/mypyc/mypy_mypyc-wheels
[pydantic]: https://github.com/samuelcolvin/pydantic
[MemRay]: https://github.com/bloomberg/memray
[appveyor icon]: docs/data/readme_icons/appveyor.svg
[github icon]: docs/data/readme_icons/github.svg
@@ -210,6 +210,14 @@ Changelog
<!-- this section was generated by bin/update_readme_changelog.py -- do not edit manually -->
### v2.12.2
_18 April 2023_
- 🐛 Fix a bug that caused an extra empty config-setting to be passed to the backend when CIBW_BUILD_FRONTEND is set to `build`. (#1474)
- 🐛 Fix a crash that occurred when overwriting an existing wheel on Windows. (#1464)
- 🛠 Pinned version updates, including CPython 3.10.11, 3.11.3, pip 23.1 and wheel 0.40.0.
### v2.12.1
_11 March 2023_
@@ -240,18 +248,6 @@ _5 Dec 2022_
- ✨ Added a friendly error message to a common misconfiguration of the `CIBW_TEST_COMMAND` option - not specifying path using the `{project}` placeholder (#1336)
- 🛠 The GitHub Action now uses Powershell on Windows to avoid occasional incompabilities with bash (#1346)
### v2.11.2
_26 October 2022_
- 🛠 Updates CPython 3.11 to 3.11.0 - final release (#1327)
- 🛠 Simplify the default macOS repair command (#1322)
- 🛠 Fix the default `MACOSX_DEPLOYMENT_TARGET` on arm64 (#1312)
- 🛠 Hide irrelevant pip warnings on linux (#1311)
- 🐛 Fix a bug that caused the stdout and stderr of commands in containers to be in the wrong order Previously, stdout could appear after stderr. (#1324)
- 📚 Added [a FAQ entry](https://cibuildwheel.readthedocs.io/en/stable/faq/#macos-building-cpython-38-wheels-on-arm64) describing how to perform native builds of CPython 3.8 wheels on Apple Silicon. (#1323)
- 📚 Other docs improvements
<!-- END bin/update_readme_changelog.py -->
---
+2 -2
View File
@@ -15,8 +15,8 @@ the results without the `--online` setting.
from __future__ import annotations
import ast
from collections.abc import Iterable, Iterator
from pathlib import Path
from typing import Iterator
import click
import yaml
@@ -97,7 +97,7 @@ class MaybeRemote:
with open(filename, "w") as f:
yaml.safe_dump(self.contents, f, default_flow_style=False)
def on_each(self, repos: list[str]) -> Iterator[tuple[str, str, str | None]]:
def on_each(self, repos: Iterable[str]) -> Iterator[tuple[str, str, str | None]]:
for repo in repos:
print(f"[bold]{repo}:")
for filename in sorted(self.contents, reverse=True):
Regular → Executable
+5 -4
View File
@@ -16,6 +16,7 @@ import functools
import textwrap
import urllib.request
import xml.dom.minidom
from collections.abc import Iterable, Mapping, Sequence
from datetime import datetime
from io import StringIO
from pathlib import Path
@@ -42,7 +43,7 @@ ICONS = (
class Project:
NAME: int = 0
def __init__(self, config: dict[str, Any], github: Github | None = None):
def __init__(self, config: Mapping[str, Any], github: Github | None = None):
try:
self.name: str = config["name"]
self.gh: str = config["gh"]
@@ -149,7 +150,7 @@ def path_for_icon(icon_name: str, relative_to: Path | None = None) -> Path:
def get_projects(
config: list[dict[str, Any]],
config: Iterable[Mapping[str, Any]],
*,
online: bool = True,
auth: str | None = None,
@@ -163,7 +164,7 @@ def get_projects(
return sorted((Project(item, github) for item in config), reverse=online)
def render_projects(projects: list[Project], *, dest_path: Path, include_info: bool = True):
def render_projects(projects: Sequence[Project], *, dest_path: Path, include_info: bool = True):
io = StringIO()
print = functools.partial(builtins.print, file=io)
@@ -191,7 +192,7 @@ def render_projects(projects: list[Project], *, dest_path: Path, include_info: b
def insert_projects_table(
file: Path,
*,
projects: list[Project],
projects: Sequence[Project],
input_filename: str,
include_info: bool = True,
):
Regular → Executable
View File
+6 -5
View File
@@ -6,6 +6,7 @@ import copy
import difflib
import logging
import sys
from collections.abc import Mapping, MutableMapping
from pathlib import Path
from typing import Any, Union
@@ -93,7 +94,7 @@ class WindowsVersions:
unsorted_versions = spec.filter(self.version_dict)
versions = sorted(unsorted_versions, reverse=True)
log.debug(f"Windows {self.arch} {spec} has {', '.join(str(v) for v in versions)}")
log.debug("Windows %s %s has %s", self.arch, spec, ", ".join(str(v) for v in versions))
if not versions:
return None
@@ -124,7 +125,7 @@ class PyPyVersions:
]
self.arch = arch_str
def get_arch_file(self, release: dict[str, Any]) -> str:
def get_arch_file(self, release: Mapping[str, Any]) -> str:
urls: list[str] = [
rf["download_url"]
for rf in release["files"]
@@ -250,11 +251,11 @@ class AllVersions:
self.macos_pypy = PyPyVersions("64")
self.macos_pypy_arm64 = PyPyVersions("ARM64")
def update_config(self, config: dict[str, str]) -> None:
def update_config(self, config: MutableMapping[str, str]) -> None:
identifier = config["identifier"]
version = Version(config["version"])
spec = Specifier(f"=={version.major}.{version.minor}.*")
log.info(f"Reading in '{identifier}' -> {spec} @ {version}")
log.info("Reading in %r -> %s @ %s", str(identifier), spec, version)
orig_config = copy.copy(config)
config_update: AnyConfig | None = None
@@ -282,7 +283,7 @@ class AllVersions:
config.update(**config_update)
if config != orig_config:
log.info(f" Updated {orig_config} to {config}")
log.info(" Updated %s to %s", orig_config, config)
@click.command()
+3 -3
View File
@@ -54,14 +54,14 @@ def git_ls_remote_versions(url) -> list[VersionTuple]:
try:
version = Version(version_string)
if version.is_devrelease:
log.info(f"Ignoring development release '{version}'")
log.info("Ignoring development release %r", str(version))
continue
if version.is_prerelease:
log.info(f"Ignoring pre-release '{version}'")
log.info("Ignoring pre-release %r", str(version))
continue
versions.append(VersionTuple(version, version_string))
except InvalidVersion:
log.warning(f"Ignoring ref '{ref}'")
log.warning("Ignoring ref %r", ref)
versions.sort(reverse=True)
return versions
+1 -1
View File
@@ -1,3 +1,3 @@
from __future__ import annotations
__version__ = "2.12.1"
__version__ = "2.12.2"
+104 -92
View File
@@ -7,6 +7,7 @@ import sys
import tarfile
import textwrap
import typing
from collections.abc import Iterable, Sequence, Set
from pathlib import Path
from tempfile import mkdtemp
@@ -18,7 +19,12 @@ import cibuildwheel.windows
from cibuildwheel.architecture import Architecture, allowed_architectures_check
from cibuildwheel.logger import log
from cibuildwheel.options import CommandLineArguments, Options, compute_options
from cibuildwheel.typing import PLATFORMS, PlatformName, assert_never
from cibuildwheel.typing import (
PLATFORMS,
GenericPythonConfiguration,
PlatformName,
assert_never,
)
from cibuildwheel.util import (
CIBW_CACHE_PATH,
BuildSelector,
@@ -167,70 +173,102 @@ def main() -> None:
log.warning(f"Can't delete temporary folder '{temp_dir}'")
def build_in_directory(args: CommandLineArguments) -> None:
def _compute_platform_only(only: str) -> PlatformName:
if "linux_" in only:
return "linux"
if "macosx_" in only:
return "macos"
if "win_" in only or "win32" in only:
return "windows"
print(
f"Invalid --only='{only}', must be a build selector with a known platform",
file=sys.stderr,
)
sys.exit(2)
def _compute_platform_ci() -> PlatformName:
if detect_ci_provider() is None:
print(
textwrap.dedent(
"""
cibuildwheel: Unable to detect platform. cibuildwheel should run on your CI server;
Travis CI, AppVeyor, Azure Pipelines, GitHub Actions, CircleCI, Gitlab, and Cirrus CI
are supported. You can run on your development machine or other CI providers
using the --platform argument. Check --help output for more information.
"""
),
file=sys.stderr,
)
sys.exit(2)
if sys.platform.startswith("linux"):
return "linux"
elif sys.platform == "darwin":
return "macos"
elif sys.platform == "win32":
return "windows"
else:
print(
'cibuildwheel: Unable to detect platform from "sys.platform" in a CI environment. You can run '
"cibuildwheel using the --platform argument. Check --help output for more information.",
file=sys.stderr,
)
sys.exit(2)
def _compute_platform(args: CommandLineArguments) -> PlatformName:
platform_option_value = args.platform or os.environ.get("CIBW_PLATFORM", "auto")
platform: PlatformName
if args.only and args.platform is not None:
print(
"--platform cannot be specified with --only, it is computed from --only",
file=sys.stderr,
)
sys.exit(2)
if args.only and args.archs is not None:
print(
"--arch cannot be specified with --only, it is computed from --only",
file=sys.stderr,
)
sys.exit(2)
if platform_option_value not in PLATFORMS | {"auto"}:
print(f"cibuildwheel: Unsupported platform: {platform_option_value}", file=sys.stderr)
sys.exit(2)
if args.only:
if "linux_" in args.only:
platform = "linux"
elif "macosx_" in args.only:
platform = "macos"
elif "win_" in args.only or "win32" in args.only:
platform = "windows"
else:
print(
f"Invalid --only='{args.only}', must be a build selector with a known platform",
file=sys.stderr,
)
sys.exit(2)
if args.platform is not None:
print(
"--platform cannot be specified with --only, it is computed from --only",
file=sys.stderr,
)
sys.exit(2)
if args.archs is not None:
print(
"--arch cannot be specified with --only, it is computed from --only",
file=sys.stderr,
)
sys.exit(2)
return _compute_platform_only(args.only)
elif platform_option_value != "auto":
if platform_option_value not in PLATFORMS:
print(f"cibuildwheel: Unsupported platform: {platform_option_value}", file=sys.stderr)
sys.exit(2)
return typing.cast(PlatformName, platform_option_value)
platform = typing.cast(PlatformName, platform_option_value)
else:
ci_provider = detect_ci_provider()
if ci_provider is None:
print(
textwrap.dedent(
"""
cibuildwheel: Unable to detect platform. cibuildwheel should run on your CI server;
Travis CI, AppVeyor, Azure Pipelines, GitHub Actions, CircleCI, Gitlab, and Cirrus CI
are supported. You can run on your development machine or other CI providers
using the --platform argument. Check --help output for more information.
"""
),
file=sys.stderr,
)
sys.exit(2)
if sys.platform.startswith("linux"):
platform = "linux"
elif sys.platform == "darwin":
platform = "macos"
elif sys.platform == "win32":
platform = "windows"
else:
print(
'cibuildwheel: Unable to detect platform from "sys.platform" in a CI environment. You can run '
"cibuildwheel using the --platform argument. Check --help output for more information.",
file=sys.stderr,
)
sys.exit(2)
return _compute_platform_ci()
class PlatformModule(typing.Protocol):
# note that as per PEP544, the self argument is ignored when the protocol
# is applied to a module
def get_python_configurations(
self, build_selector: BuildSelector, architectures: Set[Architecture]
) -> Sequence[GenericPythonConfiguration]:
...
def build(self, options: Options, tmp_path: Path) -> None:
...
# pylint: disable-next=inconsistent-return-statements
def get_platform_module(platform: PlatformName) -> PlatformModule:
if platform == "linux":
return cibuildwheel.linux
if platform == "windows":
return cibuildwheel.windows
if platform == "macos":
return cibuildwheel.macos
assert_never(platform) # noqa: RET503
def build_in_directory(args: CommandLineArguments) -> None:
platform: PlatformName = _compute_platform(args)
options = compute_options(platform=platform, command_line_arguments=args, env=os.environ)
package_dir = options.globals.package_dir
@@ -242,8 +280,9 @@ def build_in_directory(args: CommandLineArguments) -> None:
print(msg, file=sys.stderr)
sys.exit(2)
platform_module = get_platform_module(platform)
identifiers = get_build_identifiers(
platform=platform,
platform_module=platform_module,
build_selector=options.globals.build_selector,
architectures=options.globals.architectures,
)
@@ -289,14 +328,7 @@ def build_in_directory(args: CommandLineArguments) -> None:
with cibuildwheel.util.print_new_wheels(
"\n{n} wheels produced in {m:.0f} minutes:", output_dir
):
if platform == "linux":
cibuildwheel.linux.build(options, tmp_path)
elif platform == "windows":
cibuildwheel.windows.build(options, tmp_path)
elif platform == "macos":
cibuildwheel.macos.build(options, tmp_path)
else:
assert_never(platform)
platform_module.build(options, tmp_path)
finally:
# avoid https://github.com/python/cpython/issues/86962 by performing
# cleanup manually
@@ -305,7 +337,7 @@ def build_in_directory(args: CommandLineArguments) -> None:
log.warning(f"Can't delete temporary folder '{tmp_path}'")
def print_preamble(platform: str, options: Options, identifiers: list[str]) -> None:
def print_preamble(platform: str, options: Options, identifiers: Sequence[str]) -> None:
print(
textwrap.dedent(
"""
@@ -339,33 +371,13 @@ def print_preamble(platform: str, options: Options, identifiers: list[str]) -> N
def get_build_identifiers(
platform: PlatformName, build_selector: BuildSelector, architectures: set[Architecture]
platform_module: PlatformModule, build_selector: BuildSelector, architectures: Set[Architecture]
) -> list[str]:
python_configurations: (
list[cibuildwheel.linux.PythonConfiguration]
| list[cibuildwheel.windows.PythonConfiguration]
| list[cibuildwheel.macos.PythonConfiguration]
)
if platform == "linux":
python_configurations = cibuildwheel.linux.get_python_configurations(
build_selector, architectures
)
elif platform == "windows":
python_configurations = cibuildwheel.windows.get_python_configurations(
build_selector, architectures
)
elif platform == "macos":
python_configurations = cibuildwheel.macos.get_python_configurations(
build_selector, architectures
)
else:
assert_never(platform)
python_configurations = platform_module.get_python_configurations(build_selector, architectures)
return [config.identifier for config in python_configurations]
def detect_warnings(*, options: Options, identifiers: list[str]) -> list[str]:
def detect_warnings(*, options: Options, identifiers: Iterable[str]) -> list[str]:
warnings = []
# warn about deprecated {python} and {pip}
+2 -1
View File
@@ -4,6 +4,7 @@ import functools
import platform as platform_module
import re
import sys
from collections.abc import Set
from enum import Enum
from .typing import Final, Literal, PlatformName, assert_never
@@ -132,7 +133,7 @@ class Architecture(Enum):
def allowed_architectures_check(
platform: PlatformName,
architectures: set[Architecture],
architectures: Set[Architecture],
) -> None:
allowed_architectures = Architecture.all_archs(platform)
+8 -5
View File
@@ -1,8 +1,9 @@
from __future__ import annotations
import subprocess
from collections.abc import Iterable, Mapping, Sequence
from dataclasses import dataclass
from typing import Callable, Dict, List, Sequence
from typing import Callable, Dict, List # noqa: TID251
import bashlex
@@ -10,7 +11,7 @@ import bashlex
EnvironmentExecutor = Callable[[List[str], Dict[str, str]], str]
def local_environment_executor(command: list[str], env: dict[str, str]) -> str:
def local_environment_executor(command: Sequence[str], env: Mapping[str, str]) -> str:
return subprocess.run(command, env=env, text=True, stdout=subprocess.PIPE, check=True).stdout
@@ -22,7 +23,7 @@ class NodeExecutionContext:
def evaluate(
value: str, environment: dict[str, str], executor: EnvironmentExecutor | None = None
value: str, environment: Mapping[str, str], executor: EnvironmentExecutor | None = None
) -> str:
if not value:
# empty string evaluates to empty string
@@ -40,7 +41,9 @@ def evaluate(
return evaluate_node(
value_word_node,
context=NodeExecutionContext(
environment=environment, input=value, executor=executor or local_environment_executor
environment=dict(environment),
input=value,
executor=executor or local_environment_executor,
),
)
@@ -105,7 +108,7 @@ def evaluate_nodes_as_compound_command(
def evaluate_nodes_as_simple_command(
nodes: list[bashlex.ast.node], context: NodeExecutionContext
nodes: Iterable[bashlex.ast.node], context: NodeExecutionContext
) -> str:
command = [evaluate_node(part, context=context) for part in nodes]
return context.executor(command, context.environment)
+4 -3
View File
@@ -1,7 +1,8 @@
from __future__ import annotations
import dataclasses
from typing import Any, Mapping, Sequence
from collections.abc import Mapping, Sequence
from typing import Any
import bashlex
import bashlex.errors
@@ -54,7 +55,7 @@ class EnvironmentAssignment(Protocol):
def evaluated_value(
self,
*,
environment: dict[str, str],
environment: Mapping[str, str],
executor: bashlex_eval.EnvironmentExecutor | None = None,
) -> str:
"""Returns the value of this assignment, as evaluated in the environment"""
@@ -91,7 +92,7 @@ class EnvironmentAssignmentBash:
def evaluated_value(
self,
environment: dict[str, str],
environment: Mapping[str, str],
executor: bashlex_eval.EnvironmentExecutor | None = None,
) -> str:
return bashlex_eval.evaluate(self.value, environment=environment, executor=executor)
+4 -1
View File
@@ -4,6 +4,7 @@ These are utilities for the `/bin` scripts, not for the `cibuildwheel` program.
from __future__ import annotations
from collections.abc import Mapping, Sequence
from io import StringIO
from .typing import Protocol
@@ -16,7 +17,9 @@ class Printable(Protocol):
...
def dump_python_configurations(inp: dict[str, dict[str, list[dict[str, Printable]]]]) -> str:
def dump_python_configurations(
inp: Mapping[str, Mapping[str, Sequence[Mapping[str, Printable]]]]
) -> str:
output = StringIO()
for header, values in inp.items():
output.write(f"[{header}]\n")
+5 -3
View File
@@ -1,7 +1,9 @@
from __future__ import annotations
import typing
from collections.abc import Callable
from threading import RLock
from typing import Any, Callable, Generic, TypeVar, overload
from typing import Any, Generic, TypeVar
__all__ = ["cached_property"]
@@ -24,11 +26,11 @@ class cached_property(Generic[_T]):
msg = f"Cannot assign the same cached_property to two different names ({self.attrname!r} and {name!r})."
raise TypeError(msg)
@overload
@typing.overload
def __get__(self, instance: None, owner: type[Any] | None = ...) -> cached_property[_T]:
...
@overload
@typing.overload
def __get__(self, instance: object, owner: type[Any] | None = ...) -> _T:
...
+16 -15
View File
@@ -3,9 +3,10 @@ from __future__ import annotations
import subprocess
import sys
import textwrap
from collections.abc import Iterable, Iterator, Sequence, Set
from dataclasses import dataclass
from pathlib import Path, PurePath, PurePosixPath
from typing import Iterator, Tuple
from typing import Tuple
from .architecture import Architecture
from .logger import log
@@ -16,6 +17,7 @@ from .util import (
AlreadyBuiltWheelError,
BuildSelector,
NonPlatformWheelError,
build_frontend_or_default,
find_compatible_wheel,
get_build_verbosity_extra_flags,
prepare_command,
@@ -46,7 +48,7 @@ class BuildStep:
def get_python_configurations(
build_selector: BuildSelector,
architectures: set[Architecture],
architectures: Set[Architecture],
) -> list[PythonConfiguration]:
full_python_configs = read_python_configs("linux")
@@ -111,7 +113,7 @@ def get_build_steps(
def check_all_python_exist(
*, platform_configs: list[PythonConfiguration], container: OCIContainer
*, platform_configs: Iterable[PythonConfiguration], container: OCIContainer
) -> None:
exist = True
messages = []
@@ -136,7 +138,7 @@ def check_all_python_exist(
def build_in_container(
*,
options: Options,
platform_configs: list[PythonConfiguration],
platform_configs: Sequence[PythonConfiguration],
container: OCIContainer,
container_project_path: PurePath,
container_package_dir: PurePath,
@@ -174,6 +176,7 @@ def build_in_container(
for config in platform_configs:
log.build_start(config.identifier)
build_options = options.build_options(config.identifier)
build_frontend = build_frontend_or_default(build_options.build_frontend)
dependency_constraint_flags: list[PathOrStr] = []
@@ -239,13 +242,10 @@ def build_in_container(
container.call(["rm", "-rf", built_wheel_dir])
container.call(["mkdir", "-p", built_wheel_dir])
verbosity_flags = get_build_verbosity_extra_flags(build_options.build_verbosity)
extra_flags = split_config_settings(
build_options.config_settings, build_options.build_frontend
)
extra_flags = split_config_settings(build_options.config_settings, build_frontend)
if build_options.build_frontend == "pip":
extra_flags += verbosity_flags
if build_frontend == "pip":
extra_flags += get_build_verbosity_extra_flags(build_options.build_verbosity)
container.call(
[
"python",
@@ -259,9 +259,10 @@ def build_in_container(
],
env=env,
)
elif build_options.build_frontend == "build":
verbosity_setting = " ".join(verbosity_flags)
extra_flags += (f"--config-setting={verbosity_setting}",)
elif build_frontend == "build":
if not 0 <= build_options.build_verbosity < 2:
msg = f"build_verbosity {build_options.build_verbosity} is not supported for build frontend. Ignoring."
log.warning(msg)
container.call(
[
"python",
@@ -275,7 +276,7 @@ def build_in_container(
env=env,
)
else:
assert_never(build_options.build_frontend)
assert_never(build_frontend)
built_wheel = container.glob(built_wheel_dir, "*.whl")[0]
@@ -437,7 +438,7 @@ def build(options: Options, tmp_path: Path) -> None: # noqa: ARG001
sys.exit(1)
def _matches_prepared_command(error_cmd: list[str], command_template: str) -> bool:
def _matches_prepared_command(error_cmd: Sequence[str], command_template: str) -> bool:
if len(error_cmd) < 3 or error_cmd[0:2] != ["sh", "-c"]:
return False
command_prefix = command_template.split("{", maxsplit=1)[0].strip()
+16 -14
View File
@@ -8,9 +8,11 @@ import re
import shutil
import subprocess
import sys
import typing
from collections.abc import Sequence, Set
from dataclasses import dataclass
from pathlib import Path
from typing import Sequence, Tuple, cast
from typing import Tuple
from filelock import FileLock
@@ -25,6 +27,7 @@ from .util import (
BuildFrontend,
BuildSelector,
NonPlatformWheelError,
build_frontend_or_default,
call,
detect_ci_provider,
download,
@@ -53,7 +56,7 @@ def get_macos_version() -> tuple[int, int]:
"""
version_str, _, _ = platform.mac_ver()
version = tuple(map(int, version_str.split(".")[:2]))
return cast(Tuple[int, int], version)
return typing.cast(Tuple[int, int], version)
def get_macos_sdks() -> list[str]:
@@ -69,7 +72,7 @@ class PythonConfiguration:
def get_python_configurations(
build_selector: BuildSelector, architectures: set[Architecture]
build_selector: BuildSelector, architectures: Set[Architecture]
) -> list[PythonConfiguration]:
full_python_configs = read_python_configs("macos")
@@ -330,6 +333,7 @@ def build(options: Options, tmp_path: Path) -> None:
for config in python_configurations:
build_options = options.build_options(config.identifier)
build_frontend = build_frontend_or_default(build_options.build_frontend)
log.build_start(config.identifier)
identifier_tmp_dir = tmp_path / config.identifier
@@ -352,7 +356,7 @@ def build(options: Options, tmp_path: Path) -> None:
config,
dependency_constraint_flags,
build_options.environment,
build_options.build_frontend,
build_frontend,
)
compatible_wheel = find_compatible_wheel(built_wheels, config.identifier)
@@ -373,13 +377,10 @@ def build(options: Options, tmp_path: Path) -> None:
log.step("Building wheel...")
built_wheel_dir.mkdir()
verbosity_flags = get_build_verbosity_extra_flags(build_options.build_verbosity)
extra_flags = split_config_settings(
build_options.config_settings, build_options.build_frontend
)
extra_flags = split_config_settings(build_options.config_settings, build_frontend)
if build_options.build_frontend == "pip":
extra_flags += verbosity_flags
if build_frontend == "pip":
extra_flags += get_build_verbosity_extra_flags(build_options.build_verbosity)
# Path.resolve() is needed. Without it pip wheel may try to fetch package from pypi.org
# see https://github.com/pypa/cibuildwheel/pull/369
call(
@@ -393,9 +394,10 @@ def build(options: Options, tmp_path: Path) -> None:
*extra_flags,
env=env,
)
elif build_options.build_frontend == "build":
verbosity_setting = " ".join(verbosity_flags)
extra_flags += (f"--config-setting={verbosity_setting}",)
elif build_frontend == "build":
if not 0 <= build_options.build_verbosity < 2:
msg = f"build_verbosity {build_options.build_verbosity} is not supported for build frontend. Ignoring."
log.warning(msg)
build_env = env.copy()
if build_options.dependency_constraints:
constraint_path = (
@@ -416,7 +418,7 @@ def build(options: Options, tmp_path: Path) -> None:
env=build_env,
)
else:
assert_never(build_options.build_frontend)
assert_never(build_frontend)
built_wheel = next(built_wheel_dir.glob("*.whl"))
+10 -7
View File
@@ -8,10 +8,12 @@ import shlex
import shutil
import subprocess
import sys
import typing
import uuid
from collections.abc import Mapping, Sequence
from pathlib import Path, PurePath, PurePosixPath
from types import TracebackType
from typing import IO, Dict, Sequence, cast
from typing import IO, Dict
from cibuildwheel.util import CIProvider, detect_ci_provider
@@ -166,6 +168,7 @@ class OCIContainer:
cwd=from_path,
)
else:
exec_process: subprocess.Popen[bytes]
with subprocess.Popen(
[
self.engine,
@@ -178,10 +181,10 @@ class OCIContainer:
],
stdin=subprocess.PIPE,
) as exec_process:
exec_process.stdin = cast(IO[bytes], exec_process.stdin)
assert exec_process.stdin
with open(from_path, "rb") as from_file:
shutil.copyfileobj(from_file, exec_process.stdin)
# Bug in mypy, https://github.com/python/mypy/issues/15031
shutil.copyfileobj(from_file, exec_process.stdin) # type: ignore[misc]
exec_process.stdin.close()
exec_process.wait()
@@ -238,7 +241,7 @@ class OCIContainer:
def call(
self,
args: Sequence[PathOrStr],
env: dict[str, str] | None = None,
env: Mapping[str, str] | None = None,
capture_output: bool = False,
cwd: PathOrStr | None = None,
) -> str:
@@ -328,9 +331,9 @@ class OCIContainer:
capture_output=True,
)
)
return cast(Dict[str, str], env)
return typing.cast(Dict[str, str], env)
def environment_executor(self, command: list[str], environment: dict[str, str]) -> str:
def environment_executor(self, command: Sequence[str], environment: dict[str, str]) -> str:
# used as an EnvironmentExecutor to evaluate commands and capture output
return self.call(command, env=environment, capture_output=True)
+13 -9
View File
@@ -10,8 +10,10 @@ import shlex
import sys
import textwrap
import traceback
import typing
from collections.abc import Callable, Generator, Iterable, Iterator, Mapping, Set
from pathlib import Path
from typing import Any, Callable, Dict, Generator, Iterator, List, Mapping, Union, cast
from typing import Any, Dict, List, Union
if sys.version_info >= (3, 11):
import tomllib
@@ -94,7 +96,7 @@ class BuildOptions:
test_requires: list[str]
test_extras: str
build_verbosity: int
build_frontend: BuildFrontend
build_frontend: BuildFrontend | Literal["default"]
config_settings: str
@property
@@ -161,7 +163,7 @@ def _dig_first(*pairs: tuple[Mapping[str, Setting], str], ignore_empty: bool = F
if key in dict_like:
value = dict_like[key]
if ignore_empty and value == "":
if ignore_empty and value == "": # noqa: PLC1901
continue
return value
@@ -193,7 +195,7 @@ class OptionsReader:
*,
platform: PlatformName,
env: Mapping[str, str],
disallow: dict[str, set[str]] | None = None,
disallow: Mapping[str, Set[str]] | None = None,
) -> None:
self.platform = platform
self.env = env
@@ -462,7 +464,7 @@ class Options:
print(msg, file=sys.stderr)
sys.exit(2)
container_engine = cast(ContainerEngine, container_engine_str)
container_engine = typing.cast(ContainerEngine, container_engine_str)
return GlobalOptions(
package_dir=package_dir,
@@ -499,11 +501,13 @@ class Options:
test_extras = self.reader.get("test-extras", sep=",")
build_verbosity_str = self.reader.get("build-verbosity")
build_frontend: BuildFrontend
build_frontend: BuildFrontend | Literal["default"]
if build_frontend_str == "build":
build_frontend = "build"
elif build_frontend_str == "pip":
build_frontend = "pip"
elif build_frontend_str == "default":
build_frontend = "default"
else:
msg = f"cibuildwheel: Unrecognised build frontend {build_frontend_str!r}, only 'pip' and 'build' are supported"
print(msg, file=sys.stderr)
@@ -597,7 +601,7 @@ class Options:
config_settings=config_settings,
)
def check_for_invalid_configuration(self, identifiers: list[str]) -> None:
def check_for_invalid_configuration(self, identifiers: Iterable[str]) -> None:
if self.platform in {"macos", "windows"}:
before_all_values = {self.build_options(i).before_all for i in identifiers}
@@ -629,7 +633,7 @@ class Options:
read_config_file=False,
)
def summary(self, identifiers: list[str]) -> str:
def summary(self, identifiers: Iterable[str]) -> str:
lines = []
global_option_names = sorted(f.name for f in dataclasses.fields(self.globals))
@@ -667,7 +671,7 @@ class Options:
option_name: str,
option_value: Any,
default_value: Any,
overrides: dict[str, Any] | None = None,
overrides: Mapping[str, Any] | None = None,
) -> str:
"""
Return a summary of the option value, including any overrides, with
+12 -12
View File
@@ -81,12 +81,12 @@ python_configurations = [
{ identifier = "cp39-macosx_x86_64", version = "3.9", url = "https://www.python.org/ftp/python/3.9.13/python-3.9.13-macos11.pkg" },
{ identifier = "cp39-macosx_arm64", version = "3.9", url = "https://www.python.org/ftp/python/3.9.13/python-3.9.13-macos11.pkg" },
{ identifier = "cp39-macosx_universal2", version = "3.9", url = "https://www.python.org/ftp/python/3.9.13/python-3.9.13-macos11.pkg" },
{ identifier = "cp310-macosx_x86_64", version = "3.10", url = "https://www.python.org/ftp/python/3.10.10/python-3.10.10-macos11.pkg" },
{ identifier = "cp310-macosx_arm64", version = "3.10", url = "https://www.python.org/ftp/python/3.10.10/python-3.10.10-macos11.pkg" },
{ identifier = "cp310-macosx_universal2", version = "3.10", url = "https://www.python.org/ftp/python/3.10.10/python-3.10.10-macos11.pkg" },
{ identifier = "cp311-macosx_x86_64", version = "3.11", url = "https://www.python.org/ftp/python/3.11.2/python-3.11.2-macos11.pkg" },
{ identifier = "cp311-macosx_arm64", version = "3.11", url = "https://www.python.org/ftp/python/3.11.2/python-3.11.2-macos11.pkg" },
{ identifier = "cp311-macosx_universal2", version = "3.11", url = "https://www.python.org/ftp/python/3.11.2/python-3.11.2-macos11.pkg" },
{ identifier = "cp310-macosx_x86_64", version = "3.10", url = "https://www.python.org/ftp/python/3.10.11/python-3.10.11-macos11.pkg" },
{ identifier = "cp310-macosx_arm64", version = "3.10", url = "https://www.python.org/ftp/python/3.10.11/python-3.10.11-macos11.pkg" },
{ identifier = "cp310-macosx_universal2", version = "3.10", url = "https://www.python.org/ftp/python/3.10.11/python-3.10.11-macos11.pkg" },
{ identifier = "cp311-macosx_x86_64", version = "3.11", url = "https://www.python.org/ftp/python/3.11.3/python-3.11.3-macos11.pkg" },
{ identifier = "cp311-macosx_arm64", version = "3.11", url = "https://www.python.org/ftp/python/3.11.3/python-3.11.3-macos11.pkg" },
{ identifier = "cp311-macosx_universal2", version = "3.11", url = "https://www.python.org/ftp/python/3.11.3/python-3.11.3-macos11.pkg" },
{ identifier = "pp37-macosx_x86_64", version = "3.7", url = "https://downloads.python.org/pypy/pypy3.7-v7.3.9-osx64.tar.bz2" },
{ identifier = "pp38-macosx_x86_64", version = "3.8", url = "https://downloads.python.org/pypy/pypy3.8-v7.3.11-macos_x86_64.tar.bz2" },
{ identifier = "pp38-macosx_arm64", version = "3.8", url = "https://downloads.python.org/pypy/pypy3.8-v7.3.11-macos_arm64.tar.bz2" },
@@ -104,13 +104,13 @@ python_configurations = [
{ identifier = "cp38-win_amd64", version = "3.8.10", arch = "64" },
{ identifier = "cp39-win32", version = "3.9.13", arch = "32" },
{ identifier = "cp39-win_amd64", version = "3.9.13", arch = "64" },
{ identifier = "cp310-win32", version = "3.10.10", arch = "32" },
{ identifier = "cp310-win_amd64", version = "3.10.10", arch = "64" },
{ identifier = "cp311-win32", version = "3.11.2", arch = "32" },
{ identifier = "cp311-win_amd64", version = "3.11.2", arch = "64" },
{ identifier = "cp310-win32", version = "3.10.11", arch = "32" },
{ identifier = "cp310-win_amd64", version = "3.10.11", arch = "64" },
{ identifier = "cp311-win32", version = "3.11.3", arch = "32" },
{ identifier = "cp311-win_amd64", version = "3.11.3", arch = "64" },
{ identifier = "cp39-win_arm64", version = "3.9.10", arch = "ARM64" },
{ identifier = "cp310-win_arm64", version = "3.10.10", arch = "ARM64" },
{ identifier = "cp311-win_arm64", version = "3.11.2", arch = "ARM64" },
{ identifier = "cp310-win_arm64", version = "3.10.11", arch = "ARM64" },
{ identifier = "cp311-win_arm64", version = "3.11.3", arch = "ARM64" },
{ identifier = "pp37-win_amd64", version = "3.7", arch = "64", url = "https://downloads.python.org/pypy/pypy3.7-v7.3.9-win64.zip" },
{ identifier = "pp38-win_amd64", version = "3.8", arch = "64", url = "https://downloads.python.org/pypy/pypy3.8-v7.3.11-win64.zip" },
{ identifier = "pp39-win_amd64", version = "3.9", arch = "64", url = "https://downloads.python.org/pypy/pypy3.9-v7.3.11-win64.zip" },
@@ -8,21 +8,21 @@ delocate==0.10.4
# via -r cibuildwheel/resources/constraints.in
distlib==0.3.6
# via virtualenv
filelock==3.9.0
filelock==3.11.0
# via virtualenv
packaging==23.0
packaging==23.1
# via delocate
platformdirs==3.1.0
platformdirs==3.2.0
# via virtualenv
typing-extensions==4.5.0
# via delocate
virtualenv==20.20.0
virtualenv==20.21.0
# via -r cibuildwheel/resources/constraints.in
wheel==0.38.4
wheel==0.40.0
# via -r cibuildwheel/resources/constraints.in
# The following packages are considered to be unsafe in a requirements file:
pip==23.0.1
pip==23.1
# via -r cibuildwheel/resources/constraints.in
setuptools==67.5.0
setuptools==67.6.1
# via -r cibuildwheel/resources/constraints.in
@@ -8,21 +8,21 @@ delocate==0.10.4
# via -r cibuildwheel/resources/constraints.in
distlib==0.3.6
# via virtualenv
filelock==3.9.0
filelock==3.11.0
# via virtualenv
packaging==23.0
packaging==23.1
# via delocate
platformdirs==3.1.0
platformdirs==3.2.0
# via virtualenv
typing-extensions==4.5.0
# via delocate
virtualenv==20.20.0
virtualenv==20.21.0
# via -r cibuildwheel/resources/constraints.in
wheel==0.38.4
wheel==0.40.0
# via -r cibuildwheel/resources/constraints.in
# The following packages are considered to be unsafe in a requirements file:
pip==23.0.1
pip==23.1
# via -r cibuildwheel/resources/constraints.in
setuptools==67.5.0
setuptools==67.6.1
# via -r cibuildwheel/resources/constraints.in
@@ -8,28 +8,28 @@ delocate==0.10.4
# via -r cibuildwheel/resources/constraints.in
distlib==0.3.6
# via virtualenv
filelock==3.9.0
filelock==3.11.0
# via virtualenv
importlib-metadata==6.0.0
importlib-metadata==6.4.1
# via virtualenv
packaging==23.0
packaging==23.1
# via delocate
platformdirs==3.1.0
platformdirs==3.2.0
# via virtualenv
typing-extensions==4.5.0
# via
# delocate
# importlib-metadata
# platformdirs
virtualenv==20.20.0
virtualenv==20.21.0
# via -r cibuildwheel/resources/constraints.in
wheel==0.38.4
wheel==0.40.0
# via -r cibuildwheel/resources/constraints.in
zipp==3.15.0
# via importlib-metadata
# The following packages are considered to be unsafe in a requirements file:
pip==23.0.1
pip==23.1
# via -r cibuildwheel/resources/constraints.in
setuptools==67.5.0
setuptools==67.6.1
# via -r cibuildwheel/resources/constraints.in
@@ -8,21 +8,21 @@ delocate==0.10.4
# via -r cibuildwheel/resources/constraints.in
distlib==0.3.6
# via virtualenv
filelock==3.9.0
filelock==3.11.0
# via virtualenv
packaging==23.0
packaging==23.1
# via delocate
platformdirs==3.1.0
platformdirs==3.2.0
# via virtualenv
typing-extensions==4.5.0
# via delocate
virtualenv==20.20.0
virtualenv==20.21.0
# via -r cibuildwheel/resources/constraints.in
wheel==0.38.4
wheel==0.40.0
# via -r cibuildwheel/resources/constraints.in
# The following packages are considered to be unsafe in a requirements file:
pip==23.0.1
pip==23.1
# via -r cibuildwheel/resources/constraints.in
setuptools==67.5.0
setuptools==67.6.1
# via -r cibuildwheel/resources/constraints.in
@@ -8,21 +8,21 @@ delocate==0.10.4
# via -r cibuildwheel/resources/constraints.in
distlib==0.3.6
# via virtualenv
filelock==3.9.0
filelock==3.11.0
# via virtualenv
packaging==23.0
packaging==23.1
# via delocate
platformdirs==3.1.0
platformdirs==3.2.0
# via virtualenv
typing-extensions==4.5.0
# via delocate
virtualenv==20.20.0
virtualenv==20.21.0
# via -r cibuildwheel/resources/constraints.in
wheel==0.38.4
wheel==0.40.0
# via -r cibuildwheel/resources/constraints.in
# The following packages are considered to be unsafe in a requirements file:
pip==23.0.1
pip==23.1
# via -r cibuildwheel/resources/constraints.in
setuptools==67.5.0
setuptools==67.6.1
# via -r cibuildwheel/resources/constraints.in
+7 -7
View File
@@ -8,21 +8,21 @@ delocate==0.10.4
# via -r cibuildwheel/resources/constraints.in
distlib==0.3.6
# via virtualenv
filelock==3.9.0
filelock==3.11.0
# via virtualenv
packaging==23.0
packaging==23.1
# via delocate
platformdirs==3.1.0
platformdirs==3.2.0
# via virtualenv
typing-extensions==4.5.0
# via delocate
virtualenv==20.20.0
virtualenv==20.21.0
# via -r cibuildwheel/resources/constraints.in
wheel==0.38.4
wheel==0.40.0
# via -r cibuildwheel/resources/constraints.in
# The following packages are considered to be unsafe in a requirements file:
pip==23.0.1
pip==23.1
# via -r cibuildwheel/resources/constraints.in
setuptools==67.5.0
setuptools==67.6.1
# via -r cibuildwheel/resources/constraints.in
+1 -1
View File
@@ -4,7 +4,7 @@ skip = ""
test-skip = ""
archs = ["auto"]
build-frontend = "pip"
build-frontend = "default"
config-settings = {}
dependency-versions = "pinned"
environment = {}
+21 -21
View File
@@ -1,49 +1,49 @@
[x86_64]
manylinux1 = quay.io/pypa/manylinux1_x86_64:2023-02-26-4ed41b6
manylinux1 = quay.io/pypa/manylinux1_x86_64:2023-04-16-36ed6a7
manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2022-08-05-4535177
manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2023-03-05-271004f
manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2023-04-16-157f52a
manylinux_2_24 = quay.io/pypa/manylinux_2_24_x86_64:2022-12-26-0d38463
manylinux_2_28 = quay.io/pypa/manylinux_2_28_x86_64:2023-03-05-271004f
musllinux_1_1 = quay.io/pypa/musllinux_1_1_x86_64:2023-03-05-271004f
manylinux_2_28 = quay.io/pypa/manylinux_2_28_x86_64:2023-04-16-157f52a
musllinux_1_1 = quay.io/pypa/musllinux_1_1_x86_64:2023-04-16-157f52a
[i686]
manylinux1 = quay.io/pypa/manylinux1_i686:2023-02-26-4ed41b6
manylinux1 = quay.io/pypa/manylinux1_i686:2023-04-16-36ed6a7
manylinux2010 = quay.io/pypa/manylinux2010_i686:2022-08-05-4535177
manylinux2014 = quay.io/pypa/manylinux2014_i686:2023-03-05-271004f
manylinux2014 = quay.io/pypa/manylinux2014_i686:2023-04-16-157f52a
manylinux_2_24 = quay.io/pypa/manylinux_2_24_i686:2022-12-26-0d38463
musllinux_1_1 = quay.io/pypa/musllinux_1_1_i686:2023-03-05-271004f
musllinux_1_1 = quay.io/pypa/musllinux_1_1_i686:2023-04-16-157f52a
[pypy_x86_64]
manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2022-08-05-4535177
manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2023-03-05-271004f
manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2023-04-16-157f52a
manylinux_2_24 = quay.io/pypa/manylinux_2_24_x86_64:2022-12-26-0d38463
manylinux_2_28 = quay.io/pypa/manylinux_2_28_x86_64:2023-03-05-271004f
manylinux_2_28 = quay.io/pypa/manylinux_2_28_x86_64:2023-04-16-157f52a
[pypy_i686]
manylinux2010 = quay.io/pypa/manylinux2010_i686:2022-08-05-4535177
manylinux2014 = quay.io/pypa/manylinux2014_i686:2023-03-05-271004f
manylinux2014 = quay.io/pypa/manylinux2014_i686:2023-04-16-157f52a
manylinux_2_24 = quay.io/pypa/manylinux_2_24_i686:2022-12-26-0d38463
[aarch64]
manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2023-03-05-271004f
manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2023-04-16-157f52a
manylinux_2_24 = quay.io/pypa/manylinux_2_24_aarch64:2022-12-26-0d38463
manylinux_2_28 = quay.io/pypa/manylinux_2_28_aarch64:2023-03-05-271004f
musllinux_1_1 = quay.io/pypa/musllinux_1_1_aarch64:2023-03-05-271004f
manylinux_2_28 = quay.io/pypa/manylinux_2_28_aarch64:2023-04-16-157f52a
musllinux_1_1 = quay.io/pypa/musllinux_1_1_aarch64:2023-04-16-157f52a
[ppc64le]
manylinux2014 = quay.io/pypa/manylinux2014_ppc64le:2023-03-05-271004f
manylinux2014 = quay.io/pypa/manylinux2014_ppc64le:2023-04-16-157f52a
manylinux_2_24 = quay.io/pypa/manylinux_2_24_ppc64le:2022-12-26-0d38463
manylinux_2_28 = quay.io/pypa/manylinux_2_28_ppc64le:2023-03-05-271004f
musllinux_1_1 = quay.io/pypa/musllinux_1_1_ppc64le:2023-03-05-271004f
manylinux_2_28 = quay.io/pypa/manylinux_2_28_ppc64le:2023-04-16-157f52a
musllinux_1_1 = quay.io/pypa/musllinux_1_1_ppc64le:2023-04-16-157f52a
[s390x]
manylinux2014 = quay.io/pypa/manylinux2014_s390x:2023-03-05-271004f
manylinux2014 = quay.io/pypa/manylinux2014_s390x:2023-04-16-157f52a
manylinux_2_24 = quay.io/pypa/manylinux_2_24_s390x:2022-12-26-0d38463
manylinux_2_28 = quay.io/pypa/manylinux_2_28_s390x:2023-03-05-271004f
musllinux_1_1 = quay.io/pypa/musllinux_1_1_s390x:2023-03-05-271004f
manylinux_2_28 = quay.io/pypa/manylinux_2_28_s390x:2023-04-16-157f52a
musllinux_1_1 = quay.io/pypa/musllinux_1_1_s390x:2023-04-16-157f52a
[pypy_aarch64]
manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2023-03-05-271004f
manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2023-04-16-157f52a
manylinux_2_24 = quay.io/pypa/manylinux_2_24_aarch64:2022-12-26-0d38463
manylinux_2_28 = quay.io/pypa/manylinux_2_28_aarch64:2023-03-05-271004f
manylinux_2_28 = quay.io/pypa/manylinux_2_28_aarch64:2023-04-16-157f52a
+2 -2
View File
@@ -1,2 +1,2 @@
version = "20.20.0"
url = "https://github.com/pypa/get-virtualenv/blob/20.20.0/public/virtualenv.pyz?raw=true"
version = "20.21.0"
url = "https://github.com/pypa/get-virtualenv/blob/20.21.0/public/virtualenv.pyz?raw=true"
+6
View File
@@ -42,3 +42,9 @@ else:
PlatformName = Literal["linux", "macos", "windows"]
PLATFORMS: Final[set[PlatformName]] = {"linux", "macos", "windows"}
class GenericPythonConfiguration(Protocol):
@property
def identifier(self) -> str:
...
+22 -19
View File
@@ -11,23 +11,15 @@ import subprocess
import sys
import textwrap
import time
import typing
import urllib.request
from collections.abc import Generator, Iterable, Mapping, Sequence
from dataclasses import dataclass
from enum import Enum
from functools import lru_cache
from pathlib import Path, PurePath
from time import sleep
from typing import (
Any,
ClassVar,
Generator,
Iterable,
Sequence,
TextIO,
TypeVar,
cast,
overload,
)
from typing import Any, ClassVar, TextIO, TypeVar
import bracex
import certifi
@@ -71,6 +63,15 @@ test_fail_cwd_file: Final[Path] = resources_dir / "testing_temp_dir_file.py"
BuildFrontend = Literal["pip", "build"]
def build_frontend_or_default(
setting: BuildFrontend | Literal["default"], default: BuildFrontend = "pip"
) -> BuildFrontend:
if setting == "default":
return default
return setting
MANYLINUX_ARCHS: Final[tuple[str, ...]] = (
"x86_64",
"i686",
@@ -98,20 +99,20 @@ CIBW_CACHE_PATH: Final[Path] = Path(
IS_WIN: Final[bool] = sys.platform.startswith("win")
@overload
@typing.overload
def call(
*args: PathOrStr,
env: dict[str, str] | None = None,
env: Mapping[str, str] | None = None,
cwd: PathOrStr | None = None,
capture_stdout: Literal[False] = ...,
) -> None:
...
@overload
@typing.overload
def call(
*args: PathOrStr,
env: dict[str, str] | None = None,
env: Mapping[str, str] | None = None,
cwd: PathOrStr | None = None,
capture_stdout: Literal[True],
) -> str:
@@ -120,7 +121,7 @@ def call(
def call(
*args: PathOrStr,
env: dict[str, str] | None = None,
env: Mapping[str, str] | None = None,
cwd: PathOrStr | None = None,
capture_stdout: bool = False,
) -> str | None:
@@ -140,10 +141,12 @@ def call(
result = subprocess.run(args_, check=True, shell=IS_WIN, env=env, cwd=cwd, **kwargs)
if not capture_stdout:
return None
return cast(str, result.stdout)
return typing.cast(str, result.stdout)
def shell(*commands: str, env: dict[str, str] | None = None, cwd: PathOrStr | None = None) -> None:
def shell(
*commands: str, env: Mapping[str, str] | None = None, cwd: PathOrStr | None = None
) -> None:
command = " ".join(commands)
print(f"+ {command}")
subprocess.run(command, env=env, cwd=cwd, shell=True, check=True)
@@ -498,7 +501,7 @@ def print_new_wheels(msg: str, output_dir: Path) -> Generator[None, None, None]:
)
def get_pip_version(env: dict[str, str]) -> str:
def get_pip_version(env: Mapping[str, str]) -> str:
versions_output_text = call(
"python", "-m", "pip", "freeze", "--all", capture_stdout=True, env=env
)
+19 -15
View File
@@ -6,10 +6,11 @@ import shutil
import subprocess
import sys
import textwrap
from collections.abc import MutableMapping, Sequence, Set
from contextlib import suppress
from dataclasses import dataclass
from functools import lru_cache
from pathlib import Path
from typing import Sequence
from zipfile import ZipFile
from filelock import FileLock
@@ -26,6 +27,7 @@ from .util import (
BuildFrontend,
BuildSelector,
NonPlatformWheelError,
build_frontend_or_default,
call,
download,
find_compatible_wheel,
@@ -71,7 +73,7 @@ class PythonConfiguration:
def get_python_configurations(
build_selector: BuildSelector,
architectures: set[Architecture],
architectures: Set[Architecture],
) -> list[PythonConfiguration]:
full_python_configs = read_python_configs("windows")
@@ -135,7 +137,7 @@ def setup_setuptools_cross_compile(
tmp: Path,
python_configuration: PythonConfiguration,
python_libs_base: Path,
env: dict[str, str],
env: MutableMapping[str, str],
) -> None:
distutils_cfg = tmp / "extra-setup.cfg"
env["DIST_EXTRA_CONFIG"] = str(distutils_cfg)
@@ -183,7 +185,7 @@ def setup_rust_cross_compile(
tmp: Path, # noqa: ARG001
python_configuration: PythonConfiguration,
python_libs_base: Path, # noqa: ARG001
env: dict[str, str],
env: MutableMapping[str, str],
) -> None:
# Assume that MSVC will be used, because we already know that we are
# cross-compiling. MinGW users can set CARGO_BUILD_TARGET themselves
@@ -366,6 +368,7 @@ def build(options: Options, tmp_path: Path) -> None:
for config in python_configurations:
build_options = options.build_options(config.identifier)
build_frontend = build_frontend_or_default(build_options.build_frontend)
log.build_start(config.identifier)
identifier_tmp_dir = tmp_path / config.identifier
@@ -386,7 +389,7 @@ def build(options: Options, tmp_path: Path) -> None:
config,
dependency_constraint_flags,
build_options.environment,
build_options.build_frontend,
build_frontend,
)
compatible_wheel = find_compatible_wheel(built_wheels, config.identifier)
@@ -410,13 +413,10 @@ def build(options: Options, tmp_path: Path) -> None:
log.step("Building wheel...")
built_wheel_dir.mkdir()
verbosity_flags = get_build_verbosity_extra_flags(build_options.build_verbosity)
extra_flags = split_config_settings(
build_options.config_settings, build_options.build_frontend
)
extra_flags = split_config_settings(build_options.config_settings, build_frontend)
if build_options.build_frontend == "pip":
extra_flags += verbosity_flags
if build_frontend == "pip":
extra_flags += get_build_verbosity_extra_flags(build_options.build_verbosity)
# Path.resolve() is needed. Without it pip wheel may try to fetch package from pypi.org
# see https://github.com/pypa/cibuildwheel/pull/369
call(
@@ -430,9 +430,10 @@ def build(options: Options, tmp_path: Path) -> None:
*extra_flags,
env=env,
)
elif build_options.build_frontend == "build":
verbosity_setting = " ".join(verbosity_flags)
extra_flags += (f"--config-setting={verbosity_setting}",)
elif build_frontend == "build":
if not 0 <= build_options.build_verbosity < 2:
msg = f"build_verbosity {build_options.build_verbosity} is not supported for build frontend. Ignoring."
log.warning(msg)
build_env = env.copy()
if build_options.dependency_constraints:
constraints_path = (
@@ -463,7 +464,7 @@ def build(options: Options, tmp_path: Path) -> None:
env=build_env,
)
else:
assert_never(build_options.build_frontend)
assert_never(build_frontend)
built_wheel = next(built_wheel_dir.glob("*.whl"))
@@ -559,6 +560,9 @@ def build(options: Options, tmp_path: Path) -> None:
# we're all done here; move it to output (remove if already exists)
if compatible_wheel is None:
with suppress(FileNotFoundError):
(build_options.output_dir / repaired_wheel.name).unlink()
shutil.move(str(repaired_wheel), build_options.output_dir)
built_wheels.append(build_options.output_dir / repaired_wheel.name)
+8
View File
@@ -4,6 +4,14 @@ title: Changelog
# Changelog
### v2.12.2
_18 April 2023_
- 🐛 Fix a bug that caused an extra empty config-setting to be passed to the backend when CIBW_BUILD_FRONTEND is set to `build`. (#1474)
- 🐛 Fix a crash that occurred when overwriting an existing wheel on Windows. (#1464)
- 🛠 Pinned version updates, including CPython 3.10.11, 3.11.3, pip 23.1 and wheel 0.40.0.
### v2.12.1
_11 March 2023_
-5
View File
@@ -431,11 +431,6 @@
ci: [github]
os: [apple, linux, windows]
- name: pydantic
gh: samuelcolvin/pydantic
ci: [github]
os: [apple, linux, windows]
- name: vaex
gh: vaexio/vaex
ci: [github]
+3 -3
View File
@@ -145,7 +145,7 @@ There are two suggested methods for keeping cibuildwheel up to date that instead
If you use GitHub Actions for builds, you can use cibuildwheel as an action:
```yaml
uses: pypa/cibuildwheel@v2.12.1
uses: pypa/cibuildwheel@v2.12.2
```
This is a composite step that just runs cibuildwheel using pipx. You can set command-line options as `with:` parameters, and use `env:` as normal.
@@ -167,7 +167,7 @@ The second option, and the only one that supports other CI systems, is using a `
```bash
# requirements-cibw.txt
cibuildwheel==2.12.1
cibuildwheel==2.12.2
```
Then your install step would have `python -m pip install -r requirements-cibw.txt` in it. Your `.github/dependabot.yml` file could look like this:
@@ -311,7 +311,7 @@ Solutions to this vary, but the simplest is to use pipx:
# most runners have pipx preinstalled, but in case you don't
python3 -m pip install pipx
pipx run cibuildwheel==2.12.1 --output-dir wheelhouse
pipx run cibuildwheel==2.12.2 --output-dir wheelhouse
pipx run twine upload wheelhouse/*.whl
```
+8 -1
View File
@@ -1214,6 +1214,13 @@ Platform-specific environment variables are also available:<br/>
In configuration files, you can use an array, and the items will be joined with `&&`.
!!! note
It's isn't recommended to `cd` to your project directory before running tests,
because Python might resolve `import yourpackage` relative to the working dir,
and we want to test the wheel you just built. However, if you're sure that's not
an issue for you and your workflow requires it, on Windows you should do `cd /d`,
because the CWD and project dir might be on different drives.
### `CIBW_BEFORE_TEST` {: #before-test}
> Execute a shell command before testing each wheel
@@ -1386,7 +1393,7 @@ This option is not supported in the overrides section in `pyproject.toml`.
### `CIBW_BUILD_VERBOSITY` {: #build-verbosity}
> Increase/decrease the output of pip wheel
An number from 1 to 3 to increase the level of verbosity (corresponding to invoking pip with `-v`, `-vv`, and `-vvv`), between -1 and -3 (`-q`, `-qq`, and `-qqq`), or just 0 (default verbosity). These flags are useful while debugging a build when the output of the actual build invoked by `pip wheel` is required.
An number from 1 to 3 to increase the level of verbosity (corresponding to invoking pip with `-v`, `-vv`, and `-vvv`), between -1 and -3 (`-q`, `-qq`, and `-qqq`), or just 0 (default verbosity). These flags are useful while debugging a build when the output of the actual build invoked by `pip wheel` is required. Has no effect on the `build` backend, which produces verbose output by default.
Platform-specific environment variables are also available:<br/>
`CIBW_BUILD_VERBOSITY_MACOS` | `CIBW_BUILD_VERBOSITY_WINDOWS` | `CIBW_BUILD_VERBOSITY_LINUX`
+2 -2
View File
@@ -184,7 +184,7 @@ To build Linux, Mac, and Windows wheels using GitHub Actions, create a `.github/
- uses: actions/checkout@v3
- name: Build wheels
run: pipx run cibuildwheel==2.12.1
run: pipx run cibuildwheel==2.12.2
- uses: actions/upload-artifact@v3
with:
@@ -219,7 +219,7 @@ To build Linux, Mac, and Windows wheels using GitHub Actions, create a `.github/
- uses: actions/setup-python@v3
- name: Install cibuildwheel
run: python -m pip install cibuildwheel==2.12.1
run: python -m pip install cibuildwheel==2.12.2
- name: Build wheels
run: python -m cibuildwheel --output-dir wheelhouse
+20 -22
View File
@@ -17,17 +17,16 @@ title: Working examples
| [Kivy][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Open source UI framework written in Python, running on Windows, Linux, macOS, Android and iOS |
| [Prophet][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Tool for producing high quality forecasts for time series data that has multiple seasonality with linear or non-linear growth. |
| [MyPy][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | The compiled version of MyPy using MyPyC. |
| [pydantic][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Data validation using Python type hints |
| [MemRay][] | ![github icon][] | ![linux icon][] | Memray is a memory profiler for Python |
| [duckdb][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | DuckDB is an in-process SQL OLAP Database Management System |
| [uvloop][] | ![github icon][] | ![apple icon][] ![linux icon][] | Ultra fast asyncio event loop. |
| [psutil][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Cross-platform lib for process and system monitoring in Python |
| [duckdb][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | DuckDB is an in-process SQL OLAP Database Management System |
| [vaex][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Out-of-Core hybrid Apache Arrow/NumPy DataFrame for Python, ML, visualization and exploration of big tabular data at a billion rows per second 🚀 |
| [Google Benchmark][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | A microbenchmark support library |
| [Apache Beam][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Apache Beam is a unified programming model for Batch and Streaming data processing. |
| [Triton][] | ![github icon][] | ![linux icon][] | Self hosted runners |
| [asyncpg][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | A fast PostgreSQL Database Client Library for Python/asyncio. |
| [PyGame][] | ![github icon][] | ![apple icon][] ![linux icon][] | 🐍🎮 pygame (the library) is a Free and Open Source python programming language library for making multimedia applications like games built on top of the excellent SDL library. C, Python, Native, OpenGL. |
| [Triton][] | ![github icon][] | ![linux icon][] | Self hosted runners |
| [cmake][] | ![github icon][] ![travisci icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Multitagged binary builds for all supported platforms, using cibw 2 config configuration. |
| [scikit-image][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Image processing library. Uses cibuildwheel to build and test a project that uses Cython with platform-native code. |
| [twisted-iocpsupport][] | ![github icon][] | ![windows icon][] | A submodule of Twisted that hooks into native C APIs using Cython. |
@@ -37,8 +36,8 @@ title: Working examples
| [River][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | 🌊 Online machine learning in Python |
| [UltraJSON][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Ultra fast JSON decoder and encoder written in C with Python bindings |
| [OpenSpiel][] | ![github icon][] | ![apple icon][] ![linux icon][] | OpenSpiel is a collection of environments and algorithms for research in general reinforcement learning and search/planning in games. |
| [pyzmq][] | ![github icon][] ![circleci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Python bindings for zeromq, the networking library. Uses Cython on CPython and CFFI on PyPy. ARM wheels for linux are built natively on CircleCI. |
| [aiortc][] | ![github icon][] | ![apple icon][] ![linux icon][] | WebRTC and ORTC implementation for Python using asyncio. |
| [pyzmq][] | ![github icon][] ![circleci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Python bindings for zeromq, the networking library. Uses Cython on CPython and CFFI on PyPy. ARM wheels for linux are built natively on CircleCI. |
| [Confluent client for Kafka][] | ![travisci icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | setup in `tools/wheels/build-wheels.bat` |
| [Implicit][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Includes GPU support for linux wheels |
| [vispy][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Main repository for Vispy |
@@ -49,12 +48,12 @@ title: Working examples
| [PyYAML][] | ![github icon][] | ![apple icon][] | Canonical source repository for PyYAML |
| [numexpr][] | ![github icon][] ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Fast numerical array expression evaluator for Python, NumPy, PyTables, pandas, bcolz and more |
| [h5py][] | ![azurepipelines icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | HDF5 for Python -- The h5py package is a Pythonic interface to the HDF5 binary data format. |
| [Wrapt][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A Python module for decorators, wrappers and monkey patching. |
| [PyAV][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Pythonic bindings for FFmpeg's libraries. |
| [Wrapt][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A Python module for decorators, wrappers and monkey patching. |
| [Line Profiler][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Line-by-line profiling for Python |
| [pikepdf][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A Python library for reading and writing PDF, powered by qpdf |
| [SimpleJSON][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | simplejson is a simple, fast, extensible JSON encoder/decoder for Python |
| [envd][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | 🏕️ Reproducible development environment for AI/ML |
| [SimpleJSON][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | simplejson is a simple, fast, extensible JSON encoder/decoder for Python |
| [OpenColorIO][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | A color management framework for visual effects and animation. |
| [aioquic][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | QUIC and HTTP/3 implementation in Python |
| [OpenTimelineIO][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Open Source API and interchange format for editorial timeline information. |
@@ -65,15 +64,15 @@ title: Working examples
| [DeepForest][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | An Efficient, Scalable and Optimized Python Framework for Deep Forest (2021.2.1) |
| [google neuroglancer][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | WebGL-based viewer for volumetric data |
| [AutoPy][] | ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Includes a Windows Travis build. |
| [CTranslate2][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Includes libraries from the [Intel oneAPI toolkit](https://www.intel.com/content/www/us/en/developer/tools/oneapi/base-toolkit.html) and CUDA kernels compiled for multiple GPU architectures. |
| [H3-py][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Python bindings for H3, a hierarchical hexagonal geospatial indexing system |
| [Rtree][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Rtree: spatial index for Python GIS ¶ |
| [markupsafe][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Safely add untrusted strings to HTML/XML markup. |
| [CTranslate2][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Includes libraries from the [Intel oneAPI toolkit](https://www.intel.com/content/www/us/en/developer/tools/oneapi/base-toolkit.html) and CUDA kernels compiled for multiple GPU architectures. |
| [Picologging][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A high-performance logging library for Python. |
| [pybind11 cmake_example][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Example pybind11 module built with a CMake-based build system |
| [python-rapidjson][] | ![travisci icon][] ![gitlab icon][] ![appveyor icon][] | ![windows icon][] ![linux icon][] | Python wrapper around rapidjson |
| [python-snappy][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Python bindings for the snappy google library |
| [KDEpy][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Kernel Density Estimation in Python |
| [python-snappy][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Python bindings for the snappy google library |
| [time-machine][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Time mocking library using only the CPython C API. |
| [tgcalls][] | ![github icon][] | ![apple icon][] ![windows icon][] | Python `pybind11` binding to Telegram's WebRTC library with third party dependencies like `OpenSSL`, `MozJPEG`, `FFmpeg`, etc. |
| [pybind11 python_example][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Example pybind11 module built with a Python-based build system |
@@ -82,8 +81,8 @@ title: Working examples
| [cyvcf2][] | ![github icon][] | ![apple icon][] ![linux icon][] | cython + htslib == fast VCF and BCF processing |
| [matrixprofile][] | ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A Python 3 library making time series data mining tasks, utilizing matrix profile algorithms, accessible to everyone. |
| [abess][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A fast best-subset selection library. It uses cibuildwheel to build a large project with C++ extensions. |
| [jq.py][] | ![travisci icon][] | ![apple icon][] ![linux icon][] | Python bindings for jq |
| [mosec][] | ![github icon][] | ![linux icon][] ![apple icon][] | A high-performance serving framework for ML models, offers dynamic batching and multi-stage pipeline to fully exploit your compute machine |
| [jq.py][] | ![travisci icon][] | ![apple icon][] ![linux icon][] | Python bindings for jq |
| [iminuit][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Jupyter-friendly Python interface for C++ MINUIT2 |
| [Tokenizer][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Fast and customizable text tokenization library with BPE and SentencePiece support |
| [PyGLM][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Fast OpenGL Mathematics (GLM) for Python |
@@ -93,16 +92,16 @@ title: Working examples
| [iDynTree][] | ![github icon][] | ![linux icon][] | Uses manylinux_2_24 |
| [Python-WebRTC][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | a Python extension that provides bindings to WebRTC M92 |
| [pybase64][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Fast Base64 encoding/decoding in Python |
| [Arbor][] | ![github icon][] | ![apple icon][] ![linux icon][] | Arbor is a multi-compartment neuron simulation library; compatible with next-generation accelerators; best-practices applied to research software; focused on community-driven development. Includes a [small script](https://github.com/arbor-sim/arbor/blob/master/scripts/patchwheel.py) patching `rpath` in bundled libraries. |
| [pillow-heif][] | ![github icon][] ![cirrusci icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Bindings to libheif library with third party dependencies. Fully automated CI for tests and publishing including Apple Silicon builds. |
| [Arbor][] | ![github icon][] | ![apple icon][] ![linux icon][] | Arbor is a multi-compartment neuron simulation library; compatible with next-generation accelerators; best-practices applied to research software; focused on community-driven development. Includes a [small script](https://github.com/arbor-sim/arbor/blob/master/scripts/patchwheel.py) patching `rpath` in bundled libraries. |
| [fathon][] | ![travisci icon][] | ![apple icon][] ![linux icon][] | python package for DFA (Detrended Fluctuation Analysis) and related algorithms |
| [Imagecodecs (fork)][] | ![azurepipelines icon][] | ![apple icon][] ![linux icon][] | Over 20 external dependencies in compiled libraries, custom docker image, `libomp`, `openblas` and `install_name_tool` for macOS. |
| [polaroid][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Full range of wheels for setuptools rust, with auto release and PyPI deploy. |
| [power-grid-model][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Python/C++ library for distribution power system analysis |
| [etebase-py][] | ![travisci icon][] | ![linux icon][] | Python bindings to a Rust library using `setuptools-rust`, and `sccache` for improved speed. |
| [cf-units][] | ![github icon][] | ![apple icon][] ![linux icon][] | Units of measure as required by the Climate and Forecast (CF) Metadata Conventions |
| [clang-format][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Scikit-build wrapper around LLVM's CMake, all platforms, generic wheels. |
| [pybind11 scikit_build_example][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | An example combining scikit-build and pybind11 |
| [clang-format][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Scikit-build wrapper around LLVM's CMake, all platforms, generic wheels. |
| [numpythia][] | ![github icon][] | ![apple icon][] ![linux icon][] | The interface between PYTHIA and NumPy |
| [ninja][] | ![github icon][] ![travisci icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Multitagged binary builds for all supported platforms, using cibw 2 config configuration. |
| [pyjet][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | The interface between FastJet and NumPy |
@@ -123,17 +122,16 @@ title: Working examples
[Kivy]: https://github.com/kivy/kivy
[Prophet]: https://github.com/facebook/prophet
[MyPy]: https://github.com/mypyc/mypy_mypyc-wheels
[pydantic]: https://github.com/samuelcolvin/pydantic
[MemRay]: https://github.com/bloomberg/memray
[duckdb]: https://github.com/duckdb/duckdb
[uvloop]: https://github.com/MagicStack/uvloop
[psutil]: https://github.com/giampaolo/psutil
[duckdb]: https://github.com/duckdb/duckdb
[vaex]: https://github.com/vaexio/vaex
[Google Benchmark]: https://github.com/google/benchmark
[Apache Beam]: https://github.com/apache/beam
[Triton]: https://github.com/openai/triton
[asyncpg]: https://github.com/MagicStack/asyncpg
[PyGame]: https://github.com/pygame/pygame
[Triton]: https://github.com/openai/triton
[cmake]: https://github.com/scikit-build/cmake-python-distributions
[scikit-image]: https://github.com/scikit-image/scikit-image
[twisted-iocpsupport]: https://github.com/twisted/twisted-iocpsupport
@@ -143,8 +141,8 @@ title: Working examples
[River]: https://github.com/online-ml/river
[UltraJSON]: https://github.com/ultrajson/ultrajson
[OpenSpiel]: https://github.com/deepmind/open_spiel
[pyzmq]: https://github.com/zeromq/pyzmq
[aiortc]: https://github.com/aiortc/aiortc
[pyzmq]: https://github.com/zeromq/pyzmq
[Confluent client for Kafka]: https://github.com/confluentinc/confluent-kafka-python
[Implicit]: https://github.com/benfred/implicit
[vispy]: https://github.com/vispy/vispy
@@ -155,12 +153,12 @@ title: Working examples
[PyYAML]: https://github.com/yaml/pyyaml
[numexpr]: https://github.com/pydata/numexpr
[h5py]: https://github.com/h5py/h5py
[Wrapt]: https://github.com/GrahamDumpleton/wrapt
[PyAV]: https://github.com/PyAV-Org/PyAV
[Wrapt]: https://github.com/GrahamDumpleton/wrapt
[Line Profiler]: https://github.com/pyutils/line_profiler
[pikepdf]: https://github.com/pikepdf/pikepdf
[SimpleJSON]: https://github.com/simplejson/simplejson
[envd]: https://github.com/tensorchord/envd
[SimpleJSON]: https://github.com/simplejson/simplejson
[OpenColorIO]: https://github.com/AcademySoftwareFoundation/OpenColorIO
[aioquic]: https://github.com/aiortc/aioquic
[OpenTimelineIO]: https://github.com/PixarAnimationStudios/OpenTimelineIO
@@ -171,15 +169,15 @@ title: Working examples
[DeepForest]: https://github.com/LAMDA-NJU/Deep-Forest
[google neuroglancer]: https://github.com/google/neuroglancer
[AutoPy]: https://github.com/autopilot-rs/autopy
[CTranslate2]: https://github.com/OpenNMT/CTranslate2
[H3-py]: https://github.com/uber/h3-py
[Rtree]: https://github.com/Toblerity/rtree
[markupsafe]: https://github.com/pallets/markupsafe
[CTranslate2]: https://github.com/OpenNMT/CTranslate2
[Picologging]: https://github.com/microsoft/picologging
[pybind11 cmake_example]: https://github.com/pybind/cmake_example
[python-rapidjson]: https://github.com/python-rapidjson/python-rapidjson
[python-snappy]: https://github.com/andrix/python-snappy
[KDEpy]: https://github.com/tommyod/KDEpy
[python-snappy]: https://github.com/andrix/python-snappy
[time-machine]: https://github.com/adamchainz/time-machine
[tgcalls]: https://github.com/MarshalX/tgcalls
[pybind11 python_example]: https://github.com/pybind/python_example
@@ -188,8 +186,8 @@ title: Working examples
[cyvcf2]: https://github.com/brentp/cyvcf2
[matrixprofile]: https://github.com/matrix-profile-foundation/matrixprofile
[abess]: https://github.com/abess-team/abess
[jq.py]: https://github.com/mwilliamson/jq.py
[mosec]: https://github.com/mosecorg/mosec
[jq.py]: https://github.com/mwilliamson/jq.py
[iminuit]: https://github.com/scikit-hep/iminuit
[Tokenizer]: https://github.com/OpenNMT/Tokenizer
[PyGLM]: https://github.com/Zuzu-Typ/PyGLM
@@ -199,16 +197,16 @@ title: Working examples
[iDynTree]: https://github.com/robotology/idyntree
[Python-WebRTC]: https://github.com/MarshalX/python-webrtc
[pybase64]: https://github.com/mayeut/pybase64
[Arbor]: https://github.com/arbor-sim/arbor
[pillow-heif]: https://github.com/bigcat88/pillow_heif
[Arbor]: https://github.com/arbor-sim/arbor
[fathon]: https://github.com/stfbnc/fathon
[Imagecodecs (fork)]: https://github.com/czaki/imagecodecs_build
[polaroid]: https://github.com/daggy1234/polaroid
[power-grid-model]: https://github.com/alliander-opensource/power-grid-model
[etebase-py]: https://github.com/etesync/etebase-py
[cf-units]: https://github.com/SciTools/cf-units
[clang-format]: https://github.com/ssciwr/clang-format-wheel
[pybind11 scikit_build_example]: https://github.com/pybind/scikit_build_example
[clang-format]: https://github.com/ssciwr/clang-format-wheel
[numpythia]: https://github.com/scikit-hep/numpythia
[ninja]: https://github.com/scikit-build/ninja-python-distributions
[pyjet]: https://github.com/scikit-hep/pyjet
+1 -1
View File
@@ -12,7 +12,7 @@ stack: python 3.7
init:
- cmd: set PATH=C:\Python37;C:\Python37\Scripts;%PATH%
install: python -m pip install cibuildwheel==2.12.1
install: python -m pip install cibuildwheel==2.12.2
build_script: python -m cibuildwheel --output-dir wheelhouse
+3 -3
View File
@@ -6,7 +6,7 @@ jobs:
- bash: |
set -o errexit
python3 -m pip install --upgrade pip
pip3 install cibuildwheel==2.12.1
pip3 install cibuildwheel==2.12.2
displayName: Install dependencies
- bash: cibuildwheel --output-dir wheelhouse .
displayName: Build wheels
@@ -20,7 +20,7 @@ jobs:
- bash: |
set -o errexit
python3 -m pip install --upgrade pip
python3 -m pip install cibuildwheel==2.12.1
python3 -m pip install cibuildwheel==2.12.2
displayName: Install dependencies
- bash: cibuildwheel --output-dir wheelhouse .
displayName: Build wheels
@@ -34,7 +34,7 @@ jobs:
- bash: |
set -o errexit
python -m pip install --upgrade pip
pip install cibuildwheel==2.12.1
pip install cibuildwheel==2.12.2
displayName: Install dependencies
- bash: cibuildwheel --output-dir wheelhouse .
displayName: Build wheels
+3 -3
View File
@@ -11,7 +11,7 @@ jobs:
- run:
name: Build the Linux wheels.
command: |
pip3 install --user cibuildwheel==2.12.1
pip3 install --user cibuildwheel==2.12.2
cibuildwheel --output-dir wheelhouse
- store_artifacts:
path: wheelhouse/
@@ -28,7 +28,7 @@ jobs:
- run:
name: Build the Linux aarch64 wheels.
command: |
python3 -m pip install --user cibuildwheel==2.12.1
python3 -m pip install --user cibuildwheel==2.12.2
python3 -m cibuildwheel --output-dir wheelhouse
- store_artifacts:
path: wheelhouse/
@@ -42,7 +42,7 @@ jobs:
- run:
name: Build the OS X wheels.
command: |
pip3 install cibuildwheel==2.12.1
pip3 install cibuildwheel==2.12.2
cibuildwheel --output-dir wheelhouse
- store_artifacts:
path: wheelhouse/
+1 -1
View File
@@ -1,6 +1,6 @@
build_and_store_wheels: &BUILD_AND_STORE_WHEELS
install_cibuildwheel_script:
- python -m pip install cibuildwheel==2.12.1
- python -m pip install cibuildwheel==2.12.2
run_cibuildwheel_script:
- cibuildwheel
wheels_artifacts:
+1 -1
View File
@@ -1,6 +1,6 @@
build_and_store_wheels: &BUILD_AND_STORE_WHEELS
install_cibuildwheel_script:
- python -m pip install cibuildwheel==2.12.1
- python -m pip install cibuildwheel==2.12.2
run_cibuildwheel_script:
- cibuildwheel
wheels_artifacts:
+1 -1
View File
@@ -10,7 +10,7 @@ jobs:
- uses: actions/checkout@v3
- name: Build wheels
uses: pypa/cibuildwheel@v2.12.1
uses: pypa/cibuildwheel@v2.12.2
env:
CIBW_ARCHS_MACOS: x86_64 arm64
+1 -1
View File
@@ -22,7 +22,7 @@ jobs:
- uses: actions/checkout@v3
- name: Build wheels
uses: pypa/cibuildwheel@v2.12.1
uses: pypa/cibuildwheel@v2.12.2
- uses: actions/upload-artifact@v3
with:
+1 -1
View File
@@ -14,7 +14,7 @@ jobs:
- uses: actions/checkout@v3
- name: Build wheels
uses: pypa/cibuildwheel@v2.12.1
uses: pypa/cibuildwheel@v2.12.2
# env:
# CIBW_SOME_OPTION: value
# ...
+1 -1
View File
@@ -20,7 +20,7 @@ jobs:
platforms: all
- name: Build wheels
uses: pypa/cibuildwheel@v2.12.1
uses: pypa/cibuildwheel@v2.12.2
env:
# configure cibuildwheel to build native archs ('auto'), and some
# emulated ones
+2 -2
View File
@@ -12,7 +12,7 @@ linux:
DOCKER_TLS_CERTDIR: ""
script:
- curl -sSL https://get.docker.com/ | sh
- python -m pip install cibuildwheel==2.12.1
- python -m pip install cibuildwheel==2.12.2
- cibuildwheel --output-dir wheelhouse
artifacts:
paths:
@@ -23,7 +23,7 @@ windows:
before_script:
- choco install python -y --version 3.8.6
- choco install git.install -y
- py -m pip install cibuildwheel==2.12.1
- py -m pip install cibuildwheel==2.12.2
script:
- py -m cibuildwheel --output-dir wheelhouse --platform windows
artifacts:
+1 -1
View File
@@ -14,7 +14,7 @@ linux:
- curl -sSL https://get.docker.com/ | sh
# Warning: This is extremely slow, be careful with how many wheels you build
- docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
- python -m pip install cibuildwheel==2.12.1
- python -m pip install cibuildwheel==2.12.2
# Assuming your CI runner's default architecture is x86_64...
- cibuildwheel --output-dir wheelhouse --platform linux --archs aarch64
artifacts:
+1 -1
View File
@@ -20,7 +20,7 @@ jobs:
- ln -s /c/Python38/python.exe /c/Python38/python3.exe
install:
- python3 -m pip install cibuildwheel==2.12.1
- python3 -m pip install cibuildwheel==2.12.2
script:
# build the wheels, put them into './dist'
+1 -1
View File
@@ -26,7 +26,7 @@ jobs:
- ln -s /c/Python38/python.exe /c/Python38/python3.exe
install:
- python3 -m pip install cibuildwheel==2.12.1
- python3 -m pip install cibuildwheel==2.12.2
script:
# build the wheels, put them into './wheelhouse'
+2 -2
View File
@@ -54,7 +54,7 @@ jobs:
- stage: deploy
name: Build and deploy Linux wheels
services: docker
install: python3 -m pip install cibuildwheel==2.12.1 twine
install: python3 -m pip install cibuildwheel==2.12.2 twine
script: python3 -m cibuildwheel --output-dir wheelhouse
after_success: python3 -m twine upload --skip-existing wheelhouse/*.whl
# Deploy on windows
@@ -62,7 +62,7 @@ jobs:
name: Build and deploy Windows wheels
os: windows
language: shell
install: python3 -m pip install cibuildwheel==2.12.1 twine
install: python3 -m pip install cibuildwheel==2.12.2 twine
script: python3 -m cibuildwheel --output-dir wheelhouse
after_success: python3 -m twine upload --skip-existing wheelhouse/*.whl
+37 -23
View File
@@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"
[tool.black]
line-length = 100
target-version = ['py37', 'py38', 'py39', 'py310']
target-version = ['py37', 'py38', 'py39', 'py310', 'py311']
[tool.pytest.ini_options]
@@ -83,10 +83,10 @@ ignore = [
]
[tool.pylint]
master.py-version = "3.7"
master.jobs = "0"
master.fail-on = ["E", "F"]
master.fail-under = "9.8"
py-version = "3.7"
jobs = "0"
fail-on = ["E", "F"]
fail-under = "9.8"
reports.output-format = "colorized"
messages_control.enable = [
"useless-suppression",
@@ -120,26 +120,30 @@ messages_control.disable = [
[tool.ruff]
select = [
"E", "F", "W", # flake8
"B", "B904", # flake8-bugbear
"I", # isort
"ARG", # flake8-unused-arguments
"C4", # flake8-comprehensions
"EM", # flake8-errmsg
"ICN", # flake8-import-conventions
"ISC", # flake8-implicit-str-concat
"PGH", # pygrep-hooks
"PIE", # flake8-pie
"PLC", "PLE", "PLW", # pylint
"PT", # flake8-pytest-style
"RET", # flake8-return
"RUF", # Ruff-specific
"SIM", # flake8-simplify
"UP", # pyupgrade
"YTT", # flake8-2020
"E", "F", "W", # flake8
"B", # flake8-bugbear
"I", # isort
"ARG", # flake8-unused-arguments
"C4", # flake8-comprehensions
"EM", # flake8-errmsg
"ICN", # flake8-import-conventions
"ISC", # flake8-implicit-str-concat
"G", # flake8-logging-format
"PGH", # pygrep-hooks
"PIE", # flake8-pie
"PL", # pylint
"PT", # flake8-pytest-style
"RET", # flake8-return
"RUF", # Ruff-specific
"SIM", # flake8-simplify
"TID251", # flake8-tidy-imports.banned-api
"UP", # pyupgrade
"YTT", # flake8-2020
"EXE", # flake8-executable
]
extend-ignore = [
"PLR2004", "E501",
"PLR", # Design related pylint codes
"E501", # Line too long
"RET504", "RET505", "RET508", # else after control flow
"PT004", # Rename suggested for returnless fixtures
"PT007", # False positive (fixed upstream)
@@ -147,3 +151,13 @@ extend-ignore = [
target-version = "py37"
typing-modules = ["cibuildwheel.typing"]
flake8-unused-arguments.ignore-variadic-names = true
[tool.ruff.flake8-tidy-imports.banned-api]
"typing.Mapping".msg = "Use collections.abc.Mapping instead."
"typing.Callable".msg = "Use collections.abc.Callable instead."
"typing.Iterator".msg = "Use collections.abc.Iterator instead."
"typing.Sequence".msg = "Use collections.abc.Sequence instead."
"typing.Set".msg = "Use collections.abc.Set instead."
[tool.ruff.per-file-ignores]
"unit_test/*" = ["PLC1901"]
+1 -1
View File
@@ -1,6 +1,6 @@
[metadata]
name = cibuildwheel
version = 2.12.1
version = 2.12.2
description = Build Python wheels on CI with minimal configuration.
long_description = file: README.md
long_description_content_type = text/markdown
-11
View File
@@ -27,20 +27,9 @@ extras = {
"rich>=9.6",
"packaging>=21.0",
],
"mypy": [
"mypy>=0.901",
"types-jinja2",
"types-certifi",
"types-toml",
"types-jinja2",
"types-pyyaml",
"types-click",
"types-requests",
],
}
extras["dev"] = [
*extras["mypy"],
*extras["test"],
*extras["bin"],
]
+1 -3
View File
@@ -45,9 +45,7 @@ VERSION_REGEX = r"([\w-]+)==([^\s]+)"
def get_versions_from_constraint_file(constraint_file):
constraint_file_text = constraint_file.read_text(encoding="utf8")
return {
package: version for package, version in re.findall(VERSION_REGEX, constraint_file_text)
}
return dict(re.findall(VERSION_REGEX, constraint_file_text))
@pytest.mark.parametrize("python_version", ["3.6", "3.8", "3.9"])
+2 -2
View File
@@ -12,9 +12,9 @@ basic_project = test_projects.new_c_project()
def skip_if_no_msvc(arm64=False):
programfiles = os.getenv("ProgramFiles(x86)", "") or os.getenv("ProgramFiles", "")
programfiles = os.getenv("PROGRAMFILES(X86)", "") or os.getenv("PROGRAMFILES", "")
if not programfiles:
pytest.skip("Requires %ProgramFiles(x86)% variable to be set")
pytest.skip("Requires %PROGRAMFILES(X86)% variable to be set")
vswhere = os.path.join(programfiles, "Microsoft Visual Studio", "Installer", "vswhere.exe")
if not os.path.isfile(vswhere):
+3 -3
View File
@@ -3,9 +3,9 @@ from __future__ import annotations
import platform as platform_module
import subprocess
import sys
import typing
from contextlib import contextmanager
from pathlib import PurePosixPath
from typing import cast
from unittest import mock
import pytest
@@ -52,7 +52,7 @@ def test_build_default_launches(monkeypatch):
main()
build_in_container = cast(mock.Mock, linux.build_in_container)
build_in_container = typing.cast(mock.Mock, linux.build_in_container)
assert build_in_container.call_count == 4
@@ -120,7 +120,7 @@ before-all = "true"
main()
build_in_container = cast(mock.Mock, linux.build_in_container)
build_in_container = typing.cast(mock.Mock, linux.build_in_container)
assert build_in_container.call_count == 6
+3 -2
View File
@@ -7,7 +7,7 @@ from pathlib import Path
import pytest
from cibuildwheel.__main__ import get_build_identifiers
from cibuildwheel.__main__ import get_build_identifiers, get_platform_module
from cibuildwheel.bashlex_eval import local_environment_executor
from cibuildwheel.environment import parse_environment
from cibuildwheel.options import (
@@ -49,8 +49,9 @@ def test_options_1(tmp_path, monkeypatch):
options = Options(platform="linux", command_line_arguments=args, env={})
module = get_platform_module("linux")
identifiers = get_build_identifiers(
platform="linux",
platform_module=module,
build_selector=options.globals.build_selector,
architectures=options.globals.architectures,
)