From 7cea02be61503f6bf96d0218af5262e549e96094 Mon Sep 17 00:00:00 2001 From: Jan-Lukas Wynen Date: Mon, 4 Aug 2025 11:22:44 +0200 Subject: [PATCH 1/2] Drop support for Python 3.10 --- .copier-answers.yml | 2 +- .github/workflows/python-version-ci | 2 +- .python-version | 2 +- docs/developer/getting-started.md | 2 +- pyproject.toml | 3 +-- tox.ini | 2 +- 6 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.copier-answers.yml b/.copier-answers.yml index 28baef9d..49f7b731 100644 --- a/.copier-answers.yml +++ b/.copier-answers.yml @@ -3,7 +3,7 @@ _commit: c3214e6 _src_path: gh:scipp/copier_template description: Common data reduction tools for the ESS facility max_python: '3.13' -min_python: '3.10' +min_python: '3.11' namespace_package: ess nightly_deps: scippnexus,scipp,sciline,cyclebane,scippneutron,tof orgname: scipp diff --git a/.github/workflows/python-version-ci b/.github/workflows/python-version-ci index c8cfe395..2c073331 100644 --- a/.github/workflows/python-version-ci +++ b/.github/workflows/python-version-ci @@ -1 +1 @@ -3.10 +3.11 diff --git a/.python-version b/.python-version index c8cfe395..2c073331 100644 --- a/.python-version +++ b/.python-version @@ -1 +1 @@ -3.10 +3.11 diff --git a/docs/developer/getting-started.md b/docs/developer/getting-started.md index a196f562..a7667511 100644 --- a/docs/developer/getting-started.md +++ b/docs/developer/getting-started.md @@ -40,7 +40,7 @@ Alternatively, if you want a different workflow, take a look at ``tox.ini`` or ` Run the tests using ```sh -tox -e py310 +tox -e py311 ``` (or just `tox` if you want to run all environments). diff --git a/pyproject.toml b/pyproject.toml index 469b7f93..dc15e098 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -18,14 +18,13 @@ classifiers = [ "Operating System :: OS Independent", "Programming Language :: Python :: 3", "Programming Language :: Python :: 3 :: Only", - "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", "Programming Language :: Python :: 3.13", "Topic :: Scientific/Engineering", "Typing :: Typed", ] -requires-python = ">=3.10" +requires-python = ">=3.11" # IMPORTANT: # Run 'tox -e deps' after making changes here. This will update requirement files. diff --git a/tox.ini b/tox.ini index 8ef01fad..433d09d5 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py310 +envlist = py311 isolated_build = true [testenv] From f76f9c2a8de1d42e0d48d1d3b3832aefb05c8366 Mon Sep 17 00:00:00 2001 From: Jan-Lukas Wynen Date: Mon, 4 Aug 2025 11:45:02 +0200 Subject: [PATCH 2/2] Use datetime.UTC alias --- tests/nexus/workflow_test.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/tests/nexus/workflow_test.py b/tests/nexus/workflow_test.py index b2cf5cc0..941d217d 100644 --- a/tests/nexus/workflow_test.py +++ b/tests/nexus/workflow_test.py @@ -1,6 +1,6 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright (c) 2024 Scipp contributors (https://github.com/scipp) -from datetime import datetime, timezone +from datetime import UTC, datetime import pytest import scipp as sc @@ -644,10 +644,8 @@ def test_generic_nexus_workflow_load_measurement_metadata() -> None: assert measurement.title == 'My experiment' assert measurement.experiment_id == 'p1234' - assert measurement.start_time == datetime( - 2022, 2, 28, 21, 15, 0, tzinfo=timezone.utc - ) - assert measurement.end_time == datetime(2032, 2, 29, 9, 15, 0, tzinfo=timezone.utc) + assert measurement.start_time == datetime(2022, 2, 28, 21, 15, 0, tzinfo=UTC) + assert measurement.end_time == datetime(2032, 2, 29, 9, 15, 0, tzinfo=UTC) assert measurement.run_number is None assert measurement.experiment_doi is None