From 338c7eaddfe40da41c31872d48ad40f9739af92d Mon Sep 17 00:00:00 2001 From: dvezinet Date: Thu, 5 Feb 2026 14:48:37 +0000 Subject: [PATCH 1/6] [#242] Relaxed numpy version control --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 23ddb69..96e75da 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -37,7 +37,7 @@ keywords = [ ] requires-python = ">=3.8" dependencies = [ - "numpy<1.25", # for astropy compatibility vs deprecated np.product + "numpy", # for astropy compatibility vs deprecated np.product "scipy", "matplotlib", # "PySide2 ; platform_system != 'Windows'", From 7d07ed87ea024b8f3bd4df003ffa257e8e34b2bb Mon Sep 17 00:00:00 2001 From: dvezinet Date: Thu, 5 Feb 2026 14:50:17 +0000 Subject: [PATCH 2/6] [#242] Deleted _updateversion.py --- _updateversion.py | 32 -------------------------------- 1 file changed, 32 deletions(-) delete mode 100644 _updateversion.py diff --git a/_updateversion.py b/_updateversion.py deleted file mode 100644 index c87ab05..0000000 --- a/_updateversion.py +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env/python -# coding=utf-8 - - -import os -import subprocess - - -_HERE = os.path.abspath(os.path.dirname(__file__)) - - -def updateversion(path=_HERE): - - # Fetch version from git tags, and write to version.py - # Also, when git is not available (PyPi package), use stored version.py - version_py = os.path.join(path, 'datastock', 'version.py') - try: - version_git = subprocess.check_output( - ["git", "describe"] - ).rstrip().decode() - - except subprocess.CalledProcessError: - with open(version_py, 'r') as fh: - version_git = fh.read().strip().split("=")[-1].replace("'", '') - - version_git = version_git.lower().replace('v', '').replace(' ', '') - - version_msg = "# Do not edit, pipeline versioning governed by git tags!" - with open(version_py, "w") as fh: - msg = "{0}__version__ = '{1}'{0}".format(os.linesep, version_git) - fh.write(version_msg + msg) - return version_git From 092000fc193833d32307606c8064592263707982 Mon Sep 17 00:00:00 2001 From: dvezinet Date: Thu, 5 Feb 2026 16:08:18 +0000 Subject: [PATCH 3/6] [#242] astropy >= 6.1 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 96e75da..a4481ad 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -41,7 +41,7 @@ dependencies = [ "scipy", "matplotlib", # "PySide2 ; platform_system != 'Windows'", - "astropy", + "astropy>=6.1", ] From dcd01da2a67f0e12ad4aebcbaf8ebbad2aa195de Mon Sep 17 00:00:00 2001 From: dvezinet Date: Thu, 5 Feb 2026 16:09:28 +0000 Subject: [PATCH 4/6] [#242] astropy >= 6.1 + doc --- pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/pyproject.toml b/pyproject.toml index a4481ad..4a3911f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -41,6 +41,7 @@ dependencies = [ "scipy", "matplotlib", # "PySide2 ; platform_system != 'Windows'", + # see https://github.com/ToFuProject/datastock/pull/243 "astropy>=6.1", ] From 5be6bca3cd3cd28713e0cae47d9b85798528d269 Mon Sep 17 00:00:00 2001 From: dvezinet Date: Thu, 5 Feb 2026 16:14:10 +0000 Subject: [PATCH 5/6] [#242] Updates python >= 3.10 and <= 3.12 --- .github/workflows/python-publish-wheel.yml | 2 +- .github/workflows/python-testing-matrix.yml | 2 +- pyproject.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/python-publish-wheel.yml b/.github/workflows/python-publish-wheel.yml index be562b8..e52cb30 100644 --- a/.github/workflows/python-publish-wheel.yml +++ b/.github/workflows/python-publish-wheel.yml @@ -24,7 +24,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, windows-latest, macos-latest] - python-version: ["3.8", "3.9", "3.10", "3.11"] + python-version: ["3.10", "3.11", "3.12"] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/python-testing-matrix.yml b/.github/workflows/python-testing-matrix.yml index 405803d..f217e25 100644 --- a/.github/workflows/python-testing-matrix.yml +++ b/.github/workflows/python-testing-matrix.yml @@ -18,7 +18,7 @@ jobs: fail-fast: true matrix: os: [ubuntu-latest, windows-latest, macos-latest] - python-version: ["3.8", "3.9", "3.10", "3.11"] + python-version: ["3.10", "3.11", "3.12"] steps: diff --git a/pyproject.toml b/pyproject.toml index 4a3911f..6e46b4b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -35,7 +35,7 @@ maintainers = [ keywords = [ "data", "analysis", "interactive", "heterogeneous arrays", "numpy", "Collection", ] -requires-python = ">=3.8" +requires-python = ">=3.10" # due to astropy >= 6.1 dependencies = [ "numpy", # for astropy compatibility vs deprecated np.product "scipy", From 627fef3122881b6c2287f98a47937f7e8f2e600f Mon Sep 17 00:00:00 2001 From: dvezinet Date: Thu, 5 Feb 2026 16:17:29 +0000 Subject: [PATCH 6/6] [#242] Added tests of python 3.13, 3.14 --- .github/workflows/python-testing-matrix.yml | 2 +- pyproject.toml | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/python-testing-matrix.yml b/.github/workflows/python-testing-matrix.yml index f217e25..ea67014 100644 --- a/.github/workflows/python-testing-matrix.yml +++ b/.github/workflows/python-testing-matrix.yml @@ -18,7 +18,7 @@ jobs: fail-fast: true matrix: os: [ubuntu-latest, windows-latest, macos-latest] - python-version: ["3.10", "3.11", "3.12"] + python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"] steps: diff --git a/pyproject.toml b/pyproject.toml index 6e46b4b..46f93a9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -35,7 +35,9 @@ maintainers = [ keywords = [ "data", "analysis", "interactive", "heterogeneous arrays", "numpy", "Collection", ] -requires-python = ">=3.10" # due to astropy >= 6.1 +# due to astropy >= 6.1 and to end-of-life of 3.9 +# see https://devguide.python.org/versions/ +requires-python = ">=3.10" dependencies = [ "numpy", # for astropy compatibility vs deprecated np.product "scipy",