From 6b822a6bf5f7777ce70364dd0a4b29918088fdf3 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 --- .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 ++-- .../.github/workflows/build.yml | 2 +- .../.github/workflows/collect_changes.yml | 2 +- .../.github/workflows/cookiecutter.yml | 4 ++-- .../.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 | 2 +- pulp-glue/pyproject.toml | 2 +- pulp_cli/generic.py | 3 ++- pyproject.toml | 2 +- 19 files changed, 22 insertions(+), 21 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d2fc205c6..495af4573 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,7 +19,7 @@ jobs: - name: "Set up Python" uses: "actions/setup-python@v6" 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 34bf44550..12da36cd2 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@v6" 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 9b95be990..0678757f9 100644 --- a/.github/workflows/cookiecutter.yml +++ b/.github/workflows/cookiecutter.yml @@ -24,7 +24,7 @@ jobs: - name: "Set up Python" uses: "actions/setup-python@v6" with: - python-version: "3.13" + 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 a30046655..0e7651539 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@v5" - uses: "actions/cache@v4" diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 91ea7f115..fb1653d48 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -39,7 +39,7 @@ jobs: - name: "Set up Python" uses: "actions/setup-python@v6" 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 86f4932ea..0d3a22818 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@v6" 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 d3f4f122b..be0c5e53a 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@v6" 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 a178e81aa..9ecf077e8 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -29,7 +29,7 @@ jobs: - name: "Set up Python" uses: "actions/setup-python@v6" 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/cookiecutter/ci/{{ cookiecutter.__project_name }}/.github/workflows/build.yml b/cookiecutter/ci/{{ cookiecutter.__project_name }}/.github/workflows/build.yml index abec2d07d..5b174d726 100644 --- a/cookiecutter/ci/{{ cookiecutter.__project_name }}/.github/workflows/build.yml +++ b/cookiecutter/ci/{{ cookiecutter.__project_name }}/.github/workflows/build.yml @@ -13,7 +13,7 @@ jobs: - name: "Set up Python" uses: "actions/setup-python@v6" with: - python-version: "3.11" + python-version: "3.14" - name: "Install python dependencies" run: | pip install build setuptools wheel diff --git a/cookiecutter/ci/{{ cookiecutter.__project_name }}/.github/workflows/collect_changes.yml b/cookiecutter/ci/{{ cookiecutter.__project_name }}/.github/workflows/collect_changes.yml index 34bf44550..12da36cd2 100644 --- a/cookiecutter/ci/{{ cookiecutter.__project_name }}/.github/workflows/collect_changes.yml +++ b/cookiecutter/ci/{{ cookiecutter.__project_name }}/.github/workflows/collect_changes.yml @@ -14,7 +14,7 @@ jobs: fetch-depth: 0 - uses: "actions/setup-python@v6" with: - python-version: "3.11" + python-version: "3.x" - name: "Setup git" run: | git config user.name pulpbot diff --git a/cookiecutter/ci/{{ cookiecutter.__project_name }}/.github/workflows/cookiecutter.yml b/cookiecutter/ci/{{ cookiecutter.__project_name }}/.github/workflows/cookiecutter.yml index a8a04350d..8b4b847b4 100644 --- a/cookiecutter/ci/{{ cookiecutter.__project_name }}/.github/workflows/cookiecutter.yml +++ b/cookiecutter/ci/{{ cookiecutter.__project_name }}/.github/workflows/cookiecutter.yml @@ -26,7 +26,7 @@ jobs: - name: "Set up Python" uses: "actions/setup-python@v6" with: - python-version: "3.13" + python-version: "3.x" - name: "Setup git" run: | git config user.name pulpbot @@ -80,7 +80,7 @@ jobs: - name: "Set up Python" uses: "actions/setup-python@v6" with: - python-version: "3.13" + python-version: "3.x" - name: "Setup git" run: | git config user.name pulpbot diff --git a/cookiecutter/ci/{{ cookiecutter.__project_name }}/.github/workflows/lint.yml b/cookiecutter/ci/{{ cookiecutter.__project_name }}/.github/workflows/lint.yml index 0a313a2b2..914882ccc 100644 --- a/cookiecutter/ci/{{ cookiecutter.__project_name }}/.github/workflows/lint.yml +++ b/cookiecutter/ci/{{ cookiecutter.__project_name }}/.github/workflows/lint.yml @@ -12,7 +12,7 @@ jobs: matrix: python: - "3.11" - - "3.13" + - "3.14" steps: - uses: "actions/checkout@v5" {%- include "cache_action" %} diff --git a/cookiecutter/ci/{{ cookiecutter.__project_name }}/.github/workflows/pr.yml b/cookiecutter/ci/{{ cookiecutter.__project_name }}/.github/workflows/pr.yml index 49969bcb8..8d4fe0d84 100644 --- a/cookiecutter/ci/{{ cookiecutter.__project_name }}/.github/workflows/pr.yml +++ b/cookiecutter/ci/{{ cookiecutter.__project_name }}/.github/workflows/pr.yml @@ -41,7 +41,7 @@ jobs: - name: "Set up Python" uses: "actions/setup-python@v6" with: - python-version: "3.11" + python-version: "3.x" - name: "Install python dependencies" run: | pip install toml pygithub diff --git a/cookiecutter/ci/{{ cookiecutter.__project_name }}/.github/workflows/pr_checks.yml b/cookiecutter/ci/{{ cookiecutter.__project_name }}/.github/workflows/pr_checks.yml index 86f4932ea..0d3a22818 100644 --- a/cookiecutter/ci/{{ cookiecutter.__project_name }}/.github/workflows/pr_checks.yml +++ b/cookiecutter/ci/{{ cookiecutter.__project_name }}/.github/workflows/pr_checks.yml @@ -24,7 +24,7 @@ jobs: fetch-depth: 0 - uses: "actions/setup-python@v6" with: - python-version: "3.12" + python-version: "3.x" - name: "Determine PR labels" run: | pip install GitPython==3.1.42 diff --git a/cookiecutter/ci/{{ cookiecutter.__project_name }}/.github/workflows/release_branch.yml b/cookiecutter/ci/{{ cookiecutter.__project_name }}/.github/workflows/release_branch.yml index d3f4f122b..be0c5e53a 100644 --- a/cookiecutter/ci/{{ cookiecutter.__project_name }}/.github/workflows/release_branch.yml +++ b/cookiecutter/ci/{{ cookiecutter.__project_name }}/.github/workflows/release_branch.yml @@ -13,7 +13,7 @@ jobs: - name: "Set up Python" uses: "actions/setup-python@v6" with: - python-version: "3.11" + python-version: "3.x" - name: "Setup git" run: | git config user.name pulpbot diff --git a/cookiecutter/ci/{{ cookiecutter.__project_name }}/.github/workflows/test.yml b/cookiecutter/ci/{{ cookiecutter.__project_name }}/.github/workflows/test.yml index 1d0586da2..cc3656e6d 100644 --- a/cookiecutter/ci/{{ cookiecutter.__project_name }}/.github/workflows/test.yml +++ b/cookiecutter/ci/{{ cookiecutter.__project_name }}/.github/workflows/test.yml @@ -24,7 +24,7 @@ jobs: - name: "Set up Python" uses: "actions/setup-python@v6" with: - python-version: "3.12" + python-version: "3.14" - name: "Install Python Test Dependencies" run: | pip install dist/pulp_cli{{ cookiecutter.__app_label_suffix | replace("-", "_") }}-*.whl {%- if cookiecutter.glue %} pulp-glue{{ cookiecutter.__app_label_suffix }}/dist/pulp_glue{{ cookiecutter.__app_label_suffix | replace("-", "_") }}-*.whl {%- endif %} -r test_requirements.txt diff --git a/pulp-glue/pyproject.toml b/pulp-glue/pyproject.toml index 12ab5ae17..e95069ecf 100644 --- a/pulp-glue/pyproject.toml +++ b/pulp-glue/pyproject.toml @@ -7,7 +7,7 @@ name = "pulp-glue" version = "0.37.0.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 26089d8bf..3d7f07a43 100644 --- a/pulp_cli/generic.py +++ b/pulp_cli/generic.py @@ -675,7 +675,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 933e97e67..b67202fa1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,7 +7,7 @@ name = "pulp-cli" version = "0.37.0.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"},