Merge pull request #722 from jarrodmillman/spec0-3-24

Drop support for older dependencies (see SPEC 0)

Author: rgommers

.github/workflows/tests.yml

@@ -17,15 +17,15 @@ jobs:
       MPLBACKEND: Agg
       CYTHON_TRACE: 1
       CYTHONSPEC: cython
-      NUMPY_MIN: numpy==1.22.4
-      CYTHON_MIN: cython==0.29.35
-      SCIPY_MIN: scipy==1.8.0
+      NUMPY_MIN: numpy==1.23.0
+      CYTHON_MIN: cython==3.0.4
+      SCIPY_MIN: scipy==1.9.0
 
     strategy:
       # Ensure that a wheel builder finishes even if another fails
       fail-fast: false
       matrix:
-        python-version: ["3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.10", "3.11", "3.12"]
         MINIMUM_REQUIREMENTS: [0]
         USE_SCIPY: [0]
         USE_SDIST: [0]
@@ -34,15 +34,15 @@ jobs:
         OPTIONS_NAME: ["default"]
         include:
           - platform_id: manylinux_x86_64
-            python-version: "3.9"
+            python-version: "3.10"
             MINIMUM_REQUIREMENTS: 1
             OPTIONS_NAME: "minimum-req"
           - platform_id: manylinux_x86_64
-            python-version: "3.9"
+            python-version: "3.10"
             USE_SCIPY: 1
             OPTIONS_NAME: "with-scipy"
           - platform_id: manylinux_x86_64
-            python-version: "3.9"
+            python-version: "3.10"
             USE_SDIST: 1
             OPTIONS_NAME: "install-from-sdist"
           - platform_id: manylinux_x86_64
@@ -129,23 +129,23 @@ jobs:
       MPLBACKEND: Agg
       CYTHON_TRACE: 1
       CYTHONSPEC: cython
-      NUMPY_MIN: numpy==1.22.4
-      CYTHON_MIN: cython==0.29.35
-      SCIPY_MIN: scipy==1.8.0
+      NUMPY_MIN: numpy==1.23.0
+      CYTHON_MIN: cython==3.0.4
+      SCIPY_MIN: scipy==1.9.0
 
     strategy:
       # Ensure that a wheel builder finishes even if another fails
       fail-fast: false
       matrix:
-        python-version: ["3.9", "3.12"]
+        python-version: ["3.10", "3.12"]
         MINIMUM_REQUIREMENTS: [0]
         USE_SCIPY: [0]
         USE_SDIST: [0]
         REFGUIDE_CHECK: [0]
         PIP_FLAGS: [""]
         OPTIONS_NAME: ["default"]
         include:
-          - python-version: "3.9"
+          - python-version: "3.10"
             MINIMUM_REQUIREMENTS: 1
             OPTIONS_NAME: "osx-minimum-req"
           - python-version: "3.12"

.github/workflows/wheel_tests_and_release.yml

@@ -34,7 +34,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        cibw_python: ["cp39", "cp310", "cp311", "cp312"]
+        cibw_python: ["cp310", "cp311", "cp312"]
         cibw_arch: ["x86_64"]
     steps:
       - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
@@ -43,7 +43,7 @@ jobs:
       - uses: actions/setup-python@v5
         name: Install Python
         with:
-          python-version: "3.9"
+          python-version: "3.10"
       - name: Build the wheel
         uses: pypa/cibuildwheel@8d945475ac4b1aac4ae08b2fd27db9917158b6ce # 2.17.0
         with:
@@ -66,7 +66,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        cibw_python: ["cp39", "cp310", "cp311", "cp312"]
+        cibw_python: ["cp310", "cp311", "cp312"]
         cibw_arch: ["aarch64"]
     steps:
       - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
@@ -75,7 +75,7 @@ jobs:
       - uses: actions/setup-python@v5
         name: Install Python
         with:
-          python-version: "3.9"
+          python-version: "3.10"
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
         with:
@@ -102,7 +102,7 @@ jobs:
       matrix:
         # macos-13 is the last runner that supports Intel (x86_64) architecture
         os: [macos-13, macos-14]
-        cibw_python: ["cp39", "cp310", "cp311", "cp312"]
+        cibw_python: ["cp310", "cp311", "cp312"]
         cibw_arch: ["x86_64", "arm64"]
         exclude:
           - os: macos-14
@@ -151,7 +151,7 @@ jobs:
       matrix:
         os: [windows-latest]
         cibw_arch: ["AMD64", "x86"]
-        cibw_python: ["cp39", "cp310", "cp311", "cp312"]
+        cibw_python: ["cp310", "cp311", "cp312"]
     steps:
       - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
         with:
@@ -160,7 +160,7 @@ jobs:
       - uses: actions/setup-python@v5
         name: Install Python
         with:
-          python-version: "3.9"
+          python-version: "3.10"
 
       - name: Setup MSVC (32-bit)
         if: matrix.cibw_arch == 'x86'
@@ -208,7 +208,7 @@ jobs:
       - uses: actions/setup-python@v5
         name: Install Python
         with:
-          python-version: "3.9"
+          python-version: "3.10"
 
       - name: Install Twine
         run: |

README.rst

@@ -65,8 +65,8 @@ For more usage examples see the `demo`_ directory in the source package.
 Installation
 ------------
 
