Merge branch 'PyWavelets:main' into phandangthoai-optimal-scalogram

Author: phandangthoai

.github/workflows/emscripten.yml

@@ -34,10 +34,10 @@ jobs:
     if: github.repository == 'PyWavelets/pywt'
     steps:
       - name: Check out repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Build and test PyWavelets
-        uses: pypa/cibuildwheel@9e4e50bd76b3190f55304387e333f6234823ea9b # v3.1.2
+        uses: pypa/cibuildwheel@c923d83ad9c1bc00211c5041d0c3f73294ff88f6 # v3.1.4
         env:
           CIBW_PLATFORM: pyodide
           CIBW_TEST_REQUIRES: pytest matplotlib

.github/workflows/lint.yml

@@ -21,7 +21,7 @@ jobs:
         python-version: ["3.11"]
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v5

.github/workflows/tests.yml

@@ -62,7 +62,7 @@ jobs:
             python-version: "3.13"
             OPTIONS_NAME: "editable-install"
     steps:
-      - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+      - uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493 # v4.1.2
       - uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0
         with:
           python-version: ${{ matrix.python-version}}
@@ -144,7 +144,7 @@ jobs:
       matrix:
         python-version: ["3.13t", "3.14t-dev"]
     steps:
-      - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+      - uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493 # v4.1.2
       - uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0
         with:
           python-version: ${{ matrix.python-version}}
@@ -183,7 +183,7 @@ jobs:
             OPTIONS_NAME: "pre-releases"
 
     steps:
-      - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+      - uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493 # v4.1.2
       - uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0
         with:
           python-version: ${{ matrix.python-version}}

.github/workflows/wheel_tests_and_release.yml

@@ -37,7 +37,7 @@ jobs:
         cibw_python: ["cp311", "cp312", "cp313", "cp313t", "cp314", "cp314t"]
         cibw_arch: ["x86_64"]
     steps:
-      - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+      - uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493 # v4.1.2
         with:
           fetch-depth: 0
       - uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0
@@ -46,7 +46,7 @@ jobs:
           python-version: "3.12"
 
       - name: Build the wheel
-        uses: pypa/cibuildwheel@9e4e50bd76b3190f55304387e333f6234823ea9b # v3.1.2
+        uses: pypa/cibuildwheel@c923d83ad9c1bc00211c5041d0c3f73294ff88f6 # v3.1.4
         with:
           output-dir: dist
         env:
@@ -69,7 +69,7 @@ jobs:
         cibw_python: ["cp311", "cp312", "cp313", "cp313t", "cp314", "cp314t"]
         cibw_arch: ["aarch64"]
     steps:
-      - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+      - uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493 # v4.1.2
         with:
           fetch-depth: 0
       - uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0
@@ -78,7 +78,7 @@ jobs:
           python-version: "3.12"
 
       - name: Build the wheel
-        uses: pypa/cibuildwheel@9e4e50bd76b3190f55304387e333f6234823ea9b # v3.1.2
+        uses: pypa/cibuildwheel@c923d83ad9c1bc00211c5041d0c3f73294ff88f6 # v3.1.4
         with:
           output-dir: dist
         env:
@@ -106,7 +106,7 @@ jobs:
           - os: macos-13
             cibw_arch: "arm64"
     steps:
-      - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+      - uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493 # v4.1.2
         with:
           fetch-depth: 0
 
@@ -117,7 +117,7 @@ jobs:
 
       - name: Build wheels for CPython (macOS) (x86_64)
         if: matrix.cibw_arch == 'x86_64'
-        uses: pypa/cibuildwheel@9e4e50bd76b3190f55304387e333f6234823ea9b # v3.1.2
+        uses: pypa/cibuildwheel@c923d83ad9c1bc00211c5041d0c3f73294ff88f6 # v3.1.4
         with:
           output-dir: dist
         env:
@@ -127,7 +127,7 @@ jobs:
 
       - name: Build wheels for CPython (macOS) (arm64)
         if: matrix.cibw_arch == 'arm64'
-        uses: pypa/cibuildwheel@9e4e50bd76b3190f55304387e333f6234823ea9b # v3.1.2
+        uses: pypa/cibuildwheel@c923d83ad9c1bc00211c5041d0c3f73294ff88f6 # v3.1.4
         with:
           output-dir: dist
         env:
@@ -147,11 +147,18 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [windows-latest]
-        cibw_arch: ["AMD64", "x86"]
+        os: [windows-latest, windows-11-arm]
+        cibw_arch: ["AMD64", "x86", "ARM64"]
         cibw_python: ["cp311", "cp312", "cp313", "cp313t", "cp314", "cp314t"]
+        exclude:
+          - os: windows-latest
+            cibw_arch: ARM64
+          - os: windows-11-arm
+            cibw_arch: x86
+          - os: windows-11-arm
+            cibw_arch: AMD64
     steps:
-      - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+      - uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493 # v4.1.2
         with:
           fetch-depth: 0
 
@@ -172,8 +179,14 @@ jobs:
         with:
           architecture: x64
 
+      - name: Setup MSVC (ARM64)
+        if: matrix.cibw_arch == 'ARM64'
+        uses: bus1/cabuild/action/msdevshell@e22aba57d6e74891d059d66501b6b5aed8123c4d # v1
+        with:
+          architecture: arm64
+
       - name: Build Windows wheels for CPython
-        uses: pypa/cibuildwheel@9e4e50bd76b3190f55304387e333f6234823ea9b # v3.1.2
+        uses: pypa/cibuildwheel@c923d83ad9c1bc00211c5041d0c3f73294ff88f6 # v3.1.4
         with:
           output-dir: dist
         env:
