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

Merge alt-built Python 3.7 to Main Python 3.7 #59

Merged
merged 11 commits into from
Jul 19, 2024
Merged

Conversation

icanhasmath
Copy link

This is now standard for our distribution.

icanhasmath and others added 10 commits September 27, 2023 15:26
This is required to move forward with the alt-build system.
These are non-branding related camel build patches brought forward
from the 3.7 and 3.8 core patches.
This is the main commit to bring python 3.7 to be compatible with the
alt-build system.  It is adapted from the same work for python 3.8.
This commit disables pip installation from windows builds.  pip can be
installed at any time by running `python -mensurepip` this will install
pip and setuptools wheels that are packaged with the core.

The decision to remove pip from the core was due to our additive model
of packages - a pip or setuptools built in the build process is unable
to entirely replace the original modules.
Type GenericAlias is not defined in 3.7, so best leave it out, as it
brings in quite a lot.
Backported from : [3.8] pythongh-114572: Fix locking in cert_store_stats and
get_ca_certs python#118442
…113179) (pythonGH-113186) (pythonGH-118177)

* Fix "private" (non-global) IP address ranges (pythonGH-113179) (pythonGH-113186)
(pythonGH-118177)

(cherry picked from commit f86b17a)

Co-authored-by: Jakub Stasiak <[email protected]>
(cherry picked from commit 05a1467)

pythongh-113171: pythongh-65056: Fix "private" (non-global) IP address ranges
(pythonGH-113179) (pythonGH-113186) (pythonGH-118177)

* pythonGH-113171: Fix "private" (non-global) IP address ranges (pythonGH-113179)

The _private_networks variables, used by various is_private
implementations, were missing some ranges and at the same time had
overly strict ranges (where there are more specific ranges considered
globally reachable by the IANA registries).

This patch updates the ranges with what was missing or otherwise
incorrect.

100.64.0.0/10 is left alone, for now, as it's been made special in [1].

The _address_exclude_many() call returns 8 networks for IPv4, 121
networks for IPv6.

[1] python#61602

* pythonGH-65056: Improve the IP address' is_global/is_private documentation (pythonGH-113186)

It wasn't clear what the semantics of is_global/is_private are and, when
one gets to the bottom of it, it's not quite so simple (hence the
exceptions listed).

(cherry picked from commit 2a4cbf1)
(cherry picked from commit 40d75c2)

---------

(cherry picked from commit f86b17a)

Co-authored-by: Jakub Stasiak <[email protected]>
(cherry picked from commit 05a1467)

Add IPv6 addresses to suspignore.csv

That's a lot of semicolons!

(cherry picked from commit e366724)
@icanhasmath icanhasmath requested a review from rickprice July 19, 2024 19:12
As we've added an extra patch level we need to handle this in the
tuple.  Originally authored by i-shenl <[email protected]>
Copy link

@rickprice rickprice left a comment

Choose a reason for hiding this comment

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

LGTM

@icanhasmath icanhasmath merged commit 4d3175f into 3.7.17.x Jul 19, 2024
@icanhasmath icanhasmath deleted the merge-alt branch July 19, 2024 21:31
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.

5 participants