aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEugene Triguba <eugenetriguba@gmail.com>2023-11-05 15:17:03 -0500
committerGitHub <noreply@github.com>2023-11-05 15:17:03 -0500
commitc3cbdd555216bd9b693eea0dcf055f3daff9fc0a (patch)
treed3236d88fc2482ca2bf43af7ee31c6cb6c40f87d
parentFix duplicate workflow runs (diff)
downloadconfig-file-c3cbdd555216bd9b693eea0dcf055f3daff9fc0a.zip
Update toml and yaml extra dependencies (#30)
* Update tomlkit and ruamel.yaml * Add changelog entry and fix python marker
-rw-r--r--CHANGELOG.md6
-rw-r--r--poetry.lock35
-rw-r--r--pyproject.toml7
3 files changed, 34 insertions, 14 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index fe4517f..f553ed0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed
+- Extra `toml` and `yaml` dependencies have been updated.
+ - The `toml` extra now installs `tomlkit` version `0.7.2` on Python 3.6 and constrained to `^0.12.2` on Python 3.7
+ and greater. Previously, it was constrained to `^0.6.0`.
+ - The `yaml` extra now installs `ruamel.yaml` constrained to `^0.17.16`. Previously, it was constrained
+ to `^0.16.10`.
+
- Replaced deprecated use of `ruamel.yaml` methods in the YAML parser (via [#28](https://github.com/eugenetriguba/config-file/pull/28), thanks [@JaWeRn](https://github.com/JaWeRn)).
## 0.12.0 - 2020-10-03
diff --git a/poetry.lock b/poetry.lock
index 625e298..d360d3f 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -1036,20 +1036,20 @@ files = [
[[package]]
name = "ruamel-yaml"
-version = "0.16.13"
+version = "0.17.40"
description = "ruamel.yaml is a YAML parser/emitter that supports roundtrip preservation of comments, seq/map flow style, and map key order"
optional = true
-python-versions = "*"
+python-versions = ">=3"
files = [
- {file = "ruamel.yaml-0.16.13-py2.py3-none-any.whl", hash = "sha256:64b06e7873eb8e1125525ecef7345447d786368cadca92a7cd9b59eae62e95a3"},
- {file = "ruamel.yaml-0.16.13.tar.gz", hash = "sha256:bb48c514222702878759a05af96f4b7ecdba9b33cd4efcf25c86b882cef3a942"},
+ {file = "ruamel.yaml-0.17.40-py3-none-any.whl", hash = "sha256:b16b6c3816dff0a93dca12acf5e70afd089fa5acb80604afd1ffa8b465b7722c"},
+ {file = "ruamel.yaml-0.17.40.tar.gz", hash = "sha256:6024b986f06765d482b5b07e086cc4b4cd05dd22ddcbc758fa23d54873cf313d"},
]
[package.dependencies]
-"ruamel.yaml.clib" = {version = ">=0.1.2", markers = "platform_python_implementation == \"CPython\" and python_version < \"3.10\""}
+"ruamel.yaml.clib" = {version = ">=0.2.7", markers = "platform_python_implementation == \"CPython\" and python_version < \"3.13\""}
[package.extras]
-docs = ["ryd"]
+docs = ["mercurial (>5.7)", "ryd"]
jinja2 = ["ruamel.yaml.jinja2 (>=0.2)"]
[[package]]
@@ -1204,13 +1204,24 @@ files = [
[[package]]
name = "tomlkit"
-version = "0.6.0"
+version = "0.7.2"
description = "Style preserving TOML library"
optional = true
-python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
+files = [
+ {file = "tomlkit-0.7.2-py2.py3-none-any.whl", hash = "sha256:173ad840fa5d2aac140528ca1933c29791b79a374a0861a80347f42ec9328117"},
+ {file = "tomlkit-0.7.2.tar.gz", hash = "sha256:d7a454f319a7e9bd2e249f239168729327e4dd2d27b17dc68be264ad1ce36754"},
+]
+
+[[package]]
+name = "tomlkit"
+version = "0.12.2"
+description = "Style preserving TOML library"
+optional = true
+python-versions = ">=3.7"
files = [
- {file = "tomlkit-0.6.0-py2.py3-none-any.whl", hash = "sha256:e5d5f20809c2b09276a6c5d98fb0202325aee441a651db84ac12e0812ab7e569"},
- {file = "tomlkit-0.6.0.tar.gz", hash = "sha256:74f976908030ff164c0aa1edabe3bf83ea004b3daa5b0940b9c86a060c004e9a"},
+ {file = "tomlkit-0.12.2-py3-none-any.whl", hash = "sha256:eeea7ac7563faeab0a1ed8fe12c2e5a51c61f933f2502f7e9db0241a65163ad0"},
+ {file = "tomlkit-0.12.2.tar.gz", hash = "sha256:df32fab589a81f0d7dc525a4267b6d7a64ee99619cbd1eeb0fae32c1dd426977"},
]
[[package]]
@@ -1312,10 +1323,10 @@ docs = ["jaraco.packaging (>=8.2)", "rst.linker (>=1.9)", "sphinx"]
testing = ["func-timeout", "jaraco.itertools", "pytest (>=4.6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=1.0.1)", "pytest-flake8", "pytest-mypy"]
[extras]
-toml = ["tomlkit"]
+toml = ["tomlkit", "tomlkit"]
yaml = ["ruamel.yaml"]
[metadata]
lock-version = "2.0"
python-versions = "^3.6"
-content-hash = "82fa36ad5f7cebb7bebfd8d60d4f58934ae80b27bc291200ac9c565d3e3a7875"
+content-hash = "8d96e3399e347a46235ec2caaeecd3caf69cea03631ffc6b84cdc026e925520e"
diff --git a/pyproject.toml b/pyproject.toml
index 8e709c2..9c94b92 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -39,8 +39,11 @@ pytest = "poetry run pytest tests/"
[tool.poetry.dependencies]
python = "^3.6"
-tomlkit = { version = "^0.6.0", optional = true }
-"ruamel.yaml" = { version = "^0.16.10", optional = true }
+tomlkit = [
+ { version = "0.7.2", python = ">=3.6,<3.7", optional = true },
+ { version = "^0.12.2", python = ">=3.7,<4", optional = true }
+]
+"ruamel.yaml" = { version = "^0.17.16", optional = true }
[tool.poetry.extras]
toml = ["tomlkit"]