diff --git a/.github/workflows/pypi_upload.yml b/.github/workflows/pypi_upload.yml index a7cde47b229..48c4448e9e6 100644 --- a/.github/workflows/pypi_upload.yml +++ b/.github/workflows/pypi_upload.yml @@ -47,9 +47,10 @@ jobs: include: ${{ steps.set-matrix.outputs.include }} steps: - uses: actions/checkout@v4 + # Keep cibuildwheel version in sync with below - name: Install cibuildwheel and pypyp run: | - pipx install cibuildwheel==2.20.0 + pipx install cibuildwheel==2.21.2 pipx install pypyp==1 - name: generate matrix if: github.event_name != 'pull_request' @@ -74,7 +75,7 @@ jobs: | pyp 'json.dumps({"only": x, "os": "ubuntu-latest"})' } | pyp 'json.dumps(list(map(json.loads, lines)))' > /tmp/matrix env: - CIBW_BUILD: "cp39-* cp312-*" + CIBW_BUILD: "cp39-* cp313-*" CIBW_ARCHS_LINUX: x86_64 - id: set-matrix run: echo "include=$(cat /tmp/matrix)" | tee -a $GITHUB_OUTPUT @@ -90,7 +91,8 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: pypa/cibuildwheel@v2.20.0 + # Keep cibuildwheel version in sync with above + - uses: pypa/cibuildwheel@v2.21.2 with: only: ${{ matrix.only }} diff --git a/CHANGES.md b/CHANGES.md index 97e8645e3ea..eedc8b26464 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -6,10 +6,8 @@ -- Black is now officially tested with Python 3.13. Note that Black does not yet provide - mypyc-compiled wheels for Python 3.13, so performance may be slower than on other - versions of Python. We will provide 3.13 mypyc-compiled wheels in a future release. - (#4436) +- Black is now officially tested with Python 3.13 and provides Python 3.13 + mypyc-compiled wheels. (#4436) (#4449) - Black will issue an error when used with Python 3.12.5, due to an upstream memory safety issue in Python 3.12.5 that can cause Black's AST safety checks to fail. Please use Python 3.12.6 or Python 3.12.4 instead. (#4447) diff --git a/pyproject.toml b/pyproject.toml index c75d6fec266..19782ba96cc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -125,7 +125,7 @@ macos-max-compat = true enable-by-default = false dependencies = [ "hatch-mypyc>=0.16.0", - "mypy==1.11.2", + "mypy @ git+https://github.com/python/mypy@bc8119150e49895f7a496ae7ae7362a2828e7e9e", "click>=8.1.7", ] require-runtime-dependencies = true @@ -192,7 +192,7 @@ build-frontend = { name = "build", args = ["--no-isolation"] } # Note we don't have a good test for this sed horror, so if you futz with it # make sure to test manually before-build = [ - "python -m pip install 'hatchling==1.20.0' hatch-vcs hatch-fancy-pypi-readme 'hatch-mypyc>=0.16.0' 'mypy==1.11.2' 'click>=8.1.7'", + "python -m pip install 'hatchling==1.20.0' hatch-vcs hatch-fancy-pypi-readme 'hatch-mypyc>=0.16.0' 'mypy @ git+https://github.com/python/mypy@bc8119150e49895f7a496ae7ae7362a2828e7e9e' 'click>=8.1.7'", """sed -i '' -e "600,700s/'10_16'/os.environ['MACOSX_DEPLOYMENT_TARGET'].replace('.', '_')/" $(python -c 'import hatchling.builders.wheel as h; print(h.__file__)') """, ]