-PyWavelets supports `Python`_ >=3.9, and is only dependent on `NumPy`_
-(supported versions are currently ``>= 1.14.6``). To pass all of the tests,
+PyWavelets supports `Python`_ >=3.10, and is only dependent on `NumPy`_
+(supported versions are currently ``>= 1.23.0``). To pass all of the tests,
 `Matplotlib`_ is also required. `SciPy`_ is also an optional dependency. When
 present, FFT-based continuous wavelet transforms will use FFTs from SciPy
 rather than NumPy.

appveyor.yml

@@ -7,7 +7,7 @@ build: off
 environment:
   matrix:
     - arch: x64
-      PY_PYTHON: 3.9
+      PY_PYTHON: 3.10
     - arch: x86
       PY_PYTHON: 3.10-32
     - arch: x64

doc/source/dev/testing.rst

@@ -49,11 +49,11 @@ Running tests with Tox
 ----------------------
 
 There's also a config file for running tests with `Tox`_ (``pip install tox``).
-For example, to run tests for Python 3.9 and 3.10, use
+For example, to run tests for Python 3.10, Python 3.11, and 3.12, use
 
 .. code-block:: bash
 
-    tox -e py39,py310
+    tox -e py310,py311,py312
 
 For more information see the `Tox`_ documentation.
 

pyproject.toml

@@ -29,8 +29,8 @@ maintainers = [
     {name = "The PyWavelets Developers", email = "[email protected]"}
 ]
 description = "PyWavelets, wavelet transform module"
-requires-python = ">=3.9"
-dependencies = ["numpy>=1.22.4,<3"]
+requires-python = ">=3.10"
+dependencies = ["numpy>=1.23,<3"]
 readme = "README.rst"
 classifiers = [
     "Development Status :: 5 - Production/Stable",
@@ -42,35 +42,40 @@ classifiers = [
     "Programming Language :: C",
     "Programming Language :: Python",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Topic :: Software Development :: Libraries :: Python Modules"
 ]
 
+[project.optional-dependencies]
+optional = ["scipy>=1.9"]
+
 [project.urls]
 homepage = "https://github.com/PyWavelets/pywt"
 source = "https://github.com/PyWavelets/pywt"
 documentation = "https://pywavelets.readthedocs.io/"
 
 [tool.ruff]
 line-length = 88
-target-version = 'py39'
-lint.select = [
-    'I',
-    'UP',
-    'C4',
-    'E713',
-    'NPY201',
-    'PIE',
-    'PGH003',
-    'PLR0402',
-    'SIM101',
-    'SIM109',
-    'SIM110',
-    'SIM118',
-    'SIM2',
+target-version = 'py310'
+select = [
+    "I",
+    "UP",
+    "C4",
+    "E713",
+    "NPY201",
+    "PIE",
+    "PGH003",
+    "PLR0402",
+    "SIM101",
+    "SIM109",
+    "SIM110",
+    "SIM118",
+    "SIM2",
+]
+ignore = [
+     "UP038", # https://github.com/astral-sh/ruff/issues/7871
 ]
 
 [tool.spin]

pywt/_cwt.py

@@ -15,27 +15,23 @@
 import numpy as np
 
 try:
-    # Prefer scipy.fft (new in SciPy 1.4)
-    import scipy.fft
+    import scipy
     fftmodule = scipy.fft
     next_fast_len = fftmodule.next_fast_len
 except ImportError:
-    try:
-        import scipy.fftpack
-        fftmodule = scipy.fftpack
-        next_fast_len = fftmodule.next_fast_len
-    except ImportError:
-        fftmodule = np.fft
-
-        # provide a fallback so scipy is an optional requirement
-        def next_fast_len(n):
-            """Round up size to the nearest power of two.
-
-            Given a number of samples `n`, returns the next power of two
-            following this number to take advantage of FFT speedup.
-            This fallback is less efficient than `scipy.fftpack.next_fast_len`
-            """
-            return 2**ceil(np.log2(n))
+    fftmodule = np.fft
+
+    # provide a fallback so scipy is an optional requirement
+    # note: numpy.fft in numpy 2.0 is as fast as scipy.fft, so could be used
+    # unconditionally once the minimum supported numpy version is >=2.0
+    def next_fast_len(n):
+        """Round up size to the nearest power of two.
+
+        Given a number of samples `n`, returns the next power of two
+        following this number to take advantage of FFT speedup.
+        This fallback is less efficient than `scipy.fftpack.next_fast_len`
+        """
+        return 2**ceil(np.log2(n))
 
 
 def cwt(data, scales, wavelet, sampling_period=1., method='conv', axis=-1):

tox.ini

@@ -20,21 +20,14 @@
 
 [tox]
 toxworkdir = {homedir}/.tox/pywt/
-envlist = py39, py310
+envlist = py310, py311, py312
 
 [testenv]
 deps =
-    flake8
     pytest
     cython
     numpy
     matplotlib
 changedir = {envdir}
 commands =
     pytest {toxinidir}/pywt/tests -v
-# flake8 --exit-zero pywt
-
-[pep8]
-max_line_length = 79
-statistics = True
-ignore = E121,E122,E123,E125,E126,E127,E128,E226,E231,E501,E712