From 26bc1c6edcc3aa1cb45a83aedc00d7ff16751939 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 4 Apr 2023 00:27:58 +0000 Subject: [PATCH 1/2] Bump semver from 2.13.0 to 3.0.0 Bumps [semver](https://github.com/python-semver/python-semver) from 2.13.0 to 3.0.0. - [Release notes](https://github.com/python-semver/python-semver/releases) - [Changelog](https://github.com/python-semver/python-semver/blob/master/CHANGELOG.rst) - [Commits](https://github.com/python-semver/python-semver/compare/2.13.0...3.0.0) --- updated-dependencies: - dependency-name: semver dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- poetry.lock | 12 ++++++------ pyproject.toml | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/poetry.lock b/poetry.lock index 6896d59b..9264e008 100644 --- a/poetry.lock +++ b/poetry.lock @@ -807,14 +807,14 @@ use-chardet-on-py3 = ["chardet (>=3.0.2,<6)"] [[package]] name = "semver" -version = "2.13.0" -description = "Python helper for Semantic Versioning (http://semver.org/)" +version = "3.0.0" +description = "Python helper for Semantic Versioning (https://semver.org)" category = "main" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" +python-versions = ">=3.7" files = [ - {file = "semver-2.13.0-py2.py3-none-any.whl", hash = "sha256:ced8b23dceb22134307c1b8abfa523da14198793d9787ac838e70e29e77458d4"}, - {file = "semver-2.13.0.tar.gz", hash = "sha256:fa0fe2722ee1c3f57eac478820c3a5ae2f624af8264cbdf9000c980ff7f75e3f"}, + {file = "semver-3.0.0-py3-none-any.whl", hash = "sha256:ab4f69fb1d1ecfb5d81f96411403d7a611fa788c45d252cf5b408025df3ab6ce"}, + {file = "semver-3.0.0.tar.gz", hash = "sha256:94df43924c4521ec7d307fc86da1531db6c2c33d9d5cdc3e64cca0eb68569269"}, ] [[package]] @@ -967,4 +967,4 @@ setuptools = "*" [metadata] lock-version = "2.0" python-versions = "~3.11" -content-hash = "bfd334ddbc73ec3c8af3038aeafa4719c5159c687591f9d145f32bf75dfe51e6" +content-hash = "b685d86a2f9ab0f1a883f5ccfc0f85e7a48f044b9c9339bae1e5d2ec87cfce42" diff --git a/pyproject.toml b/pyproject.toml index 3c06cd00..6ea4fdc8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -12,7 +12,7 @@ python = "3.11.2" GitPython = "3.1.31" PyGithub = "1.58.1" PyYAML = "6.0" -semver = "2.13.0" +semver = "3.0.0" [tool.poetry.group.dev.dependencies] black = "23.3.0" From cedce1f43dfaefa98f82058b10e5d0d10ac0fad2 Mon Sep 17 00:00:00 2001 From: per1234 Date: Mon, 3 Apr 2023 19:00:59 -0700 Subject: [PATCH 2/2] Update code to accommodate breaking change to semver package See: https://python-semver.readthedocs.io/en/latest/changelog.html#:~:text=Deprecate%20the%20use%20of%20isvalid --- compilesketches/compilesketches.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compilesketches/compilesketches.py b/compilesketches/compilesketches.py index d102ee56..23467799 100644 --- a/compilesketches/compilesketches.py +++ b/compilesketches/compilesketches.py @@ -1502,8 +1502,8 @@ def cli_json_key(self, command, original_key_name): } if ( - not semver.VersionInfo.isvalid(version=self.cli_version) - or semver.compare(ver1=self.cli_version, ver2=final_original_interface_version) > 0 + not semver.VersionInfo.is_valid(version=self.cli_version) + or semver.Version.parse(version=self.cli_version).compare(other=final_original_interface_version) > 0 ) and (command in key_translation and original_key_name in key_translation[command]): return key_translation[command][original_key_name]