diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4d82a504..18aeadff 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,9 +93,9 @@ jobs: cibw_archs: "ppc64le" - os: windows-2019 cibw_archs: "auto64" - - os: macos-11 + - 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" @@ -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: 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) diff --git a/pyproject.toml b/pyproject.toml index d55cddb6..9921a3c1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -58,6 +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' @@ -75,3 +78,7 @@ hdf2neggia = 'fabio.app.hdf2neggia:main' [project.gui-scripts] fabio_viewer = 'fabio.app.viewer:main' + +[tool.cibuildwheel] +test-requires = ["pyqt5", "matplotlib"] + 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__