Skip to content

CI: fix matrix testing on merge #70

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Nov 3, 2025
Merged

CI: fix matrix testing on merge #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
58569a8
use as_posix to handle path differences on windows
cadenmyers13 Nov 3, 2025
034ebf7
pin python 3.12 and 3.13 in matrix testing
cadenmyers13 Nov 3, 2025
6d5f3a9
typo in python_versions
cadenmyers13 Nov 3, 2025
2cb4526
news
cadenmyers13 Nov 3, 2025
ee977af
rm python pin in both workflows
cadenmyers13 Nov 3, 2025
74bacce
fix news
cadenmyers13 Nov 3, 2025
cfda207
rm python 3.14 support and add python 3.11 support
cadenmyers13 Nov 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/tests-on-pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ jobs:
project: diffpy.cmi
c_extension: false
headless: false
python_version: 3.13
run: |
set -Eeuo pipefail
echo "Test cmds"
Expand Down
6 changes: 3 additions & 3 deletions news/bump-version.rst → news/windows-ci.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
**Added:**

* Add support for Python 3.14
* <news item>

**Changed:**

Expand All @@ -12,11 +12,11 @@

**Removed:**

* Remove support for Python 3.11
* <news item>

**Fixed:**

* <news item>
* Fixed how paths are handled in tests for different operating systems.

**Security:**

Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -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',
]
Expand Down
5 changes: 3 additions & 2 deletions tests/test_packsmanager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Loading