diff --git a/.ci/scripts/check_release.py b/.ci/scripts/check_release.py index 611c882c..6e079995 100755 --- a/.ci/scripts/check_release.py +++ b/.ci/scripts/check_release.py @@ -99,9 +99,9 @@ def main(options: argparse.Namespace, template_config: dict[str, t.Any]) -> int: # Warning: This will not work if branch names contain "/" but we don't really care here. heads = [h.split("/")[-1] for h in repo.git.branch("--remote").split("\n")] - available_branches = [h for h in heads if re.fullmatch(RELEASE_BRANCH_REGEX, h)] - available_branches.sort(key=lambda ver: Version(ver)) - available_branches.append(DEFAULT_BRANCH) + available_branches = sorted( + {h for h in heads if re.fullmatch(RELEASE_BRANCH_REGEX, h)}, key=lambda ver: Version(ver) + ) + [DEFAULT_BRANCH] branches = options.branches if branches == "supported": diff --git a/.ci/scripts/check_requirements.py b/.ci/scripts/check_requirements.py index cf9efbe9..eca49687 100755 --- a/.ci/scripts/check_requirements.py +++ b/.ci/scripts/check_requirements.py @@ -9,7 +9,6 @@ import warnings from packaging.requirements import Requirement - CHECK_MATRIX = [ ("pyproject.toml", True, True, True), ("requirements.txt", True, True, True), diff --git a/.ci/scripts/collect_changes.py b/.ci/scripts/collect_changes.py index fbb5d59d..1a0003c8 100755 --- a/.ci/scripts/collect_changes.py +++ b/.ci/scripts/collect_changes.py @@ -25,7 +25,6 @@ from git import GitCommandError, Repo from packaging.version import parse as parse_version - PYPI_PROJECT = "pulp_python" # Read Towncrier settings diff --git a/.github/workflows/scripts/stage-changelog-for-default-branch.py b/.github/workflows/scripts/stage-changelog-for-default-branch.py index 3950d7f9..1a21419d 100755 --- a/.github/workflows/scripts/stage-changelog-for-default-branch.py +++ b/.github/workflows/scripts/stage-changelog-for-default-branch.py @@ -12,16 +12,13 @@ from git import Repo from git.exc import GitCommandError - -helper = textwrap.dedent( - """\ +helper = textwrap.dedent("""\ Stage the changelog for a release on main branch. Example: $ python .github/workflows/scripts/stage-changelog-for-default-branch.py 3.4.0 - """ -) + """) parser = argparse.ArgumentParser(formatter_class=argparse.RawTextHelpFormatter, description=helper) diff --git a/.github/workflows/update_ci.yml b/.github/workflows/update_ci.yml index 8da2529f..98e44603 100644 --- a/.github/workflows/update_ci.yml +++ b/.github/workflows/update_ci.yml @@ -196,4 +196,35 @@ jobs: env: GH_TOKEN: "${{ secrets.RELEASE_TOKEN }}" continue-on-error: true + - uses: "actions/checkout@v6" + with: + fetch-depth: 0 + path: "pulp_python" + ref: "3.27" + + - name: "Run update" + working-directory: "pulp_python" + run: | + ../plugin_template/scripts/update_ci.sh --release + + - name: "Create Pull Request for CI files" + uses: "peter-evans/create-pull-request@v8" + id: "create_pr_3_27" + with: + token: "${{ secrets.RELEASE_TOKEN }}" + path: "pulp_python" + committer: "pulpbot " + author: "pulpbot " + title: "Update CI files for branch 3.27" + branch: "update-ci/3.27" + base: "3.27" + delete-branch: true + - name: "Mark PR automerge" + working-directory: "pulp_python" + run: | + gh pr merge --rebase --auto "${{ steps.create_pr_3_27.outputs.pull-request-number }}" + if: "steps.create_pr_3_27.outputs.pull-request-number" + env: + GH_TOKEN: "${{ secrets.RELEASE_TOKEN }}" + continue-on-error: true ... diff --git a/CHANGES/+non-https-syncs.bugfix b/CHANGES/+non-https-syncs.bugfix deleted file mode 100644 index bc1833da..00000000 --- a/CHANGES/+non-https-syncs.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fixed sync issue where non https URLs were not allowed. diff --git a/CHANGES/1000.removal b/CHANGES/1000.removal deleted file mode 100644 index b1a7ec60..00000000 --- a/CHANGES/1000.removal +++ /dev/null @@ -1 +0,0 @@ -Deprecated publications and added documentation for migrating off of them. diff --git a/lint_requirements.txt b/lint_requirements.txt index 3c2947a0..5c38ff60 100644 --- a/lint_requirements.txt +++ b/lint_requirements.txt @@ -5,7 +5,7 @@ # # For more info visit https://github.com/pulp/plugin_template -black==24.3.0 +black~=26.3 # Pin style to the year. https://black.readthedocs.io/en/stable/faq.html#how-stable-is-black-s-style bump-my-version check-manifest flake8 diff --git a/pulp_python/app/__init__.py b/pulp_python/app/__init__.py index 73c18931..46f4aa97 100644 --- a/pulp_python/app/__init__.py +++ b/pulp_python/app/__init__.py @@ -10,7 +10,7 @@ class PulpPythonPluginAppConfig(PulpPluginAppConfig): name = "pulp_python.app" label = "python" - version = "3.27.0.dev" + version = "3.28.0.dev" python_package_name = "pulp-python" domain_compatible = True diff --git a/pulp_python/app/global_access_conditions.py b/pulp_python/app/global_access_conditions.py index a2a5ee61..8abb14f1 100644 --- a/pulp_python/app/global_access_conditions.py +++ b/pulp_python/app/global_access_conditions.py @@ -1,6 +1,5 @@ from django.conf import settings - # Access Condition methods that can be used with PyPI access policies diff --git a/pulp_python/app/serializers.py b/pulp_python/app/serializers.py index f8d93322..6c716b9b 100644 --- a/pulp_python/app/serializers.py +++ b/pulp_python/app/serializers.py @@ -30,7 +30,6 @@ parse_project_metadata, ) - log = logging.getLogger(__name__) diff --git a/pulp_python/app/tasks/publish.py b/pulp_python/app/tasks/publish.py index 39102eb5..4e8a8038 100644 --- a/pulp_python/app/tasks/publish.py +++ b/pulp_python/app/tasks/publish.py @@ -12,7 +12,6 @@ from pulp_python.app.serializers import PythonPublicationSerializer from pulp_python.app.utils import write_simple_index, write_simple_detail - log = logging.getLogger(__name__) diff --git a/pulp_python/app/utils.py b/pulp_python/app/utils.py index 14385092..133a6a92 100644 --- a/pulp_python/app/utils.py +++ b/pulp_python/app/utils.py @@ -20,7 +20,6 @@ from pulpcore.plugin.exceptions import TimeoutException from pulpcore.plugin.util import get_domain - log = logging.getLogger(__name__) diff --git a/pulp_python/pytest_plugin.py b/pulp_python/pytest_plugin.py index 54db7caa..799a7a2a 100644 --- a/pulp_python/pytest_plugin.py +++ b/pulp_python/pytest_plugin.py @@ -13,7 +13,6 @@ PYTHON_WHEEL_FILENAME, ) - # Bindings API Fixtures diff --git a/pulp_python/tests/functional/api/test_domains.py b/pulp_python/tests/functional/api/test_domains.py index 46d6ae10..b67be1d5 100644 --- a/pulp_python/tests/functional/api/test_domains.py +++ b/pulp_python/tests/functional/api/test_domains.py @@ -12,7 +12,6 @@ ) from urllib.parse import urlsplit - pytestmark = pytest.mark.skipif(not settings.DOMAIN_ENABLED, reason="Domain not enabled") diff --git a/pulp_python/tests/functional/api/test_export_import.py b/pulp_python/tests/functional/api/test_export_import.py index 9681411b..8eb623ef 100644 --- a/pulp_python/tests/functional/api/test_export_import.py +++ b/pulp_python/tests/functional/api/test_export_import.py @@ -14,7 +14,6 @@ PYTHON_SM_PROJECT_SPECIFIER, ) - pytestmark = [ pytest.mark.skipif( "/tmp" not in settings.ALLOWED_EXPORT_PATHS, diff --git a/pulp_python/tests/functional/api/test_pypi_apis.py b/pulp_python/tests/functional/api/test_pypi_apis.py index 35d269ad..2cbdc87a 100644 --- a/pulp_python/tests/functional/api/test_pypi_apis.py +++ b/pulp_python/tests/functional/api/test_pypi_apis.py @@ -16,7 +16,6 @@ ) from pulp_python.tests.functional.utils import ensure_metadata - PYPI_LAST_SERIAL = "X-PYPI-LAST-SERIAL" diff --git a/pulp_python/tests/functional/constants.py b/pulp_python/tests/functional/constants.py index af5744b2..d1b54ac2 100644 --- a/pulp_python/tests/functional/constants.py +++ b/pulp_python/tests/functional/constants.py @@ -1,7 +1,6 @@ import os from urllib.parse import urljoin - PULP_FIXTURES_BASE_URL = os.environ.get( "REMOTE_FIXTURES_ORIGIN", "https://fixtures.pulpproject.org/" ) diff --git a/pyproject.toml b/pyproject.toml index 759ad698..f360f415 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,7 +7,7 @@ build-backend = 'setuptools.build_meta' [project] name = "pulp-python" -version = "3.27.0.dev" +version = "3.28.0.dev" description = "pulp-python plugin for the Pulp Project" readme = "README.md" authors = [ @@ -79,7 +79,7 @@ ignore = [ [tool.bumpversion] # This section is managed by the plugin template. Do not edit manually. -current_version = "3.27.0.dev" +current_version = "3.28.0.dev" commit = false tag = false parse = "(?P\\d+)\\.(?P\\d+)\\.(?P0a)?(?P\\d+)(\\.(?P[a-z]+))?" diff --git a/template_config.yml b/template_config.yml index f4856d3c..fdd1f914 100644 --- a/template_config.yml +++ b/template_config.yml @@ -27,7 +27,7 @@ extra_files: [] flake8: true flake8_ignore: [] github_org: "pulp" -latest_release_branch: "3.26" +latest_release_branch: "3.27" lint_requirements: true os_required_packages: [] parallel_test_workers: 8