From 184375b9c7a918922cf70410fa3e97463280ea3b Mon Sep 17 00:00:00 2001 From: Jerome Kieffer Date: Wed, 11 Sep 2024 16:02:07 +0200 Subject: [PATCH 1/6] 2024.09 release --- version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.py b/version.py index 2ee70bd..1ec233d 100755 --- 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__ From 45c7d947e8d17e70c81a9cebfe970aa83906cd07 Mon Sep 17 00:00:00 2001 From: Jerome Kieffer Date: Wed, 11 Sep 2024 17:12:55 +0200 Subject: [PATCH 2/6] skip tests under windows --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index fe1f16f..f5787a0 100644 --- 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} *win*" WITH_QT_TEST: "False" # skip GUI tests PYFAI_OPENCL: "False" # skip GPU tests PYFAI_LOW_MEM: "True" # skip all tests >100Mb From e93060f4dfa67a8ff4fa6687ffad04b036a1f0e5 Mon Sep 17 00:00:00 2001 From: Jerome Kieffer Date: Wed, 11 Sep 2024 17:14:33 +0200 Subject: [PATCH 3/6] skip cp312-win_amd64 --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f5787a0..e6de737 100644 --- 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} *win*" + 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 From 52a8027ee83e25f76632a17d3cb5f72614c939f1 Mon Sep 17 00:00:00 2001 From: Jerome Kieffer Date: Wed, 11 Sep 2024 17:46:12 +0200 Subject: [PATCH 4/6] fix CI Node deprecation --- .github/workflows/python-package-mac.yml | 4 ++-- .github/workflows/python-package-ubuntu.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/python-package-mac.yml b/.github/workflows/python-package-mac.yml index 805cb3f..d96c1cd 100644 --- 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 index 3e2217b..52ebe41 100644 --- 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 From a83ff6e9d39f0e86c9e0bc78edb0f59b952e13a9 Mon Sep 17 00:00:00 2001 From: Jerome Kieffer Date: Wed, 11 Sep 2024 17:48:24 +0200 Subject: [PATCH 5/6] fix deprecated dependency --- ci/requirements_rtd.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/ci/requirements_rtd.txt b/ci/requirements_rtd.txt index 859ea8e..32fd465 100644 --- a/ci/requirements_rtd.txt +++ b/ci/requirements_rtd.txt @@ -1,4 +1,3 @@ -setuptools<60 sphinx sphinxcontrib-programoutput nbsphinx From 6238085b7ef56202b2bf2d830b69e40fb588ea86 Mon Sep 17 00:00:00 2001 From: Jerome Kieffer Date: Thu, 12 Sep 2024 08:26:42 +0200 Subject: [PATCH 6/6] Skip a test under windows ... --- src/freesas/test/test_fitting.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/freesas/test/test_fitting.py b/src/freesas/test/test_fitting.py index 1e55f33..cb9d651 100644 --- 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."""