Imported Upstream version 1.18.5upstream/1.18.5

10 files changed, 62 insertions, 9 deletions

diff --git a/doc/changelog/1.18.5-changelog.rst b/doc/changelog/1.18.5-changelog.rst
new file mode 100644
index 000000000..f0bc51e6f
--- /dev/null
+++ b/doc/changelog/1.18.5-changelog.rst
@@ -0,0 +1,18 @@
+
+Contributors
+============
+
+A total of 3 people contributed to this release.  People with a "+" by their
+names contributed a patch for the first time.
+
+* Charles Harris
+* Matti Picus
+* Siyuan +
+
+Pull requests merged
+====================
+
+A total of 2 pull requests were merged for this release.
+
+* `#16439 <https://github.com/numpy/numpy/pull/16439>`__: ENH: enable pickle protocol 5 support for python3.5
+* `#16441 <https://github.com/numpy/numpy/pull/16441>`__: BUG: relpath fails for different drives on windows
diff --git a/doc/source/release.rst b/doc/source/release.rst
index fc582bd58..72cfc20e0 100644
--- a/doc/source/release.rst
+++ b/doc/source/release.rst
@@ -5,6 +5,7 @@ Release Notes
 .. toctree::
     :maxdepth: 3
 
+    1.18.5 <release/1.18.5-notes>
     1.18.4 <release/1.18.4-notes>
     1.18.3 <release/1.18.3-notes>
     1.18.2 <release/1.18.2-notes>
diff --git a/doc/source/release/1.18.4-notes.rst b/doc/source/release/1.18.4-notes.rst
index 227b3dba1..fdb42dde0 100644
--- a/doc/source/release/1.18.4-notes.rst
+++ b/doc/source/release/1.18.4-notes.rst
@@ -1,3 +1,5 @@
+.. currentmodule:: numpy
+
 ==========================
 NumPy 1.18.4 Release Notes
 ==========================
@@ -6,7 +8,7 @@ This is that last planned release in the 1.18.x series. It reverts the
 ``bool("0")`` behavior introduced in 1.18.3 and fixes a bug in
 ``Generator.integers``. There is also improved help in the error message
 emitted when numpy import fails due to a link to a new troubleshooting section
-in the documentation that is now included. 
+in the documentation that is now included.
 
 The Python versions supported in this release are 3.5-3.8. Downstream
 developers should use Cython >= 0.29.15 for Python 3.8 support and OpenBLAS >=
diff --git a/doc/source/release/1.18.5-notes.rst b/doc/source/release/1.18.5-notes.rst
new file mode 100644
index 000000000..e704c001a
--- /dev/null
+++ b/doc/source/release/1.18.5-notes.rst
@@ -0,0 +1,31 @@
+.. currentmodule:: numpy
+
+==========================
+NumPy 1.18.5 Release Notes
+==========================
+
+This is a short release to allow pickle ``protocol=5`` to be used in
+Python3.5. It is motivated by the recent backport of pickle5 to Python3.5.
+
+The Python versions supported in this release are 3.5-3.8. Downstream
+developers should use Cython >= 0.29.15 for Python 3.8 support and
+OpenBLAS >= 3.7 to avoid errors on the Skylake architecture.
+
+Contributors
+============
+
+A total of 3 people contributed to this release.  People with a "+" by their
+names contributed a patch for the first time.
+
+* Charles Harris
+* Matti Picus
+* Siyuan Zhuang +
+
+Pull requests merged
+====================
+
+A total of 2 pull requests were merged for this release.
+
+* `#16439 <https://github.com/numpy/numpy/pull/16439>`__: ENH: enable pickle protocol 5 support for python3.5
+* `#16441 <https://github.com/numpy/numpy/pull/16441>`__: BUG: relpath fails for different drives on windows
+
diff --git a/numpy/core/src/multiarray/methods.c b/numpy/core/src/multiarray/methods.c
index e5845f2f6..bf0316242 100644
--- a/numpy/core/src/multiarray/methods.c
+++ b/numpy/core/src/multiarray/methods.c
@@ -1768,18 +1768,18 @@ array_reduce_ex_picklebuffer(PyArrayObject *self, int protocol)
 #if PY_VERSION_HEX >= 0x03080000
     /* we expect protocol 5 to be available in Python 3.8 */
     pickle_module = PyImport_ImportModule("pickle");
