Merge pull request #223 from moorepants/bump-deps

Update the depedency pins to thos available in Ubuntu 22.04 LTS

.github/workflows/docs.yml

@@ -30,7 +30,7 @@ jobs:
           channels: conda-forge
           miniforge-variant: Mambaforge
       - name: Install basic dependencies
-        run: mamba install -y -v lapack "libblas=*=*netlib" "cython>=0.26,<3" "ipopt=${{ matrix.ipopt-version }}" numpy>=1.15 pkg-config>=0.29.2 setuptools>=39.0 --file docs/requirements.txt
+        run: mamba install -y -v lapack "libblas=*=*netlib" "cython=0.29.*" "ipopt=${{ matrix.ipopt-version }}" numpy>=1.21.5 pkg-config>=0.29.2 setuptools>=44.1.1 --file docs/requirements.txt
       - name: Install CyIpopt
         run: |
           rm pyproject.toml

.github/workflows/tests.yml

@@ -33,20 +33,20 @@ jobs:
           python-version: ${{ matrix.python-version }}
           channels: conda-forge
           miniforge-variant: Mambaforge
-      - name: Install basic dependencies
+      - name: Install basic dependencies against generic blas/lapack
         run: |
-          mamba install -q -y lapack "libblas=*=*netlib" "ipopt=${{ matrix.ipopt-version }}" "numpy>=1.15" "pkg-config>=0.29.2" "setuptools>=39.0" "cython=0.29.*"
+          mamba install -q -y lapack "libblas=*=*netlib" "ipopt=${{ matrix.ipopt-version }}" "numpy>=1.21.5" "pkg-config>=0.29.2" "setuptools>=44.1.1" "cython=0.29.*"
       - run: echo "IPOPTWINDIR=USECONDAFORGEIPOPT" >> $GITHUB_ENV
       - name: Install CyIpopt
         run: |
           rm pyproject.toml
           python -m pip install .
           mamba list
-      - name: Test with pytest
+      - name: Test with pytest using OS specific blas/lapack
         run: |
           python -c "import cyipopt"
           mamba remove lapack
-          mamba install -q -y "ipopt=${{ matrix.ipopt-version }}" "numpy>=1.15" "pkg-config>=0.29.2" "setuptools>=39.0" "pytest>=3.3.2" "cython=0.29.*"
+          mamba install -q -y "ipopt=${{ matrix.ipopt-version }}" "numpy>=1.21.5" "pkg-config>=0.29.2" "setuptools>=44.1.1" "pytest>=6.2.5" "cython=0.29.*"
           mamba list
           pytest
       - name: Test with pytest and scipy, new ipopt
@@ -55,6 +55,6 @@ jobs:
         # Ipopt needed different libfortrans.
         if: (matrix.ipopt-version != '3.12' && matrix.python-version != '3.11') || (matrix.ipopt-version != '3.12' && matrix.python-version != '3.10' && matrix.os != 'macos-latest')
         run: |
-          mamba install -q -y -c conda-forge "ipopt=${{ matrix.ipopt-version }}" "numpy>=1.15" "pkg-config>=0.29.2" "setuptools>=39.0" "scipy=1.9.*" "pytest>=3.3.2" "cython=0.29.*"
+          mamba install -q -y -c conda-forge "ipopt=${{ matrix.ipopt-version }}" "numpy>=1.21.5" "pkg-config>=0.29.2" "setuptools>=44.1.1" "scipy>1.8.0" "pytest>=6.2.5" "cython=0.29.*"
           mamba list
           pytest

.github/workflows/windows.yml

@@ -18,7 +18,7 @@ jobs:
       - uses: actions/setup-python@v4
         with:
           python-version: '3.10'
