From 58569a86018b6eae5b96c19e27c8c20101a3183f Mon Sep 17 00:00:00 2001 From: Caden Myers Date: Mon, 3 Nov 2025 10:01:48 -0500 Subject: [PATCH 1/7] use as_posix to handle path differences on windows --- tests/test_packsmanager.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/test_packsmanager.py b/tests/test_packsmanager.py index bc93275..7f02b1a 100644 --- a/tests/test_packsmanager.py +++ b/tests/test_packsmanager.py @@ -15,8 +15,9 @@ def paths_and_names_match(expected, actual, root): for (exp_name, exp_path), (act_name, act_path) in zip(expected, actual): if exp_name != act_name: return False - actual_rel_path = str(act_path.relative_to(root)) - if actual_rel_path != exp_path: + actual_rel_path = act_path.relative_to(root).as_posix() + expected_path_norm = Path(exp_path).as_posix() + if actual_rel_path != expected_path_norm: return False return True From 034ebf79940752369be3d314b6f6ab3392673538 Mon Sep 17 00:00:00 2001 From: Caden Myers Date: Mon, 3 Nov 2025 10:07:20 -0500 Subject: [PATCH 2/7] pin python 3.12 and 3.13 in matrix testing --- .github/workflows/matrix-and-codecov-on-merge-to-main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/matrix-and-codecov-on-merge-to-main.yml b/.github/workflows/matrix-and-codecov-on-merge-to-main.yml index 8d863f3..11abac5 100644 --- a/.github/workflows/matrix-and-codecov-on-merge-to-main.yml +++ b/.github/workflows/matrix-and-codecov-on-merge-to-main.yml @@ -17,6 +17,7 @@ jobs: project: diffpy.cmi c_extension: false headless: false + python_versions: "3.13" run: | set -Eeuo pipefail echo "Test cmds" From 6d5f3a927e23ed7aac8d5c63e3ee95765c4e0127 Mon Sep 17 00:00:00 2001 From: Caden Myers Date: Mon, 3 Nov 2025 10:08:41 -0500 Subject: [PATCH 3/7] typo in python_versions --- .github/workflows/matrix-and-codecov-on-merge-to-main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/matrix-and-codecov-on-merge-to-main.yml b/.github/workflows/matrix-and-codecov-on-merge-to-main.yml index 11abac5..6a77d79 100644 --- a/.github/workflows/matrix-and-codecov-on-merge-to-main.yml +++ b/.github/workflows/matrix-and-codecov-on-merge-to-main.yml @@ -17,7 +17,7 @@ jobs: project: diffpy.cmi c_extension: false headless: false - python_versions: "3.13" + python_versions: "3.12, 3.13" run: | set -Eeuo pipefail echo "Test cmds" From 2cb4526ac5ea8522eeee3c7224cd19fbafaee668 Mon Sep 17 00:00:00 2001 From: Caden Myers Date: Mon, 3 Nov 2025 10:11:14 -0500 Subject: [PATCH 4/7] news --- news/windows-ci.rst | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 news/windows-ci.rst diff --git a/news/windows-ci.rst b/news/windows-ci.rst new file mode 100644 index 0000000..3230383 --- /dev/null +++ b/news/windows-ci.rst @@ -0,0 +1,23 @@ +**Added:** + +* + +**Changed:** + +* + +**Deprecated:** + +* + +**Removed:** + +* Removed matrix testing for Python 3.14. + +**Fixed:** + +* + +**Security:** + +* From ee977afdb8007ecb6599fb15f765d4c0598cba15 Mon Sep 17 00:00:00 2001 From: Caden Myers Date: Mon, 3 Nov 2025 12:39:37 -0500 Subject: [PATCH 5/7] rm python pin in both workflows --- .github/workflows/matrix-and-codecov-on-merge-to-main.yml | 1 - .github/workflows/tests-on-pr.yml | 1 - 2 files changed, 2 deletions(-) diff --git a/.github/workflows/matrix-and-codecov-on-merge-to-main.yml b/.github/workflows/matrix-and-codecov-on-merge-to-main.yml index 6a77d79..8d863f3 100644 --- a/.github/workflows/matrix-and-codecov-on-merge-to-main.yml +++ b/.github/workflows/matrix-and-codecov-on-merge-to-main.yml @@ -17,7 +17,6 @@ jobs: project: diffpy.cmi c_extension: false headless: false - python_versions: "3.12, 3.13" run: | set -Eeuo pipefail echo "Test cmds" diff --git a/.github/workflows/tests-on-pr.yml b/.github/workflows/tests-on-pr.yml index 08533f1..e8ef0fc 100644 --- a/.github/workflows/tests-on-pr.yml +++ b/.github/workflows/tests-on-pr.yml @@ -11,7 +11,6 @@ jobs: project: diffpy.cmi c_extension: false headless: false - python_version: 3.13 run: | set -Eeuo pipefail echo "Test cmds" From 74bacce007b1f0db60aff9a4af3f03a98045608a Mon Sep 17 00:00:00 2001 From: Caden Myers Date: Mon, 3 Nov 2025 12:41:43 -0500 Subject: [PATCH 6/7] fix news --- news/windows-ci.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/news/windows-ci.rst b/news/windows-ci.rst index 3230383..ae663d1 100644 --- a/news/windows-ci.rst +++ b/news/windows-ci.rst @@ -12,11 +12,11 @@ **Removed:** -* Removed matrix testing for Python 3.14. +* **Fixed:** -* +* Fixed how paths are handled in tests for different operating systems. **Security:** From cfda20798db1d656384691b3429e4c615cdfc3ca Mon Sep 17 00:00:00 2001 From: Caden Myers Date: Mon, 3 Nov 2025 12:48:51 -0500 Subject: [PATCH 7/7] rm python 3.14 support and add python 3.11 support --- news/bump-version.rst | 23 ----------------------- pyproject.toml | 4 ++-- 2 files changed, 2 insertions(+), 25 deletions(-) delete mode 100644 news/bump-version.rst diff --git a/news/bump-version.rst b/news/bump-version.rst deleted file mode 100644 index 2be63cb..0000000 --- a/news/bump-version.rst +++ /dev/null @@ -1,23 +0,0 @@ -**Added:** - -* Add support for Python 3.14 - -**Changed:** - -* - -**Deprecated:** - -* - -**Removed:** - -* Remove support for Python 3.11 - -**Fixed:** - -* - -**Security:** - -* diff --git a/pyproject.toml b/pyproject.toml index bea7171..7f46926 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -14,7 +14,7 @@ maintainers = [ description = "Complex modeling infrastructure: a modular framework for multi-modal modeling of scientific data." keywords = ['modelling', 'regression', 'diffraction', 'PDF', 'complex-modeling'] readme = "README.rst" -requires-python = ">=3.12, <3.15" +requires-python = ">=3.11, <3.14" classifiers = [ 'Development Status :: 5 - Production/Stable', 'Environment :: Console', @@ -25,9 +25,9 @@ classifiers = [ 'Operating System :: Microsoft :: Windows', 'Operating System :: POSIX', 'Operating System :: Unix', + 'Programming Language :: Python :: 3.11', 'Programming Language :: Python :: 3.12', 'Programming Language :: Python :: 3.13', - 'Programming Language :: Python :: 3.14', 'Topic :: Scientific/Engineering :: Physics', 'Topic :: Scientific/Engineering :: Chemistry', ]