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].

diff --git a/.github/workflows/pypi_upload.yml b/.github/workflows/pypi_upload.yml
index d52f41a4939788965d7e1b0cb3c2af61a58250fa..ae26a814c9eba6880d2625cec96067ba8e9a163a 100644 (file)
--- a/.github/workflows/pypi_upload.yml
+++ b/.github/workflows/pypi_upload.yml
@@ -58,7 +58,7 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Build wheels via cibuildwheel
       - uses: actions/checkout@v3
 
       - name: Build wheels via cibuildwheel

-        uses: pypa/cibuildwheel@v2.8.1
+        uses: pypa/cibuildwheel@v2.10.0

         env:
           CIBW_ARCHS_MACOS: "${{ matrix.macos_arch }}"
           # This isn't supported in pyproject.toml which makes sense (but is annoying).
         env:
           CIBW_ARCHS_MACOS: "${{ matrix.macos_arch }}"
           # This isn't supported in pyproject.toml which makes sense (but is annoying).

diff --git a/CHANGES.md b/CHANGES.md
index 147100c30124b2becbbb4cf76427000af741979d..0fa80ad8124fffddd3de77b530042244cff29482 100644 (file)
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -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
 
 <!-- Changes to the parser or to version autodetection -->
 ### Parser
 
 <!-- Changes to the parser or to version autodetection -->

diff --git a/pyproject.toml b/pyproject.toml
index a4c9c692085f4ba7e3310d296ad3c11daf201771..122a49e004bb30fe356b2b8b92638828a5e67392 100644 (file)
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -55,6 +55,9 @@ MYPYC_DEBUG_LEVEL = "0"
 # 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.
 PIP_NO_BUILD_ISOLATION = "no"
 # 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.
 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]
 before-build = [
 
 [tool.cibuildwheel.linux]
 before-build = [


@@ -69,6 +72,7 @@ MYPYC_DEBUG_LEVEL = "0"
 PIP_NO_BUILD_ISOLATION = "no"
 # Black needs Clang to compile successfully on Linux.
 CC = "clang"
 PIP_NO_BUILD_ISOLATION = "no"
 # Black needs Clang to compile successfully on Linux.
 CC = "clang"

+AIOHTTP_NO_EXTENSIONS = "1"

 
 [tool.cibuildwheel.windows]
 # For some reason, (compiled) mypyc is failing to start up with "ImportError: DLL load
 
 [tool.cibuildwheel.windows]
 # For some reason, (compiled) mypyc is failing to start up with "ImportError: DLL load

diff --git a/src/black/files.py b/src/black/files.py
index d51c1bc7a90231106540bdb7fcdadb115d626225..ed503f5fec79bc69d693a9d1c72d82254304b782 100644 (file)
--- a/src/black/files.py
+++ b/src/black/files.py
@@ -26,7 +26,8 @@ if sys.version_info >= (3, 11):
         import tomllib
     except ImportError:
         # Help users on older alphas
         import tomllib
     except ImportError:
         # Help users on older alphas

-        import tomli as tomllib
+        if not TYPE_CHECKING:
+            import tomli as tomllib

 else:
     import tomli as tomllib
 
 else:
     import tomli as tomllib