[MRG] Build POT against oldest-supported-numpy (local PR) (#349)

* Configure setup to compile against oldest supported numpy version using the meta-package: https://pypi.org/project/oldest-supported-numpy/ -

* Set minimum Python requirement to `>=3.7` in setup.py since !328 removed Python 3.6 support

* Fix typo in pyproject.toml - 

* Update setup.py 

* Update setup.py and 

* build wheels

* remove install dependencies for wheels building and build wheels

* Apply suggestions from code review

Co-authored-by: David M. Ghiurco <9147386+davidghiurco@users.noreply.github.com>

* correct timing test add info in release file and build wheels

* pep8 and

Co-authored-by: David Ghiurco <9147386+davidghiurco@users.noreply.github.com>

Author: rflamary

.github/workflows/build_wheels.yml

@@ -27,8 +27,6 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install -r requirements.txt
-        pip install -U "cython"
 
     - name: Install cibuildwheel
       run: |
@@ -37,7 +35,6 @@ jobs:
     - name: Build wheels
       env:
         CIBW_SKIP: "pp*-win* pp*-macosx* cp2* pp* cp36*" # remove pypy on mac and win (wrong version)
-        CIBW_BEFORE_BUILD: "pip install numpy cython"
       run: |
         python -m cibuildwheel --output-dir wheelhouse
 
@@ -65,8 +62,6 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install -r requirements.txt
-        pip install -U "cython"
 
     - name: Install cibuildwheel
       run: |
@@ -80,8 +75,7 @@ jobs:
 
     - name: Build wheels
       env:
-        CIBW_SKIP: "pp*-win* pp*-macosx* cp2* pp* cp*musl* cp36*" # remove pypy on mac and win (wrong version)
-        CIBW_BEFORE_BUILD: "pip install numpy cython"
+        CIBW_SKIP: "pp*-win* pp*-macosx* cp2* pp* cp*musl*" # remove pypy on mac and win (wrong version)
         CIBW_ARCHS_LINUX: auto aarch64 # force aarch64 with QEMU
         CIBW_ARCHS_MACOS: x86_64 universal2 arm64
       run: |

.github/workflows/build_wheels_weekly.yml

@@ -26,8 +26,6 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install -r requirements.txt
-        pip install -U "cython"
 
     - name: Install cibuildwheel
       run: |

RELEASES.md

@@ -16,6 +16,7 @@
 
 - Bug in instantiating an `autograd` function (`ValFunction`, Issue #337, PR
   #338)
+- Make POT ABI compatible with old and new numpy (Issue #346, PR #349)
 
 ## 0.8.1.0
 *December 2021*

docs/source/quickstart.rst

@@ -1002,7 +1002,7 @@ FAQ
 
 2. **pip install POT fails with error : ImportError: No module named Cython.Build**
 
-    As discussed shortly in the README file. POT requires to have :code:`numpy`
+    As discussed shortly in the README file. POT<0.8 requires to have :code:`numpy`
     and :code:`cython` installed to build. This corner case is not yet handled
     by :code:`pip` and for now you need to install both library prior to
     installing POT.

pyproject.toml

@@ -1,3 +1,3 @@
 [build-system]
-requires = ["setuptools", "wheel", "numpy>=1.20", "cython>=0.23"]
+requires = ["setuptools", "wheel", "oldest-supported-numpy", "cython>=0.23"]
 build-backend = "setuptools.build_meta"

requirements.txt

@@ -1,6 +1,5 @@
 numpy>=1.20
 scipy>=1.3
-cython
 matplotlib
 autograd
 pymanopt==0.2.4; python_version <'3'

setup.py

@@ -68,8 +68,9 @@
     license='MIT',
     scripts=[],
     data_files=[],
-    setup_requires=["numpy>=1.20", "cython>=0.23"],
-    install_requires=["numpy>=1.20", "scipy>=1.0"],
+    setup_requires=["oldest-supported-numpy", "cython>=0.23"],
+    install_requires=["numpy>=1.16", "scipy>=1.0"],
+    python_requires=">=3.6",
     classifiers=[
         'Development Status :: 5 - Production/Stable',
         'Intended Audience :: Developers',

test/test_utils.py

@@ -67,7 +67,9 @@ def test_tic_toc():
     t2 = ot.toq()
 
     # test timing
-    np.testing.assert_allclose(0.1, t, rtol=1e-1, atol=1e-1)
+    # np.testing.assert_allclose(0.1, t, rtol=1e-1, atol=1e-1)
+    # very slow macos github action equality not possible
+    assert t > 0.09
 
     # test toc vs toq
     np.testing.assert_allclose(t, t2, rtol=1e-1, atol=1e-1)