From 3cb6571db7937428fe0929aca5632f6e09e2566d Mon Sep 17 00:00:00 2001 From: Manon Marchand Date: Mon, 11 Nov 2024 23:22:54 +0100 Subject: [PATCH 1/5] test support of python 3.13 --- .github/workflows/test.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 15f1efdf..7e6f9e43 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -28,7 +28,7 @@ jobs: - name: "Build and test wheels" run: | source $HOME/.cargo/env - for PYBIN in /opt/python/cp3{8,9,10,11,12}-*/bin; do + for PYBIN in /opt/python/cp3{8,9,10,11,12,13}-*/bin; do echo "Loop on PYBIN: $PYBIN" # With maturin develop, we have to use virtualenv "${PYBIN}/pip" install virtualenv @@ -50,7 +50,7 @@ jobs: runs-on: macOS-latest strategy: matrix: - python-version: ['3.8', '3.9', '3.10', '3.11', '3.12'] + python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13'] steps: # Checkout the project - name: "Checkout branch ${{ github.head_ref }}" @@ -87,7 +87,7 @@ jobs: runs-on: windows-latest strategy: matrix: - python-version: ['3.8', '3.9', '3.10', '3.11', '3.12'] + python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13'] steps: # Checkout the project - name: "Checkout branch ${{ github.head_ref }}" From c01a8894f8245646a41778055c60ae482d0374ea Mon Sep 17 00:00:00 2001 From: Manon Marchand Date: Mon, 11 Nov 2024 23:40:08 +0100 Subject: [PATCH 2/5] fix regex that was matching with 3.13t --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 7e6f9e43..156f823c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -28,7 +28,7 @@ jobs: - name: "Build and test wheels" run: | source $HOME/.cargo/env - for PYBIN in /opt/python/cp3{8,9,10,11,12,13}-*/bin; do + for PYBIN in /opt/python/cp*-cp3{8,9,10,11,12,13}/bin; do echo "Loop on PYBIN: $PYBIN" # With maturin develop, we have to use virtualenv "${PYBIN}/pip" install virtualenv From c487b90f636a661cc62969bede8aacb9e86a92cd Mon Sep 17 00:00:00 2001 From: MARCHAND MANON Date: Tue, 12 Nov 2024 09:31:59 +0100 Subject: [PATCH 3/5] maint: add python 3.13 builds --- .github/workflows/deploy.yml | 12 ++++++------ CHANGELOG.md | 6 ++++++ pyproject.toml | 1 + 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 239bedf8..365ed4ee 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest # CentOS 7 64 bits Docker Hub image that 'build-linux-wheels' executes in. # See https://github.com/pypa/manylinux for this particular container: - # * CPython 3.8, 3.9, 3.10, 3.11 and 3.12 installed in /opt/python/- + # * CPython versions installed in /opt/python/- container: quay.io/pypa/manylinux_2_28_x86_64:latest steps: - name: "Checkout the full project" @@ -26,7 +26,7 @@ jobs: MATURIN_PYPI_TOKEN: ${{ secrets.PYPI_API_TOKEN_FXP }} run: | source $HOME/.cargo/env - for PYBIN in /opt/python/cp3{8,9,10,11,12,13}-*/bin; do + for PYBIN in /opt/python/cp*-cp3{8,9,10,11,12,13}/bin; do "${PYBIN}/pip" install --upgrade pip "${PYBIN}/pip" install maturin "${PYBIN}/maturin" publish -i "${PYBIN}/python" --skip-existing --compatibility manylinux_2_28 @@ -52,7 +52,7 @@ jobs: MATURIN_PYPI_TOKEN: ${{ secrets.PYPI_API_TOKEN_FXP }} run: | source $HOME/.cargo/env - for PYBIN in /opt/python/cp3{8,9,10,11,12,13}-*/bin; do + for PYBIN in /opt/python/cp*-cp3{8,9,10,11,12,13}/bin; do "${PYBIN}/pip" install --upgrade pip "${PYBIN}/pip" install maturin "${PYBIN}/maturin" publish -i "${PYBIN}/python" --skip-existing --compatibility manylinux2014 @@ -81,7 +81,7 @@ jobs: ${{ env.img }} \ bash -exc 'curl --proto "=https" --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y && \ source $HOME/.cargo/env && \ - for PYBIN in /opt/python/cp3{8,9,10,11,12,13}-*/bin; do + for PYBIN in /opt/python/cp*-cp3{8,9,10,11,12,13}/bin; do echo "Loop on PYBIN: $PYBIN" "${PYBIN}/pip" install --upgrade pip "${PYBIN}/pip" install maturin @@ -108,7 +108,7 @@ jobs: ${{ env.img }} \ bash -exc 'curl --proto "=https" --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --default-host aarch64-unknown-linux-gnu -y && \ source $HOME/.cargo/env && \ - for PYBIN in /opt/python/cp3{8,9,10,11,12,13}-*/bin; do + for PYBIN in /opt/python/cp*-cp3{8,9,10,11,12,13}/bin; do echo "Loop on PYBIN: $PYBIN" "${PYBIN}/pip" install maturin "${PYBIN}/maturin" -V @@ -124,7 +124,7 @@ jobs: fail-fast: false matrix: os: [windows-latest] - python-version: ['3.8', '3.9', '3.10', '3.11','3.12'] + python-version: ['3.8', '3.9', '3.10', '3.11','3.12', '3.13'] steps: # Checkout the project - uses: actions/checkout@v4 diff --git a/CHANGELOG.md b/CHANGELOG.md index b8e7613b..66b49098 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [unreleased] +## [0.17.1] + +### Added + +* build wheels for python 3.13 + ### Fixed * in space MOCs: upper right corner of a zone can now have a longitude of 360° [#180] diff --git a/pyproject.toml b/pyproject.toml index 5a4e7cbe..953f51d8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -26,6 +26,7 @@ classifiers = [ "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", + "Programming Language :: Python :: 3.13", ] keywords=["astronomy", "astrophysics", "HEALPix"] From f9b6bb153ba5acc2853723c8426c4afd93ffafd4 Mon Sep 17 00:00:00 2001 From: MARCHAND MANON Date: Tue, 12 Nov 2024 09:33:29 +0100 Subject: [PATCH 4/5] maint: prepare v0.17.1 --- Cargo.toml | 2 +- codemeta.json | 4 ++-- python/mocpy/version.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 84fa9c16..45817499 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "MOCPy" -version = "0.17.0" +version = "0.17.1" authors = [ "Matthieu Baumann ", "Thomas Boch ", diff --git a/codemeta.json b/codemeta.json index 6532c3e0..2d76fea7 100644 --- a/codemeta.json +++ b/codemeta.json @@ -9,8 +9,8 @@ "dateModified": "2023-12-04", "issueTracker": "https://github.com/cds-astro/mocpy/issues", "name": "MOCpy", - "version": "0.17.0", - "softwareVersion": "0.17.0", + "version": "0.17.1", + "softwareVersion": "0.17.1", "description": "Python library to easily create and manipulate MOCs (Multi-Order Coverage maps)", "applicationCategory": ["Astronomy", "Science"], "funding": "ESCAPE 824064, ASTERICS 653477", diff --git a/python/mocpy/version.py b/python/mocpy/version.py index fd86b3ee..c6eae9f8 100644 --- a/python/mocpy/version.py +++ b/python/mocpy/version.py @@ -1 +1 @@ -__version__ = "0.17.0" +__version__ = "0.17.1" From 250e616f2331cd8df3c7649aa7b801776492f149 Mon Sep 17 00:00:00 2001 From: MARCHAND MANON Date: Tue, 12 Nov 2024 14:22:26 +0100 Subject: [PATCH 5/5] tests: switch matplotlib backend in tests --- conftest.py | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 conftest.py diff --git a/conftest.py b/conftest.py new file mode 100644 index 00000000..3924c562 --- /dev/null +++ b/conftest.py @@ -0,0 +1,5 @@ +import matplotlib as mpl + +# chose the matplotlib backend that can only generate pngs +# but not interact with the os (better for testing) +mpl.use("Agg")