From c9b93797713b22da99ec23169dde66eec3a03317 Mon Sep 17 00:00:00 2001 From: Chris Brown <77508021+peakschris@users.noreply.github.com> Date: Sat, 6 Jul 2024 05:00:10 -0400 Subject: [PATCH 1/2] bump package-url version, add python 3.11, drop python 3.6 --- pyproject.toml | 4 ++-- requirements.lowest.txt | 2 +- tox.ini | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 0b648b0..8564a9d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -40,11 +40,11 @@ classifiers = [ 'Topic :: Software Development', 'Topic :: System :: Software Distribution', 'License :: OSI Approved :: Apache Software License', - 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', 'Programming Language :: Python :: 3.10', + 'Programming Language :: Python :: 3.11', 'Typing :: Typed' ] keywords = [ @@ -57,7 +57,7 @@ keywords = [ [tool.poetry.dependencies] python = "^3.6.2" importlib-metadata = { version = ">= 3.4", python = "< 3.8" } -packageurl-python = "^0.9.0" +packageurl-python = ">=0.11, <2" PyYAML = ">=5.4.1, <7.0.0" requests = "^2.20.0" tinydb = "^4.5.0" diff --git a/requirements.lowest.txt b/requirements.lowest.txt index 33650ca..bbeb7b8 100644 --- a/requirements.lowest.txt +++ b/requirements.lowest.txt @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # -packageurl-python == 0.9.0 +packageurl-python == 0.11 importlib-metadata == 3.4.0 # ; python_version < '3.8' PyYAML == 5.4.1 requests == 2.20.0 diff --git a/tox.ini b/tox.ini index 10d5825..5d260f4 100644 --- a/tox.ini +++ b/tox.ini @@ -19,7 +19,7 @@ minversion = 3.10 envlist = flake8 mypy-{locked,lowest} - py{310,39,38,37,36}-{locked,lowest} + py{311,310,39,38,37}-{locked,lowest} isolated_build = True skip_missing_interpreters = True usedevelop = False From a9bba3d695cca925d52a6e010b4716fae9b61493 Mon Sep 17 00:00:00 2001 From: Chris Brown <77508021+peakschris@users.noreply.github.com> Date: Sat, 6 Jul 2024 05:03:03 -0400 Subject: [PATCH 2/2] allow existing package-url version, api that we consume is unchanged --- pyproject.toml | 3 ++- requirements.lowest.txt | 2 +- tox.ini | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 8564a9d..ef06609 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -40,6 +40,7 @@ classifiers = [ 'Topic :: Software Development', 'Topic :: System :: Software Distribution', 'License :: OSI Approved :: Apache Software License', + 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', @@ -57,7 +58,7 @@ keywords = [ [tool.poetry.dependencies] python = "^3.6.2" importlib-metadata = { version = ">= 3.4", python = "< 3.8" } -packageurl-python = ">=0.11, <2" +packageurl-python = ">=0.9.0, <2" PyYAML = ">=5.4.1, <7.0.0" requests = "^2.20.0" tinydb = "^4.5.0" diff --git a/requirements.lowest.txt b/requirements.lowest.txt index bbeb7b8..33650ca 100644 --- a/requirements.lowest.txt +++ b/requirements.lowest.txt @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # -packageurl-python == 0.11 +packageurl-python == 0.9.0 importlib-metadata == 3.4.0 # ; python_version < '3.8' PyYAML == 5.4.1 requests == 2.20.0 diff --git a/tox.ini b/tox.ini index 5d260f4..acd3ab3 100644 --- a/tox.ini +++ b/tox.ini @@ -19,7 +19,7 @@ minversion = 3.10 envlist = flake8 mypy-{locked,lowest} - py{311,310,39,38,37}-{locked,lowest} + py{311,310,39,38,37,36}-{locked,lowest} isolated_build = True skip_missing_interpreters = True usedevelop = False