diff --git a/.github/workflows/pythonpublish.yml b/.github/workflows/pythonpublish.yml index f101812..9f868a9 100644 --- a/.github/workflows/pythonpublish.yml +++ b/.github/workflows/pythonpublish.yml @@ -33,7 +33,7 @@ jobs: deploy-cython: strategy: matrix: - os: [ubuntu-latest, macos-latest, windows-latest] + os: [macos-latest, windows-latest] python-version: ["3.7", "3.8", "3.9", "3.10"] runs-on: ${{ matrix.os }} diff --git a/CHANGES.rst b/CHANGES.rst index a533795..6650fce 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -13,6 +13,7 @@ Version 6.0.0 * Changing `update` and `merge_update` to not use a keyword that could cause issues in rare circumstances * Fixing internal `_safe_key` logic to be twice as fast * Removing support for 3.6 as it is EOL +* Removing support for ruamel.yaml < 0.17 Version 5.4.1 ------------- diff --git a/box/converters.py b/box/converters.py index f32b8bb..eaf2ac3 100644 --- a/box/converters.py +++ b/box/converters.py @@ -143,7 +143,7 @@ def _to_yaml( elif pyyaml_available: return yaml.dump(obj, default_flow_style=default_flow_style, **yaml_kwargs) else: - raise BoxError("No YAML Parser available, please install ruamel.yaml>0.15 or PyYAML") + raise BoxError("No YAML Parser available, please install ruamel.yaml>0.17 or PyYAML") def _from_yaml( diff --git a/requirements-test.txt b/requirements-test.txt index a2493e8..91a12c3 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -2,7 +2,7 @@ coverage>=5.0.4 msgpack>=1.0 pytest>=5.4.1 pytest-cov>=2.8.1 -ruamel.yaml>=0.16,<0.17 +ruamel.yaml>=0.17 toml>=0.10.2 types-PyYAML>=6.0.3 types-toml>=0.1.3 diff --git a/requirements.txt b/requirements.txt index bdccd9b..b245b05 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ msgpack>=1.0.0 -ruamel.yaml>=0.15 +ruamel.yaml>=0.17 toml>=0.10.2 diff --git a/setup.py b/setup.py index 0d3e61b..afc879a 100644 --- a/setup.py +++ b/setup.py @@ -65,9 +65,9 @@ "Topic :: Software Development :: Libraries :: Python Modules", ], extras_require={ - "all": ["ruamel.yaml", "toml", "msgpack"], - "yaml": ["ruamel.yaml"], - "ruamel.yaml": ["ruamel.yaml"], + "all": ["ruamel.yaml>=0.17", "toml", "msgpack"], + "yaml": ["ruamel.yaml>=0.17"], + "ruamel.yaml": ["ruamel.yaml>=0.17"], "PyYAML": ["PyYAML"], "toml": ["toml"], "msgpack": ["msgpack"],