Skip to content

Commit

Permalink
Bumped Python version to v3.7.11.
Browse files Browse the repository at this point in the history
Includes OpenSSL 1.1.1j.
  • Loading branch information
freakboy3742 committed Jul 25, 2021
1 parent 003733e commit c4a29c1
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@ BUILD_NUMBER=custom
MACOSX_DEPLOYMENT_TARGET=10.8

# Version of packages that will be compiled by this meta-package
PYTHON_VERSION=3.7.10
PYTHON_VERSION=3.7.11
PYTHON_VER=$(basename $(PYTHON_VERSION))

OPENSSL_VERSION_NUMBER=1.1.1
OPENSSL_REVISION=i
OPENSSL_REVISION=j
OPENSSL_VERSION=$(OPENSSL_VERSION_NUMBER)$(OPENSSL_REVISION)

BZIP2_VERSION=1.0.8
Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Python Apple Support
====================

**This repository branch builds a packaged version of Python 3.7.9**.
**This repository branch builds a packaged version of Python 3.7.11**.
Other Python versions are available by cloning other branches of the main
repository.

Expand Down
14 changes: 7 additions & 7 deletions patch/Python/Python.patch
Original file line number Diff line number Diff line change
Expand Up @@ -12677,7 +12677,7 @@ index 8815c83998..91e6195ff0 100644
# Get sys.path in isolated mode (python3 -I)
popen = subprocess.Popen([sys.executable, '-I', '-c',
diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
index 41ba53b481..00b1932c69 100644
index 5f4b019c04..fa2e5b65ce 100644
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -901,6 +901,12 @@
Expand All @@ -12702,7 +12702,7 @@ index 41ba53b481..00b1932c69 100644
# avoid the 'echo' service on this platform, as there is an
# assumption breaking non-standard port/protocol entry
services = ('daytime', 'qotd', 'domain')
@@ -3156,7 +3162,8 @@
@@ -3158,7 +3164,8 @@
def _testFDPassCMSG_LEN(self):
self.createAndSendFDs(1)

Expand All @@ -12712,7 +12712,7 @@ index 41ba53b481..00b1932c69 100644
@unittest.skipIf(sys.platform.startswith("aix"), "skipping, see issue #22397")
@requireAttrs(socket, "CMSG_SPACE")
def testFDPassSeparate(self):
@@ -3167,7 +3174,8 @@
@@ -3169,7 +3176,8 @@
maxcmsgs=2)

@testFDPassSeparate.client_skip
Expand All @@ -12722,7 +12722,7 @@ index 41ba53b481..00b1932c69 100644
@unittest.skipIf(sys.platform.startswith("aix"), "skipping, see issue #22397")
def _testFDPassSeparate(self):
fd0, fd1 = self.newFDs(2)
@@ -3180,7 +3188,8 @@
@@ -3182,7 +3190,8 @@
array.array("i", [fd1]))]),
len(MSG))

Expand All @@ -12732,7 +12732,7 @@ index 41ba53b481..00b1932c69 100644
@unittest.skipIf(sys.platform.startswith("aix"), "skipping, see issue #22397")
@requireAttrs(socket, "CMSG_SPACE")
def testFDPassSeparateMinSpace(self):
@@ -3194,7 +3203,8 @@
@@ -3196,7 +3205,8 @@
maxcmsgs=2, ignoreflags=socket.MSG_CTRUNC)

@testFDPassSeparateMinSpace.client_skip
Expand All @@ -12742,7 +12742,7 @@ index 41ba53b481..00b1932c69 100644
@unittest.skipIf(sys.platform.startswith("aix"), "skipping, see issue #22397")
def _testFDPassSeparateMinSpace(self):
fd0, fd1 = self.newFDs(2)
@@ -3952,28 +3962,38 @@
@@ -3954,28 +3964,38 @@
pass

@requireAttrs(socket.socket, "sendmsg")
Expand Down Expand Up @@ -12860,7 +12860,7 @@ index 4025c2354a..f8d50642d8 100644
import distutils.text_file
import distutils.unixccompiler
diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py
index 84927a393f..76287412f0 100644
index 0478f20cd3..9f849f531d 100644
--- a/Lib/test/test_sys.py
+++ b/Lib/test/test_sys.py
@@ -108,6 +108,7 @@
Expand Down

0 comments on commit c4a29c1

Please sign in to comment.