-#elif PY_VERSION_HEX >= 0x03060000
+#elif PY_VERSION_HEX >= 0x03050000
     pickle_module = PyImport_ImportModule("pickle5");
     if (pickle_module == NULL) {
         /* for protocol 5, raise a clear ImportError if pickle5 is not found
          */
         PyErr_SetString(PyExc_ImportError, "Using pickle protocol 5 "
-                "requires the pickle5 module for Python >=3.6 and <3.8");
+                "requires the pickle5 module for Python >=3.5 and <3.8");
         return NULL;
     }
 #else
     PyErr_SetString(PyExc_ValueError, "pickle protocol 5 is not available "
-                                      "for Python < 3.6");
+                                      "for Python < 3.5");
     return NULL;
 #endif
     if (pickle_module == NULL){
diff --git a/numpy/core/tests/test_multiarray.py b/numpy/core/tests/test_multiarray.py
index 958b265ca..3df76bdb3 100644
--- a/numpy/core/tests/test_multiarray.py
+++ b/numpy/core/tests/test_multiarray.py
@@ -3808,14 +3808,14 @@ class TestPickling(object):
     def test_correct_protocol5_error_message(self):
         array = np.arange(10)
 
-        if sys.version_info[:2] in ((3, 6), (3, 7)):
+        if sys.version_info[:2] in ((3, 5), (3, 6), (3, 7)):
             # For the specific case of python3.6 and 3.7, raise a clear import
             # error about the pickle5 backport when trying to use protocol=5
             # without the pickle5 package
             with pytest.raises(ImportError):
                 array.__reduce_ex__(5)
 
-        elif sys.version_info[:2] < (3, 6):
+        elif sys.version_info[:2] < (3, 5):
             # when calling __reduce_ex__ explicitly with protocol=5 on python
             # raise a ValueError saying that protocol 5 is not available for
             # this python version
diff --git a/numpy/distutils/command/build_ext.py b/numpy/distutils/command/build_ext.py
index cd9b1c6f1..52e2a5931 100644
--- a/numpy/distutils/command/build_ext.py
+++ b/numpy/distutils/command/build_ext.py
@@ -522,7 +522,7 @@ class build_ext (old_build_ext):
 
         # Wrap unlinkable objects to a linkable one
         if unlinkable_fobjects:
-            fobjects = [os.path.relpath(obj) for obj in unlinkable_fobjects]
+            fobjects = [os.path.abspath(obj) for obj in unlinkable_fobjects]
             wrapped = fcompiler.wrap_unlinkable_objects(
                     fobjects, output_dir=self.build_temp,
                     extra_dll_dir=self.extra_dll_dir)
diff --git a/pavement.py b/pavement.py
index f59291622..1f6c278cb 100644
--- a/pavement.py
+++ b/pavement.py
@@ -41,7 +41,7 @@ from paver.easy import Bunch, options, task, sh
 #-----------------------------------
 
 # Path to the release notes
-RELEASE_NOTES = 'doc/source/release/1.18.4-notes.rst'
+RELEASE_NOTES = 'doc/source/release/1.18.5-notes.rst'
 
 
 #-------------------------------------------------------
diff --git a/setup.py b/setup.py
index d79da58c0..95fc9dd57 100755
--- a/setup.py
+++ b/setup.py
@@ -58,7 +58,7 @@ Operating System :: MacOS
 
 MAJOR               = 1
 MINOR               = 18
-MICRO               = 4
+MICRO               = 5
 ISRELEASED          = True
 VERSION             = '%d.%d.%d' % (MAJOR, MINOR, MICRO)
 
diff --git a/test_requirements.txt b/test_requirements.txt
index 7edd4c3ef..299089674 100644
--- a/test_requirements.txt
+++ b/test_requirements.txt
@@ -4,5 +4,6 @@ pytz==2019.3
 pytest-cov==2.8.1
 pickle5; python_version == '3.7'
 pickle5; python_version == '3.6' and platform_python_implementation != 'PyPy'
+pickle5>=0.0.10; python_version == '3.5' and platform_python_implementation != 'PyPy'
 # for numpy.random.test.test_extending
 cffi