From 15b6400d6439aad9859faba91ce297dfeae8d31d Mon Sep 17 00:00:00 2001 From: Christian Heimes Date: Wed, 14 Mar 2018 07:40:20 +0100 Subject: bpo-30622: Fix backport of NPN fix (#6102) Fix backport a79591cf of bpo-30622 to 3.6 branch. Signed-off-by: Christian Heimes --- Modules/_ssl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/_ssl.c b/Modules/_ssl.c index 2fe696d..c54e43c 100644 --- a/Modules/_ssl.c +++ b/Modules/_ssl.c @@ -2747,7 +2747,7 @@ _ssl__SSLContext_impl(PyTypeObject *type, int proto_version) return NULL; } self->ctx = ctx; -#ifdef HAVE_NPN +#if HAVE_NPN self->npn_protocols = NULL; #endif #if HAVE_ALPN -- cgit v0.12 From 0330c853d672a1c9ed4101498d6e35f6073acb85 Mon Sep 17 00:00:00 2001 From: "Miss Islington (bot)" <31488909+miss-islington@users.noreply.github.com> Date: Sat, 17 Mar 2018 09:19:41 -0700 Subject: Update pip to 9.0.2 and setuptools to 38.6.1 (GH-6133) (#6136) (cherry picked from commit 7f81bb2addbbccfa45a2fc1aa6030f26dcf4bd78) Co-authored-by: Donald Stufft --- Lib/ensurepip/__init__.py | 4 ++-- Lib/ensurepip/_bundled/pip-9.0.1-py2.py3-none-any.whl | Bin 1254803 -> 0 bytes Lib/ensurepip/_bundled/pip-9.0.2-py2.py3-none-any.whl | Bin 0 -> 1400942 bytes .../_bundled/setuptools-28.8.0-py2.py3-none-any.whl | Bin 472830 -> 0 bytes .../_bundled/setuptools-38.6.1-py2.py3-none-any.whl | Bin 0 -> 490310 bytes 5 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 Lib/ensurepip/_bundled/pip-9.0.1-py2.py3-none-any.whl create mode 100644 Lib/ensurepip/_bundled/pip-9.0.2-py2.py3-none-any.whl delete mode 100644 Lib/ensurepip/_bundled/setuptools-28.8.0-py2.py3-none-any.whl create mode 100644 Lib/ensurepip/_bundled/setuptools-38.6.1-py2.py3-none-any.whl diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py index d69e09f..d7a6dcf 100644 --- a/Lib/ensurepip/__init__.py +++ b/Lib/ensurepip/__init__.py @@ -8,9 +8,9 @@ import tempfile __all__ = ["version", "bootstrap"] -_SETUPTOOLS_VERSION = "28.8.0" +_SETUPTOOLS_VERSION = "38.6.1" -_PIP_VERSION = "9.0.1" +_PIP_VERSION = "9.0.2" _PROJECTS = [ ("setuptools", _SETUPTOOLS_VERSION), diff --git a/Lib/ensurepip/_bundled/pip-9.0.1-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/pip-9.0.1-py2.py3-none-any.whl deleted file mode 100644 index 4b8ecc6..0000000 Binary files a/Lib/ensurepip/_bundled/pip-9.0.1-py2.py3-none-any.whl and /dev/null differ diff --git a/Lib/ensurepip/_bundled/pip-9.0.2-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/pip-9.0.2-py2.py3-none-any.whl new file mode 100644 index 0000000..baf1f57 Binary files /dev/null and b/Lib/ensurepip/_bundled/pip-9.0.2-py2.py3-none-any.whl differ diff --git a/Lib/ensurepip/_bundled/setuptools-28.8.0-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/setuptools-28.8.0-py2.py3-none-any.whl deleted file mode 100644 index 502e3cb..0000000 Binary files a/Lib/ensurepip/_bundled/setuptools-28.8.0-py2.py3-none-any.whl and /dev/null differ diff --git a/Lib/ensurepip/_bundled/setuptools-38.6.1-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/setuptools-38.6.1-py2.py3-none-any.whl new file mode 100644 index 0000000..2707d8b Binary files /dev/null and b/Lib/ensurepip/_bundled/setuptools-38.6.1-py2.py3-none-any.whl differ -- cgit v0.12 From 3647f85675632cb58385e4cf681ff9d30c5f881d Mon Sep 17 00:00:00 2001 From: "Miss Islington (bot)" <31488909+miss-islington@users.noreply.github.com> Date: Wed, 21 Mar 2018 20:50:50 -0700 Subject: Upgrade pip to v9.0.3 and setuptools to v39.0.1 (GH-6184) (cherry picked from commit d93b5161af12291f3f98a260c90cc2975ea9e9cd) Co-authored-by: Donald Stufft --- Lib/ensurepip/__init__.py | 4 ++-- Lib/ensurepip/_bundled/pip-9.0.2-py2.py3-none-any.whl | Bin 1400942 -> 0 bytes Lib/ensurepip/_bundled/pip-9.0.3-py2.py3-none-any.whl | Bin 0 -> 1400985 bytes .../_bundled/setuptools-38.6.1-py2.py3-none-any.whl | Bin 490310 -> 0 bytes .../_bundled/setuptools-39.0.1-py2.py3-none-any.whl | Bin 0 -> 569436 bytes 5 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 Lib/ensurepip/_bundled/pip-9.0.2-py2.py3-none-any.whl create mode 100644 Lib/ensurepip/_bundled/pip-9.0.3-py2.py3-none-any.whl delete mode 100644 Lib/ensurepip/_bundled/setuptools-38.6.1-py2.py3-none-any.whl create mode 100644 Lib/ensurepip/_bundled/setuptools-39.0.1-py2.py3-none-any.whl diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py index d7a6dcf..4a5b058 100644 --- a/Lib/ensurepip/__init__.py +++ b/Lib/ensurepip/__init__.py @@ -8,9 +8,9 @@ import tempfile __all__ = ["version", "bootstrap"] -_SETUPTOOLS_VERSION = "38.6.1" +_SETUPTOOLS_VERSION = "39.0.1" -_PIP_VERSION = "9.0.2" +_PIP_VERSION = "9.0.3" _PROJECTS = [ ("setuptools", _SETUPTOOLS_VERSION), diff --git a/Lib/ensurepip/_bundled/pip-9.0.2-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/pip-9.0.2-py2.py3-none-any.whl deleted file mode 100644 index baf1f57..0000000 Binary files a/Lib/ensurepip/_bundled/pip-9.0.2-py2.py3-none-any.whl and /dev/null differ diff --git a/Lib/ensurepip/_bundled/pip-9.0.3-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/pip-9.0.3-py2.py3-none-any.whl new file mode 100644 index 0000000..5d33bba Binary files /dev/null and b/Lib/ensurepip/_bundled/pip-9.0.3-py2.py3-none-any.whl differ diff --git a/Lib/ensurepip/_bundled/setuptools-38.6.1-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/setuptools-38.6.1-py2.py3-none-any.whl deleted file mode 100644 index 2707d8b..0000000 Binary files a/Lib/ensurepip/_bundled/setuptools-38.6.1-py2.py3-none-any.whl and /dev/null differ diff --git a/Lib/ensurepip/_bundled/setuptools-39.0.1-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/setuptools-39.0.1-py2.py3-none-any.whl new file mode 100644 index 0000000..edc3ca2 Binary files /dev/null and b/Lib/ensurepip/_bundled/setuptools-39.0.1-py2.py3-none-any.whl differ -- cgit v0.12 From 7f554c536cfe2e66a1ff0a36c8896040be1e5aee Mon Sep 17 00:00:00 2001 From: "Miss Islington (bot)" <31488909+miss-islington@users.noreply.github.com> Date: Tue, 27 Mar 2018 23:43:51 -0700 Subject: bpo-32872: Avoid regrtest compatibility issue with namespace packages. (GH-6276) (GH-6278) (cherry picked from commit e52ac045972a4f75d7f52e4ee0d6de128259134d) Co-authored-by: Ned Deily --- Lib/test/libregrtest/setup.py | 2 +- Misc/NEWS.d/next/Tests/2018-03-28-01-35-02.bpo-32872.J5NDUj.rst | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 Misc/NEWS.d/next/Tests/2018-03-28-01-35-02.bpo-32872.J5NDUj.rst diff --git a/Lib/test/libregrtest/setup.py b/Lib/test/libregrtest/setup.py index bf899a9..910aca1 100644 --- a/Lib/test/libregrtest/setup.py +++ b/Lib/test/libregrtest/setup.py @@ -57,7 +57,7 @@ def setup_tests(ns): if hasattr(module, '__path__'): for index, path in enumerate(module.__path__): module.__path__[index] = os.path.abspath(path) - if hasattr(module, '__file__'): + if getattr(module, '__file__', None): module.__file__ = os.path.abspath(module.__file__) # MacOSX (a.k.a. Darwin) has a default stack size that is too small diff --git a/Misc/NEWS.d/next/Tests/2018-03-28-01-35-02.bpo-32872.J5NDUj.rst b/Misc/NEWS.d/next/Tests/2018-03-28-01-35-02.bpo-32872.J5NDUj.rst new file mode 100644 index 0000000..06d656b --- /dev/null +++ b/Misc/NEWS.d/next/Tests/2018-03-28-01-35-02.bpo-32872.J5NDUj.rst @@ -0,0 +1 @@ +Avoid regrtest compatibility issue with namespace packages. -- cgit v0.12 From db65936a40e13144ec5307d16755a954f6a36b7e Mon Sep 17 00:00:00 2001 From: "Miss Islington (bot)" <31488909+miss-islington@users.noreply.github.com> Date: Wed, 28 Mar 2018 01:52:07 -0700 Subject: bpo-33163: Upgrade pip to 9.0.3 and setuptools to v39.0.1. (GH-6285) (cherry picked from commit c0518cde7a8404f310cd3495e77e612820ecad4f) Co-authored-by: Ned Deily --- Misc/NEWS.d/next/Build/2018-03-28-04-15-03.bpo-33163.hfpWuU.rst | 1 + 1 file changed, 1 insertion(+) create mode 100644 Misc/NEWS.d/next/Build/2018-03-28-04-15-03.bpo-33163.hfpWuU.rst diff --git a/Misc/NEWS.d/next/Build/2018-03-28-04-15-03.bpo-33163.hfpWuU.rst b/Misc/NEWS.d/next/Build/2018-03-28-04-15-03.bpo-33163.hfpWuU.rst new file mode 100644 index 0000000..b3f04e3 --- /dev/null +++ b/Misc/NEWS.d/next/Build/2018-03-28-04-15-03.bpo-33163.hfpWuU.rst @@ -0,0 +1 @@ +Upgrade pip to 9.0.3 and setuptools to v39.0.1. -- cgit v0.12 From f59c0932b4e160f279fb98de4cdad2f58269e0a5 Mon Sep 17 00:00:00 2001 From: Ned Deily Date: Wed, 28 Mar 2018 05:19:31 -0400 Subject: 3.6.5final --- Include/patchlevel.h | 6 +++--- Misc/NEWS.d/3.6.5.rst | 16 ++++++++++++++++ .../next/Build/2018-03-28-04-15-03.bpo-33163.hfpWuU.rst | 1 - .../next/Tests/2018-03-28-01-35-02.bpo-32872.J5NDUj.rst | 1 - README.rst | 4 ++-- 5 files changed, 21 insertions(+), 7 deletions(-) create mode 100644 Misc/NEWS.d/3.6.5.rst delete mode 100644 Misc/NEWS.d/next/Build/2018-03-28-04-15-03.bpo-33163.hfpWuU.rst delete mode 100644 Misc/NEWS.d/next/Tests/2018-03-28-01-35-02.bpo-32872.J5NDUj.rst diff --git a/Include/patchlevel.h b/Include/patchlevel.h index 7ed3ea0..3dd89f6 100644 --- a/Include/patchlevel.h +++ b/Include/patchlevel.h @@ -19,11 +19,11 @@ #define PY_MAJOR_VERSION 3 #define PY_MINOR_VERSION 6 #define PY_MICRO_VERSION 5 -#define PY_RELEASE_LEVEL PY_RELEASE_LEVEL_GAMMA -#define PY_RELEASE_SERIAL 1 +#define PY_RELEASE_LEVEL PY_RELEASE_LEVEL_FINAL +#define PY_RELEASE_SERIAL 0 /* Version as a string */ -#define PY_VERSION "3.6.5rc1" +#define PY_VERSION "3.6.5" /*--end constants--*/ /* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2. diff --git a/Misc/NEWS.d/3.6.5.rst b/Misc/NEWS.d/3.6.5.rst new file mode 100644 index 0000000..ded13ae --- /dev/null +++ b/Misc/NEWS.d/3.6.5.rst @@ -0,0 +1,16 @@ +.. bpo: 32872 +.. date: 2018-03-28-01-35-02 +.. nonce: J5NDUj +.. release date: 2018-03-28 +.. section: Tests + +Avoid regrtest compatibility issue with namespace packages. + +.. + +.. bpo: 33163 +.. date: 2018-03-28-04-15-03 +.. nonce: hfpWuU +.. section: Build + +Upgrade pip to 9.0.3 and setuptools to v39.0.1. diff --git a/Misc/NEWS.d/next/Build/2018-03-28-04-15-03.bpo-33163.hfpWuU.rst b/Misc/NEWS.d/next/Build/2018-03-28-04-15-03.bpo-33163.hfpWuU.rst deleted file mode 100644 index b3f04e3..0000000 --- a/Misc/NEWS.d/next/Build/2018-03-28-04-15-03.bpo-33163.hfpWuU.rst +++ /dev/null @@ -1 +0,0 @@ -Upgrade pip to 9.0.3 and setuptools to v39.0.1. diff --git a/Misc/NEWS.d/next/Tests/2018-03-28-01-35-02.bpo-32872.J5NDUj.rst b/Misc/NEWS.d/next/Tests/2018-03-28-01-35-02.bpo-32872.J5NDUj.rst deleted file mode 100644 index 06d656b..0000000 --- a/Misc/NEWS.d/next/Tests/2018-03-28-01-35-02.bpo-32872.J5NDUj.rst +++ /dev/null @@ -1 +0,0 @@ -Avoid regrtest compatibility issue with namespace packages. diff --git a/README.rst b/README.rst index 248fe27..21b6084 100644 --- a/README.rst +++ b/README.rst @@ -1,5 +1,5 @@ -This is Python version 3.6.5 release candidate 1 -================================================ +This is Python version 3.6.5 +============================ .. image:: https://travis-ci.org/python/cpython.svg?branch=3.6 :alt: CPython build status on Travis CI -- cgit v0.12