Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .ci/scripts/check_release.py
Original file line number Diff line number Diff line change
Expand Up @@ -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":
Expand Down
1 change: 0 additions & 1 deletion .ci/scripts/check_requirements.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
import warnings
from packaging.requirements import Requirement


CHECK_MATRIX = [
("pyproject.toml", True, True, True),
("requirements.txt", True, True, True),
Expand Down
1 change: 0 additions & 1 deletion .ci/scripts/collect_changes.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
from git import GitCommandError, Repo
from packaging.version import parse as parse_version


PYPI_PROJECT = "pulp_python"

# Read Towncrier settings
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
31 changes: 31 additions & 0 deletions .github/workflows/update_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 <pulp-infra@redhat.com>"
author: "pulpbot <pulp-infra@redhat.com>"
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
...
1 change: 0 additions & 1 deletion CHANGES/+non-https-syncs.bugfix

This file was deleted.

1 change: 0 additions & 1 deletion CHANGES/1000.removal

This file was deleted.

2 changes: 1 addition & 1 deletion lint_requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pulp_python/app/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 0 additions & 1 deletion pulp_python/app/global_access_conditions.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
from django.conf import settings


# Access Condition methods that can be used with PyPI access policies


Expand Down
1 change: 0 additions & 1 deletion pulp_python/app/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
parse_project_metadata,
)


log = logging.getLogger(__name__)


Expand Down
1 change: 0 additions & 1 deletion pulp_python/app/tasks/publish.py
Original file line number Diff line number Diff line change
Expand Up @@ -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__)


Expand Down
1 change: 0 additions & 1 deletion pulp_python/app/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
from pulpcore.plugin.exceptions import TimeoutException
from pulpcore.plugin.util import get_domain


log = logging.getLogger(__name__)


Expand Down
1 change: 0 additions & 1 deletion pulp_python/pytest_plugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
PYTHON_WHEEL_FILENAME,
)


# Bindings API Fixtures


Expand Down
1 change: 0 additions & 1 deletion pulp_python/tests/functional/api/test_domains.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
)
from urllib.parse import urlsplit


pytestmark = pytest.mark.skipif(not settings.DOMAIN_ENABLED, reason="Domain not enabled")


Expand Down
1 change: 0 additions & 1 deletion pulp_python/tests/functional/api/test_export_import.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
PYTHON_SM_PROJECT_SPECIFIER,
)


pytestmark = [
pytest.mark.skipif(
"/tmp" not in settings.ALLOWED_EXPORT_PATHS,
Expand Down
1 change: 0 additions & 1 deletion pulp_python/tests/functional/api/test_pypi_apis.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
)
from pulp_python.tests.functional.utils import ensure_metadata


PYPI_LAST_SERIAL = "X-PYPI-LAST-SERIAL"


Expand Down
1 change: 0 additions & 1 deletion pulp_python/tests/functional/constants.py
Original file line number Diff line number Diff line change
@@ -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/"
)
Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down Expand Up @@ -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<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<alpha>0a)?(?P<patch>\\d+)(\\.(?P<release>[a-z]+))?"
Expand Down
2 changes: 1 addition & 1 deletion template_config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading