Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade Pex to 2.1.65. (Cherry-pick of #14256) #14617

Merged
merged 2 commits into from Feb 25, 2022

Conversation

jsirois
Copy link
Member

@jsirois jsirois commented Feb 25, 2022

This picks up a support for mac universal2 wheels. This support is
pressing since cryptography publishes these things and crytography is a
library folks tend to have in their transitive dependency set.

The intervening changelogs are here:

Fixes #14244

(cherry picked from commit 3f5f4d2)

[ci skip-rust]

[ci skip-build-wheels]

This picks up a support for mac universal2 wheels. This support is
pressing since cryptography publishes these things and crytography is a
library folks tend to have in their transitive dependency set.

The intervening changelogs are here:
+ https://github.com/pantsbuild/pex/releases/tag/v2.1.65
+ https://github.com/pantsbuild/pex/releases/tag/v2.1.64
+ https://github.com/pantsbuild/pex/releases/tag/v2.1.63
+ https://github.com/pantsbuild/pex/releases/tag/v2.1.62

Fixes pantsbuild#14244

(cherry picked from commit 3f5f4d2)

[ci skip-rust]

[ci skip-build-wheels]
@jsirois
Copy link
Member Author

jsirois commented Feb 25, 2022

The cherry-pick was not clean in lock files; so I re-generated the 2 relevant ones. The local commit hook showed this as well:

$ git cherry-pick --continue 
* Typechecking
07:32:26.09 [INFO] Starting: Resolving plugins: hdrhistogram, toolchain.pants.plugin==0.17.0
07:32:28.20 [INFO] Completed: Resolving plugins: hdrhistogram, toolchain.pants.plugin==0.17.0
07:32:28.72 [INFO] Initializing scheduler...
07:32:29.01 [INFO] Scheduler initialized.
07:32:33.59 [INFO] Completed: Building dockerfile_parser.pex from dockerfile-parser_default_lockfile.txt
07:32:43.05 [INFO] Completed: Building extra_type_stubs.pex
07:32:50.13 [INFO] Completed: Installing 3rdparty/python/lockfiles/user_reqs.txt
07:32:50.53 [INFO] Completed: Extracting 21 requirements to build requirements.pex from lockfile.pex: PyYAML<7.0,>=6.0, ansicolors==1.1.8, chevron==0.14.0, fasteners==0.16.3, freezegun==1.1.0, humbug==0.2.7, ijson==3.1.4, packagin... (285 characters truncated)
07:32:52.74 [INFO] Completed: Building mypy.pex from mypy_default_lockfile.txt
07:32:53.28 [INFO] Completed: Building requirements_venv.pex
07:33:05.50 [ERROR] Completed: Typecheck using MyPy - MyPy failed (exit code 1).
testprojects/src/python/native/setup.py:5: error: unused "type: ignore" comment
    from setuptools import Extension, setup  # type: ignore[import]
    ^
src/python/pants/goal/run_tracker_test.py:20: error: unused "type: ignore"
comment
    @freeze_time(datetime.datetime(2020, 1, 1, 12, 0, 0), as_kwarg="frozen...
    ^
src/python/pants/goal/run_tracker_test.py:40: error: unused "type: ignore"
comment
    @freeze_time(datetime.datetime(2020, 1, 10, 12, 0, 1), as_kwarg="froze...
    ^
src/python/pants/goal/run_tracker_test.py:75: error: unused "type: ignore"
comment
    @freeze_time(datetime.datetime(2020, 1, 10, 12, 0, 1), as_kwarg="froze...
    ^
Found 4 errors in 2 files (checked 797 source files)



𐄂 MyPy failed.

So I had to commit -n. I did not find either 2.9.x red actions (no one cherry-picked and ignore this problem) nor did I see changes to mypy version nor the 2 erroring files on this branch; so I'm stumped and have lazily pushed this PR to see what CI thinks before thinking harder about this mystery.

@jsirois
Copy link
Member Author

jsirois commented Feb 25, 2022

OK, sanity checked, same error in CI: https://github.com/pantsbuild/pants/runs/5335784833?check_suite_focus=true#step:10:328

Digging...

@jsirois jsirois changed the title Upgrade Pex to 2.1.65. (#14256) Upgrade Pex to 2.1.65. (Cherry-pick of #14256) Feb 25, 2022
Comment on lines +28 to +30
# "types-freezegun==1.1.6",
# "types-requests==2.27.5",
# "types-setuptools==57.4.7",
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Aha - these 2 bumps (freezegun & setuptools) trigger the unused type[ignore] warnings. I'll hand roll those fixes into those non-production files instead of altering locks.

# Rust tests and lints will be skipped. Delete if not intended.
[ci skip-rust]

# Building wheels and fs_util will be skipped. Delete if not intended.
[ci skip-build-wheels]
@jsirois jsirois requested a review from stuhood February 25, 2022 17:20
Copy link
Contributor

@Eric-Arellano Eric-Arellano left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you!

@jsirois jsirois merged commit ac92b12 into pantsbuild:2.9.x Feb 25, 2022
@jsirois jsirois deleted the cherry-pick/14256/2.9.x branch February 25, 2022 17:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants