Merge pull request #70 from cadenmyers13/windows-ci

CI: fix matrix testing on merge

Author: sbillinge

.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"

news/bump-version.rst renamed to news/windows-ci.rst

@@ -1,6 +1,6 @@
 **Added:**
 
-* Add support for Python 3.14
+* <news item>
 
 **Changed:**
 
@@ -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:**
 

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',
 ]

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