From d252a65099e3061d6059a063fafc63b8f9088051 Mon Sep 17 00:00:00 2001 From: Matthias Dellweg Date: Tue, 14 Oct 2025 10:04:49 +0200 Subject: [PATCH] Allow to use python 3.14 (cherry picked from commit 0f06dd0e39c689d89df6784e996d3898b289791b) --- .github/workflows/build.yml | 2 +- .github/workflows/collect_changes.yml | 2 +- .github/workflows/cookiecutter.yml | 2 +- .github/workflows/lint.yml | 2 +- .github/workflows/pr.yml | 2 +- .github/workflows/pr_checks.yml | 2 +- .github/workflows/release_branch.yml | 2 +- .github/workflows/test.yml | 4 ++-- pulp-glue/pyproject.toml | 2 +- pulp_cli/generic.py | 3 ++- pyproject.toml | 2 +- 11 files changed, 13 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5826d1b58..2467505a3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,7 +19,7 @@ jobs: - name: "Set up Python" uses: "actions/setup-python@v5" with: - python-version: "3.11" + python-version: "3.14" - name: "Install python dependencies" run: | pip install build setuptools wheel diff --git a/.github/workflows/collect_changes.yml b/.github/workflows/collect_changes.yml index a4582af93..598704053 100644 --- a/.github/workflows/collect_changes.yml +++ b/.github/workflows/collect_changes.yml @@ -14,7 +14,7 @@ jobs: fetch-depth: 0 - uses: "actions/setup-python@v5" with: - python-version: "3.11" + python-version: "3.x" - name: "Setup git" run: | git config user.name pulpbot diff --git a/.github/workflows/cookiecutter.yml b/.github/workflows/cookiecutter.yml index 96546b8ee..62151f8a9 100644 --- a/.github/workflows/cookiecutter.yml +++ b/.github/workflows/cookiecutter.yml @@ -22,7 +22,7 @@ jobs: - name: "Set up Python" uses: "actions/setup-python@v5" with: - python-version: "3.11" + python-version: "3.x" - name: "Setup git" run: | git config user.name pulpbot diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index ec4f4bfb0..11a84e3f7 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -12,7 +12,7 @@ jobs: matrix: python: - "3.11" - - "3.13" + - "3.14" steps: - uses: "actions/checkout@v4" - uses: "actions/cache@v4" diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index c864d8035..b0ed6acc2 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -39,7 +39,7 @@ jobs: - name: "Set up Python" uses: "actions/setup-python@v5" with: - python-version: "3.11" + python-version: "3.x" - name: "Install python dependencies" run: | pip install toml pygithub diff --git a/.github/workflows/pr_checks.yml b/.github/workflows/pr_checks.yml index ef9c6ff8f..bdb93d434 100644 --- a/.github/workflows/pr_checks.yml +++ b/.github/workflows/pr_checks.yml @@ -24,7 +24,7 @@ jobs: fetch-depth: 0 - uses: "actions/setup-python@v5" with: - python-version: "3.12" + python-version: "3.x" - name: "Determine PR labels" run: | pip install GitPython==3.1.42 diff --git a/.github/workflows/release_branch.yml b/.github/workflows/release_branch.yml index fe31bea5c..718362ba1 100644 --- a/.github/workflows/release_branch.yml +++ b/.github/workflows/release_branch.yml @@ -13,7 +13,7 @@ jobs: - name: "Set up Python" uses: "actions/setup-python@v5" with: - python-version: "3.11" + python-version: "3.x" - name: "Setup git" run: | git config user.name pulpbot diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 87ef298b6..7cc84993c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -29,7 +29,7 @@ jobs: - name: "Set up Python" uses: "actions/setup-python@v5" with: - python-version: "3.12" + python-version: "3.14" - name: "Install Python Test Dependencies" run: | pip install dist/pulp_cli-*.whl pulp-glue/dist/pulp_glue-*.whl -r test_requirements.txt @@ -59,7 +59,7 @@ jobs: - image_tag: "3.63" pulp_https: "true" pulp_oauth2: "true" - python: "3.10" + python: "3.14" - image_tag: "3.49" pulp_https: "true" python: "3.10" diff --git a/pulp-glue/pyproject.toml b/pulp-glue/pyproject.toml index 1113d192d..ed315bdd2 100644 --- a/pulp-glue/pyproject.toml +++ b/pulp-glue/pyproject.toml @@ -7,7 +7,7 @@ name = "pulp-glue" version = "0.34.1.dev" description = "Version agnostic glue library to talk to pulpcore's REST API." readme = "README.md" -requires-python = ">=3.9,<3.14" +requires-python = ">=3.9,<3.15" license = {text = "GPLv2+"} authors = [ {name = "Pulp Team", email = "pulp-list@redhat.com"}, diff --git a/pulp_cli/generic.py b/pulp_cli/generic.py index 22c9a0e94..57163b9fe 100644 --- a/pulp_cli/generic.py +++ b/pulp_cli/generic.py @@ -649,7 +649,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 d1fa81981..ad1768668 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,7 +7,7 @@ name = "pulp-cli" version = "0.34.1.dev" description = "Command line interface to talk to pulpcore's REST API." readme = "README.md" -requires-python = ">=3.9,<3.14" +requires-python = ">=3.9,<3.15" license = {text = "GPLv2+"} authors = [ {name = "Pulp Team", email = "pulp-list@redhat.com"},