-      - run: python -m pip install numpy "cython<3" setuptools
+      - run: python -m pip install "numpy>=1.21.5" "cython>=0.29.28,<3" "setuptools>44.1.1"
       - run: Invoke-WebRequest -Uri "https://github.com/coin-or/Ipopt/releases/download/releases%2F3.13.3/Ipopt-3.13.3-win64-msvs2019-md.zip" -OutFile "Ipopt-3.13.3-win64-msvs2019-md.zip"
       - run: 7z x Ipopt-3.13.3-win64-msvs2019-md.zip
       - run: mv Ipopt-3.13.3-win64-msvs2019-md/* .

conda/cyipopt-dev.yml

@@ -2,13 +2,14 @@ name: cyipopt-dev
 channels:
   - conda-forge
 dependencies:
-  - cython
-  - ipopt
+  - cython >=0.29.28,<3
+  - ipopt >=3.12
   - libblas * *netlib
-  - numpy
-  - pkg-config
-  - pytest
+  - numpy >=1.21.5
+  - numpydoc >=1.2
+  - pkg-config >=0.29.2
+  - pytest >=6.2.5
   - python >=3.6
-  - scipy
-  - setuptools
-  - sphinx
+  - scipy >=1.8
+  - setuptools >=44.1.1
+  - sphinx >=4.3.2

docs/requirements.txt

@@ -1,2 +1,2 @@
-numpydoc>=0.7
-sphinx>=1.6.7
+numpydoc>=1.2
+sphinx>=4.3.2

docs/source/install.rst

@@ -28,12 +28,12 @@ dependencies:
 
   * C/C++ compiler
   * pkg-config [only for Linux and Mac]
-  * Ipopt [>= 3.13 on Windows]
-  * Python 3.6+
-  * setuptools
-  * cython
-  * numpy
-  * scipy [optional]
+  * Ipopt >=3.12 [>= 3.13 on Windows]
+  * Python 3.8+
+  * setuptools >=44.1.1
+  * cython >=0.29.28,<3
+  * NumPy >=1.21.5
+  * SciPy >=1.8 [optional]
 
 The binaries and header files of the Ipopt package can be obtained from
 http://www.coin-or.org/download/binary/Ipopt/. These include a version compiled
@@ -44,12 +44,13 @@ On Linux and Mac
 ~~~~~~~~~~~~~~~~
 
 For Linux and Mac, the ``ipopt`` executable should be in your path and
-discoverable by pkg-config, i.e. this command should return a valid result::
+discoverable by ``pkg-config``, i.e. this command should return a valid
+result::
 
    $ pkg-config --libs --cflags ipopt
 
 You will need to install Ipopt in a system location or set ``LD_LIBRARY_PATH``
-if pkg-config does not find the executable.
+if ``pkg-config`` does not find the executable.
 
 Once all the dependencies are installed, execute::
 

pyproject.toml

@@ -1,3 +1,3 @@
 [build-system]
-requires = ["cython >= 0.26, < 3", "oldest-supported-numpy", "setuptools>=39.0"]
+requires = ["cython>=0.29.28,<3", "oldest-supported-numpy","setuptools>=44.1.1"]
 build-backend = "setuptools.build_meta"

setup.py

@@ -20,8 +20,9 @@
 # install requirements before import
 from setuptools import dist
 SETUP_REQUIRES = [
-    "cython >= 0.26,<3",
-    "numpy >= 1.15",
+    "cython>=0.29.28,<3",
+    "numpy>=1.21.5",
+    "setuptools>=44.1.1",
 ]
 dist.Distribution().fetch_build_eggs(SETUP_REQUIRES)
 
@@ -48,17 +49,14 @@
 EMAIL = "[email protected]"
 URL = "https://github.com/mechmotum/cyipopt"
 INSTALL_REQUIRES = [
-    "cython >= 0.26,<3",
-    "numpy>=1.15",
-    "setuptools>=39.0",
+    "numpy>=1.21.5",
 ]
 LICENSE = "EPL-2.0"
 CLASSIFIERS = [
     "Development Status :: 5 - Production/Stable",
     "License :: OSI Approved :: Eclipse Public License 2.0 (EPL-2.0)",
     "Intended Audience :: Science/Research",
     "Operating System :: OS Independent",
-    "Programming Language :: Python :: 3.7",
     "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",