From 0c0d07072c4b076913b958f6054bd69210b3eb2a Mon Sep 17 00:00:00 2001 From: Jerome Kieffer Date: Thu, 12 Sep 2024 09:47:38 +0200 Subject: [PATCH 1/9] typo --- doc/source/Changelog.rst | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/doc/source/Changelog.rst b/doc/source/Changelog.rst index 2f64dcd1..b6cd1467 100644 --- a/doc/source/Changelog.rst +++ b/doc/source/Changelog.rst @@ -6,12 +6,11 @@ FabIO-2024.9.0: - Link `peak` from sparse dataset to the dense one when using `densify_Bragg` - New tool `hdf2neggia` which converts any HDF5 file compatible into something compatible with XDS+neggia pluggin - support new detector: `LambdaImage` -- fix endianness issue in several file-format -- fix bug in `edf.fast_data_read` -- fix warning which became errors in gcc14 +- Fix endianness issue in several file-format +- Fix bug in `edf.fast_data_read` +- Fix warning which became errors in gcc14 - Supports Python 3.8-3.12 - FabIO-2024.4.0: ................ - Support for new style GE-files (contribution from Patrick Avery) From 8642ee456f08594ac5e92773789ddca1fb1bd76f Mon Sep 17 00:00:00 2001 From: Jerome Kieffer Date: Thu, 12 Sep 2024 09:49:44 +0200 Subject: [PATCH 2/9] final version number --- version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.py b/version.py index 3a9c2e49..66b32025 100755 --- a/version.py +++ b/version.py @@ -78,7 +78,7 @@ MAJOR = 2024 MINOR = 9 MICRO = 0 -RELEV = "dev" # <16 +RELEV = "final" # <16 SERIAL = 0 # <16 date = __date__ From f063e858fcce628ee7265dcc5ab198185244d969 Mon Sep 17 00:00:00 2001 From: Jerome Kieffer Date: Thu, 12 Sep 2024 11:08:58 +0200 Subject: [PATCH 3/9] Update dependencies --- pyproject.toml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index d55cddb6..9902afce 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -58,7 +58,9 @@ requires = [ 'pyproject-metadata>=0.5.0', 'tomli>=1.0.0' ] - +[project.optional-dependencies] +gui = [ "PyQt5", "matplotlib" ] +all = ["PyQt5", "matplotlib"] [project.urls] homepage = 'http://www.silx.org' documentation = 'http://www.silx.org/doc/fabio/latest/' From f2836045f9efb854fa3aa8071b087b7bc6359526 Mon Sep 17 00:00:00 2001 From: Jerome Kieffer Date: Thu, 12 Sep 2024 11:15:43 +0200 Subject: [PATCH 4/9] install optional dependencies to run tests --- pyproject.toml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 9902afce..da2e54c1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -59,8 +59,9 @@ requires = [ 'tomli>=1.0.0' ] [project.optional-dependencies] -gui = [ "PyQt5", "matplotlib" ] -all = ["PyQt5", "matplotlib"] +gui = [ "pyqt5", "matplotlib" ] +all = ["pyqt5", "matplotlib"] + [project.urls] homepage = 'http://www.silx.org' documentation = 'http://www.silx.org/doc/fabio/latest/' @@ -77,3 +78,6 @@ hdf2neggia = 'fabio.app.hdf2neggia:main' [project.gui-scripts] fabio_viewer = 'fabio.app.viewer:main' + +[tool.cibuildwheel] +test-requires = "pyqt5", "matplotlib"] From 183b92e41f15cfd280afa993469e2725f67d4623 Mon Sep 17 00:00:00 2001 From: Jerome Kieffer Date: Thu, 12 Sep 2024 11:26:06 +0200 Subject: [PATCH 5/9] typo --- pyproject.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index da2e54c1..9921a3c1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -80,4 +80,5 @@ hdf2neggia = 'fabio.app.hdf2neggia:main' fabio_viewer = 'fabio.app.viewer:main' [tool.cibuildwheel] -test-requires = "pyqt5", "matplotlib"] +test-requires = ["pyqt5", "matplotlib"] + From 101b3f909d243588040535a06e62fcc8c380d833 Mon Sep 17 00:00:00 2001 From: Jerome Kieffer Date: Thu, 12 Sep 2024 11:35:16 +0200 Subject: [PATCH 6/9] Use macos-12 for x86_64 builds --- .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 4d82a504..113dd698 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -93,7 +93,7 @@ jobs: cibw_archs: "ppc64le" - os: windows-2019 cibw_archs: "auto64" - - os: macos-11 + - os: macos-12 cibw_archs: "x86_64" macos_target: "10.9" - os: macos-14 From 966718757c89ecf2d9615d8b46875a562a5f608d Mon Sep 17 00:00:00 2001 From: Jerome Kieffer Date: Thu, 12 Sep 2024 11:46:31 +0200 Subject: [PATCH 7/9] Macos11 is the base version for pyqt5 --- .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 113dd698..e68d526f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -95,7 +95,7 @@ jobs: cibw_archs: "auto64" - os: macos-12 cibw_archs: "x86_64" - macos_target: "10.9" + macos_target: "11.0" - os: macos-14 cibw_archs: "arm64" macos_target: "11.0" From 21daa31316627a278399872d42ac2029f7f10250 Mon Sep 17 00:00:00 2001 From: Jerome Kieffer Date: Thu, 12 Sep 2024 12:00:47 +0200 Subject: [PATCH 8/9] install matplotlib to test sources --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e68d526f..b63da2f7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -46,7 +46,7 @@ jobs: - name: Install from sdist run: | pip install "$(ls dist/fabio-*.tar.gz)" - pip install pyqt5 + pip install pyqt5 matplotlib - name: Run tests run: python -c "import fabio.test, sys; sys.exit(fabio.test.run_tests())" @@ -93,7 +93,7 @@ jobs: cibw_archs: "ppc64le" - os: windows-2019 cibw_archs: "auto64" - - os: macos-12 + - os: macos-13 cibw_archs: "x86_64" macos_target: "11.0" - os: macos-14 From acea9786b04588f46f03a1c1683ccbe426f6842c Mon Sep 17 00:00:00 2001 From: Jerome Kieffer Date: Thu, 12 Sep 2024 12:02:54 +0200 Subject: [PATCH 9/9] Skip some test on mac_x86_64 --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b63da2f7..18aeadff 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -93,7 +93,7 @@ jobs: cibw_archs: "ppc64le" - os: windows-2019 cibw_archs: "auto64" - - os: macos-13 + - os: macos-12 cibw_archs: "x86_64" macos_target: "11.0" - os: macos-14 @@ -122,7 +122,7 @@ jobs: CIBW_TEST_COMMAND: python -c "import fabio.test, sys; sys.exit(fabio.test.run_tests())" # Skip tests for emulated architectures # and Python3.8 on macos/arm64 (https://github.com/pypa/cibuildwheel/pull/1169) - CIBW_TEST_SKIP: "*-*linux_{aarch64,ppc64le,s390x} cp38-macosx_arm64" + CIBW_TEST_SKIP: "*-*linux_{aarch64,ppc64le,s390x} cp38-macosx_*" - uses: actions/upload-artifact@v4 with: