From 96bed03967d1ccc609135b8d2e851bf0db0acf6d Mon Sep 17 00:00:00 2001 From: Shantanu Jain Date: Sat, 7 Sep 2024 16:51:14 -0700 Subject: [PATCH 1/4] Update mypy/c --- .pre-commit-config.yaml | 2 +- CHANGES.md | 2 ++ pyproject.toml | 6 +++--- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 3e45665da48..9dcf9382346 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -39,7 +39,7 @@ repos: exclude: ^src/blib2to3/ - repo: https://github.com/pre-commit/mirrors-mypy - rev: v1.10.1 + rev: v1.11.2 hooks: - id: mypy exclude: ^(docs/conf.py|scripts/generate_schema.py)$ diff --git a/CHANGES.md b/CHANGES.md index 988c36eeaa9..532ad508b2c 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -30,6 +30,8 @@ +- Upgrade version of mypyc used to 1.11.2 (#4449) + ### Parser diff --git a/pyproject.toml b/pyproject.toml index aeab33f8299..0cdea249ca0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -129,8 +129,8 @@ macos-max-compat = true enable-by-default = false dependencies = [ "hatch-mypyc>=0.16.0", - "mypy==1.7.1", - "click==8.1.3", # avoid https://github.com/pallets/click/issues/2558 + "mypy==1.11.2", + "click>=8.1.7", ] require-runtime-dependencies = true exclude = [ @@ -194,7 +194,7 @@ CC = "clang" build-frontend = { name = "build", args = ["--no-isolation"] } # Unfortunately, hatch doesn't respect MACOSX_DEPLOYMENT_TARGET before-build = [ - "python -m pip install 'hatchling==1.20.0' hatch-vcs hatch-fancy-pypi-readme 'hatch-mypyc>=0.16.0' 'mypy==1.7.1' 'click==8.1.3'", + "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'", """sed -i '' -e "600,700s/'10_16'/os.environ['MACOSX_DEPLOYMENT_TARGET'].replace('.', '_')/" $(python -c 'import hatchling.builders.wheel as h; print(h.__file__)') """, ] From c3acf76cca01b2416285f83e911c172f2f8d79bc Mon Sep 17 00:00:00 2001 From: Shantanu Jain Date: Sat, 7 Sep 2024 16:54:33 -0700 Subject: [PATCH 2/4] . --- CHANGES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 532ad508b2c..2ca5461f19f 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -30,7 +30,7 @@ -- Upgrade version of mypyc used to 1.11.2 (#4449) +- Upgrade version of mypyc used to 1.11.2 (#4450) ### Parser From 61c4657318d7f7341ae70ace3853ecc996f106cd Mon Sep 17 00:00:00 2001 From: Shantanu Jain Date: Sat, 7 Sep 2024 16:58:28 -0700 Subject: [PATCH 3/4] add a comment --- pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/pyproject.toml b/pyproject.toml index 0cdea249ca0..1524dd55c4a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -193,6 +193,7 @@ CC = "clang" [tool.cibuildwheel.macos] build-frontend = { name = "build", args = ["--no-isolation"] } # Unfortunately, hatch doesn't respect MACOSX_DEPLOYMENT_TARGET +# Note we don't have a good test for this 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'", """sed -i '' -e "600,700s/'10_16'/os.environ['MACOSX_DEPLOYMENT_TARGET'].replace('.', '_')/" $(python -c 'import hatchling.builders.wheel as h; print(h.__file__)') """, From 671dfbb9f83a525eea0ddb8038fcf76faeec8fed Mon Sep 17 00:00:00 2001 From: Shantanu Jain Date: Sat, 7 Sep 2024 17:00:13 -0700 Subject: [PATCH 4/4] sed --- pyproject.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 1524dd55c4a..e9c0823c82a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -193,7 +193,8 @@ CC = "clang" [tool.cibuildwheel.macos] build-frontend = { name = "build", args = ["--no-isolation"] } # Unfortunately, hatch doesn't respect MACOSX_DEPLOYMENT_TARGET -# Note we don't have a good test for this horror, so if you futz with it, make sure to test manually +# 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'", """sed -i '' -e "600,700s/'10_16'/os.environ['MACOSX_DEPLOYMENT_TARGET'].replace('.', '_')/" $(python -c 'import hatchling.builders.wheel as h; print(h.__file__)') """,