@@ -200,7 +213,7 @@ jobs:
     if: github.repository == 'PyWavelets/pywt' && startsWith(github.ref, 'refs/tags/v')
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+      - uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493 # v4.1.2
         with:
           fetch-depth: 0
 
@@ -215,7 +228,7 @@ jobs:
           pip install twine
           pip install cython numpy build
 
-      - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
+      - uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
         id: download
         with:
           pattern: "wheels_*"
@@ -258,11 +271,11 @@ jobs:
       (github.event_name == 'schedule')
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+      - uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493 # v4.1.2
         with:
           fetch-depth: 0
 
-      - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
+      - uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
         id: download
         with:
           pattern: "wheels_*"

doc/release/1.9.0-notes.rst

@@ -0,0 +1,58 @@
+==============================
+PyWavelets 1.9.0 Release Notes
+==============================
+
+We are very pleased to announce the release of PyWavelets 1.9.0. This release
+contains a fix for a long-standing problem with ``pywt.cwt``, adding a
+``precision`` keyword and increasing the default precision used.
+
+This release makes a number of changes to the versions of dependencies that are
+supported:
+
+- Support for Python 3.14 is added, and support for Python 3.10 dropped,
+- The minimum supported NumPy version is now 1.25.0,
+- The optional dependency on SciPy has been removed,
+
+
+Authors
+=======
+
+* Evgeni Burovski
+* gabalafou +
+* Ralf Gommers
+* Agriya Khetarpal
+* John Muradeli +
+
+A total of 7 people contributed to this release.
+People with a "+" by their names contributed a patch for the first time.
+This list of names is automatically generated, and may not be fully complete.
+
+
+Issues closed for v1.9.0
+------------------------
+
+* `#531 <https://github.com/PyWavelets/pywt/issues/531>`__: precision of CWT
+* `#784 <https://github.com/PyWavelets/pywt/issues/784>`__: Spikes in wavelet after cwt
+* `#799 <https://github.com/PyWavelets/pywt/issues/799>`__: Wavelet name typo in documentation
+
+
+Pull requests for v1.9.0
+------------------------
+
+* `#570 <https://github.com/PyWavelets/pywt/pull/570>`__: ENH: allow user to set \`precision\` in CWT, increase default...
+* `#741 <https://github.com/PyWavelets/pywt/pull/741>`__: DOC: Add interactive notebooks to pages in the "Usage Examples"...
+* `#772 <https://github.com/PyWavelets/pywt/pull/772>`__: MAINT: update handling of license files to use PEP 639
+* `#788 <https://github.com/PyWavelets/pywt/pull/788>`__: CI: Build Linux AArch64 wheels natively, and add Arm runners...
+* `#789 <https://github.com/PyWavelets/pywt/pull/789>`__: Bump the github-actions group with 2 updates
+* `#791 <https://github.com/PyWavelets/pywt/pull/791>`__: MAINT: remove optional dependence on SciPy for FFT operations
+* `#793 <https://github.com/PyWavelets/pywt/pull/793>`__: Bump the github-actions group with 2 updates
+* `#794 <https://github.com/PyWavelets/pywt/pull/794>`__: MAINT: bump minimum Python version to 3.10 and NumPy to 1.25
+* `#802 <https://github.com/PyWavelets/pywt/pull/802>`__: \`cwt\`: log \`scales\` in docstring example
+* `#803 <https://github.com/PyWavelets/pywt/pull/803>`__: Bump the github-actions group with 3 updates
+* `#805 <https://github.com/PyWavelets/pywt/pull/805>`__: MAINT: require scipy_doctest>=1.8.0
+* `#810 <https://github.com/PyWavelets/pywt/pull/810>`__: BLD/CI: Use cibuildwheel v3
+* `#811 <https://github.com/PyWavelets/pywt/pull/811>`__: CI: add cp314/cp314t wheel builds; improve cp313t builds
+* `#812 <https://github.com/PyWavelets/pywt/pull/812>`__: DOC: fix typo in a wavelet name
+* `#813 <https://github.com/PyWavelets/pywt/pull/813>`__: CI: clean up free-threading job, and pin actions in tests.yml
+* `#814 <https://github.com/PyWavelets/pywt/pull/814>`__: Bump the github-actions group with 2 updates
+* `#815 <https://github.com/PyWavelets/pywt/pull/815>`__: CI: test Python 3.14 and 3.14t in regular CI jobs

doc/source/release.1.9.0.rst

@@ -0,0 +1 @@
+.. include:: ../release/1.9.0-notes.rst

doc/source/releasenotes.rst

@@ -4,6 +4,7 @@ Release Notes
 .. toctree::
    :maxdepth: 1
 
+   release.1.9.0
    release.1.8.0
    release.1.7.0
    release.1.6.0

meson.build

@@ -1,7 +1,7 @@
 project(
   'PyWavelets',
   'c', 'cython',
-  version: '1.9.0.dev0',
+  version: '1.10.0.dev0',
   license: 'MIT',
   meson_version: '>= 1.1.0',
   default_options: [

pyproject.toml

@@ -23,7 +23,7 @@ requires = [
 
 [project]
 name = "PyWavelets"
-version = "1.9.0.dev0"
+version = "1.10.0.dev0"
 license = "MIT and BSD-3-Clause"
 license-files = [
     "LICENSE",

pywt/_cwt.py

@@ -142,7 +142,7 @@ def cwt(data, scales, wavelet, sampling_period=1., method='conv', axis=-1, *, pr
     >>> axes[1].set_title("Scalogram with hop size")
     """
 
-    # accept array_like input; make a copy to ensure a contiguous array
+    # accept array-like input; make a copy to ensure a contiguous array
     dt = _check_dtype(data)
     data = np.asarray(data, dtype=dt)
     dt_cplx = np.result_type(dt, np.complex64)