Merge pull request #94 from silx-kit/2024.09

2024.09
silx-kit · Sep 12, 2024 · 8ecf0f9 · 8ecf0f9
2 parents 9b042ea + 6238085
commit 8ecf0f9
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/python-package-mac.yml b/.github/workflows/python-package-mac.yml
@@ -16,13 +16,13 @@ jobs:
  xcode-version: [latest-stable, 14]
 
  steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
  - name: Configure xcode ${{ matrix.xcode-version }}
  uses: maxim-lobanov/setup-xcode@v1
  with:
  xcode-version: ${{ matrix.xcode-version }}
  - name: Set up Python ${{ matrix.python-version }}
- uses: actions/setup-python@v2
+ uses: actions/setup-python@v3
  with:
  python-version: ${{ matrix.python-version }}
  - name: Install dependencies

diff --git a/.github/workflows/python-package-ubuntu.yml b/.github/workflows/python-package-ubuntu.yml
@@ -19,9 +19,9 @@ jobs:
  python-version: ["3.9", "3.10", "3.11", "3.12"]
 
  steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
  - name: Set up Python ${{ matrix.python-version }}
- uses: actions/setup-python@v2
+ uses: actions/setup-python@v3
  with:
  python-version: ${{ matrix.python-version }}
  - name: Set up Perl version for package build

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -132,7 +132,7 @@ jobs:
  # Install test dependencies
  CIBW_TEST_COMMAND: python -c "import freesas.test, sys; sys.exit(freesas.test.run_tests())"
  # Skip tests for emulated architectures
- CIBW_TEST_SKIP: "*-*linux_{aarch64,ppc64le,s390x}"
+ CIBW_TEST_SKIP: "*-*linux_{aarch64,ppc64le,s390x} cp312-win_amd64"
  WITH_QT_TEST: "False" # skip GUI tests
  PYFAI_OPENCL: "False" # skip GPU tests
  PYFAI_LOW_MEM: "True" # skip all tests >100Mb

diff --git a/ci/requirements_rtd.txt b/ci/requirements_rtd.txt
@@ -1,4 +1,3 @@
-setuptools<60
 sphinx
 sphinxcontrib-programoutput
 nbsphinx

diff --git a/src/freesas/test/test_fitting.py b/src/freesas/test/test_fitting.py
@@ -5,7 +5,7 @@
 
 __authors__ = ["Martha Brennich"]
 __license__ = "MIT"
-__date__ = "16/07/2021"
+__date__ = "12/09/2024"
 
 
 import unittest
@@ -337,6 +337,7 @@ def test_get_guinier_header_without_input_format(
  msg="header for undefined format is correct",
  )
 
+ @unittest.skipIf(platform.system() == "Windows", "Only POSIX")
  def test_collect_files_only_returns_existing_files(self):
 
  """Test that collect_files discards strings that do not match an existing file."""

diff --git a/version.py b/version.py
@@ -71,7 +71,7 @@
 MAJOR = 2024
 MINOR = 9
 MICRO = 0
-RELEV = "dev" # <16
+RELEV = "final" # <16
 SERIAL = 0 # <16
 
 date = __date__