Merge pull request #4164 from t20100/update-ci

CI: Updated configuration; Dependendencies: Removed `bitshuffle` from test dependencies

.github/workflows/release.yml

@@ -142,7 +142,7 @@ jobs:
           - os: windows-2019
             cibw_archs: "auto64"
             with_sse2: true
-          - os: macos-11
+          - os: macos-12
             cibw_archs: "universal2"
             with_sse2: true
 
@@ -176,8 +176,7 @@ jobs:
           CIBW_TEST_COMMAND: python -c "import silx.test, sys; sys.exit(silx.test.run_tests(verbosity=3))"
           # Skip tests for emulated architectures and arm64 macos
           # Skip cp38 test on macos: Issue with libOpenGL
-          # Skip cp311 and cp312 on macos: bitshuffle does not build there
-          CIBW_TEST_SKIP: "*-*linux_{aarch64,ppc64le,s390x} *-macosx_arm64 *-macosx_universal2:arm64 cp38-macosx* cp311-macosx* cp312-macosx*"
+          CIBW_TEST_SKIP: "*-*linux_{aarch64,ppc64le,s390x} *-macosx_arm64 *-macosx_universal2:arm64 cp38-macosx*"
 
       - uses: actions/upload-artifact@v4
         with:

CHANGELOG.rst

@@ -1,6 +1,20 @@
 Release Notes
 =============
 
+2.1.1: 2024/08/13
+-----------------
+
+* Bug fixes
+
+  * `silx.io.specfile`: Fixed `SpecFile` deallocation issue (PR #4129)
+  * `silx.gui.data.DataViewer.DataViewer`: Fixed issue with accessing views after using the removeView method (PR #4131)
+  * `silx.opencl.convolution`: Fixed separable convolution on CPU that crashed in some cases by (PR #4150)
+  * `silx.util.retry`: Fixed resetting the timeout timer when iterating (PR #4157)
+
+* Dependencies
+
+  * Removed numpy from build dependency (PR #4114)
+
 2.1.0: 2024/04/19
 -----------------
 

ci/requirements-pinned.txt

@@ -1,12 +1,4 @@
-# To use pyopencl wheels on Windows
 --trusted-host www.silx.org
 --find-links http://www.silx.org/pub/wheelhouse/
 
-numpy<2; python_version <= '3.10'
-git+https://github.com/hgrecco/pint@f2e4081; python_version >= '3.10'
-
-# Pinpoint pyopencl on Windows to latest wheel available in www.silx.org
-# downloaded from https://www.lfd.uci.edu/~gohlke/pythonlibs/#pyopencl
-# Anyway, we don't test OpenCL on appveyor
-pyopencl == 2020.3.1; sys_platform == 'win32' and python_version < '3.8'
-pyopencl == 2023.1.4; sys_platform == 'win32' and python_version >= '3.8'
+# Placeholder for pinned packages used by CI

pyproject.toml

@@ -24,4 +24,5 @@ filterwarnings = [
     # note the use of single quote below to denote "raw" strings in TOML
     'ignore:tostring\(\) is deprecated. Use tobytes\(\) instead\.:DeprecationWarning:OpenGL',
     'ignore:Jupyter is migrating its paths to use standard platformdirs:DeprecationWarning',
+    'ignore:Unable to import recommended hash:UserWarning:pytools',
 ]

setup.py

@@ -184,7 +184,8 @@ def get_project_configuration():
         "pytest>=6.0",
         "pytest-xvfb",
         "pytest-mock",
-        "bitshuffle",
+        # Remove bitshuffle until wheels with numpy 2 support are available
+        # "bitshuffle",
         "scipy>=1.10",
         "pooch",
     ]