Build mypyc wheels for CPython 3.11 (#3276)
Bumps cibuildwheel from 2.8.1 to 2.10.0 which has 3.11 building enabled by default. Unfortunately mypyc errors out on 3.11: src/black/files.py:29:9: error: Name "tomllib" already defined (by an import) [no-redef] ... so we have to also hide the fallback import of tomli on older 3.11 alphas from mypy[c].
This commit is contained in:
parent
6ae8457a86
commit
75d5c0e3fb
2
.github/workflows/pypi_upload.yml
vendored
2
.github/workflows/pypi_upload.yml
vendored
@ -58,7 +58,7 @@ jobs:
|
|||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
|
|
||||||
- name: Build wheels via cibuildwheel
|
- name: Build wheels via cibuildwheel
|
||||||
uses: pypa/cibuildwheel@v2.8.1
|
uses: pypa/cibuildwheel@v2.10.0
|
||||||
env:
|
env:
|
||||||
CIBW_ARCHS_MACOS: "${{ matrix.macos_arch }}"
|
CIBW_ARCHS_MACOS: "${{ matrix.macos_arch }}"
|
||||||
# This isn't supported in pyproject.toml which makes sense (but is annoying).
|
# This isn't supported in pyproject.toml which makes sense (but is annoying).
|
||||||
|
@ -25,6 +25,8 @@
|
|||||||
|
|
||||||
<!-- Changes to how Black is packaged, such as dependency requirements -->
|
<!-- Changes to how Black is packaged, such as dependency requirements -->
|
||||||
|
|
||||||
|
- Faster compiled wheels are now available for CPython 3.11 (#3276)
|
||||||
|
|
||||||
### Parser
|
### Parser
|
||||||
|
|
||||||
<!-- Changes to the parser or to version autodetection -->
|
<!-- Changes to the parser or to version autodetection -->
|
||||||
|
@ -55,6 +55,9 @@ MYPYC_DEBUG_LEVEL = "0"
|
|||||||
# The dependencies required to build wheels with mypyc aren't specified in
|
# The dependencies required to build wheels with mypyc aren't specified in
|
||||||
# [build-system].requires so we'll have to manage the build environment ourselves.
|
# [build-system].requires so we'll have to manage the build environment ourselves.
|
||||||
PIP_NO_BUILD_ISOLATION = "no"
|
PIP_NO_BUILD_ISOLATION = "no"
|
||||||
|
# CPython 3.11 wheels aren't available for aiohttp and building a Cython extension
|
||||||
|
# from source also doesn't work.
|
||||||
|
AIOHTTP_NO_EXTENSIONS = "1"
|
||||||
|
|
||||||
[tool.cibuildwheel.linux]
|
[tool.cibuildwheel.linux]
|
||||||
before-build = [
|
before-build = [
|
||||||
@ -69,6 +72,7 @@ MYPYC_DEBUG_LEVEL = "0"
|
|||||||
PIP_NO_BUILD_ISOLATION = "no"
|
PIP_NO_BUILD_ISOLATION = "no"
|
||||||
# Black needs Clang to compile successfully on Linux.
|
# Black needs Clang to compile successfully on Linux.
|
||||||
CC = "clang"
|
CC = "clang"
|
||||||
|
AIOHTTP_NO_EXTENSIONS = "1"
|
||||||
|
|
||||||
[tool.cibuildwheel.windows]
|
[tool.cibuildwheel.windows]
|
||||||
# For some reason, (compiled) mypyc is failing to start up with "ImportError: DLL load
|
# For some reason, (compiled) mypyc is failing to start up with "ImportError: DLL load
|
||||||
|
@ -26,6 +26,7 @@
|
|||||||
import tomllib
|
import tomllib
|
||||||
except ImportError:
|
except ImportError:
|
||||||
# Help users on older alphas
|
# Help users on older alphas
|
||||||
|
if not TYPE_CHECKING:
|
||||||
import tomli as tomllib
|
import tomli as tomllib
|
||||||
else:
|
else:
|
||||||
import tomli as tomllib
|
import tomli as tomllib
|
||||||
|
Loading…
Reference in New Issue
Block a user