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" diff --git a/news/bump-version.rst b/news/windows-ci.rst similarity index 62% rename from news/bump-version.rst rename to news/windows-ci.rst index 2be63cb..ae663d1 100644 --- a/news/bump-version.rst +++ b/news/windows-ci.rst @@ -1,6 +1,6 @@ **Added:** -* Add support for Python 3.14 +* **Changed:** @@ -12,11 +12,11 @@ **Removed:** -* Remove support for Python 3.11 +* **Fixed:** -* +* Fixed how paths are handled in tests for different operating systems. **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', ] 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