From 2749c4bd05b145088ee0ca3d891337c244d58a53 Mon Sep 17 00:00:00 2001 From: Matthias Dellweg Date: Tue, 5 May 2026 11:03:15 +0200 Subject: [PATCH] Bump version of packaging --- .github/workflows/test.yml | 2 -- .gitignore | 2 +- pulp-glue/pyproject.toml | 2 +- pulpcore/cli/common/generic.py | 3 ++- pyproject.toml | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 64704c0bf..1b2e6ba16 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -31,8 +31,6 @@ jobs: - image_tag: "3.28" lower_bounds: true python: "3.13" - - image_tag: "3.22" - python: "3.8" - image_tag: "3.21" lower_bounds: true pulp_api_root: "/relocated/djnd/" diff --git a/.gitignore b/.gitignore index 234fb5b30..ed761f6a8 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,7 @@ __pycache__/ build/ tests/cli.toml -pytest_pulp_cli/GPG-PRIVATE-KEY-fixture-signing +GPG-PRIVATE-KEY-fixture-signing site/ dist/ *.po~ diff --git a/pulp-glue/pyproject.toml b/pulp-glue/pyproject.toml index 9f69dc823..f8358d1d1 100644 --- a/pulp-glue/pyproject.toml +++ b/pulp-glue/pyproject.toml @@ -24,7 +24,7 @@ classifiers = [ ] dependencies = [ "importlib_resources>=5.4.0,<6.2;python_version<'3.9'", - "packaging>=20.0,<=25.0", # CalVer + "packaging>=20.0,<=26.2", # CalVer "requests>=2.24.0,<2.33", ] diff --git a/pulpcore/cli/common/generic.py b/pulpcore/cli/common/generic.py index 6cb5bf81a..c13b4805c 100644 --- a/pulpcore/cli/common/generic.py +++ b/pulpcore/cli/common/generic.py @@ -646,7 +646,8 @@ def load_labels_callback( def create_content_json_callback( - context_class: t.Optional[t.Type[PulpContentContext]] = None, schema: s.Schema = None + context_class: t.Optional[t.Type[PulpContentContext]] = None, + schema: t.Optional[s.Schema] = None, ) -> t.Any: @load_file_wrapper def _callback( diff --git a/pyproject.toml b/pyproject.toml index 0d23acbb7..cebd463e8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -25,7 +25,7 @@ classifiers=[ dependencies = [ "pulp-glue==0.29.5.dev", "click>=8.0.0,<8.2", # Proven to not do semver. - "packaging>=20.0,<=25", # CalVer + "packaging>=20.0,<=26.2", # CalVer "PyYAML>=5.3,<6.1", "schema>=0.7.5,<0.8", "toml>=0.10.2,<0.11",