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
4 changes: 4 additions & 0 deletions .ci/assets/ci_constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,7 @@ azure-storage-blob!=12.28.*

pycares<5
# older aiodns versions don't pin pycares UB, and are broken by pycares>=5


pytest-django!=4.13.0
# This version seems not to not have a proper requirement on Django.
14 changes: 7 additions & 7 deletions .github/workflows/update_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ jobs:
with:
fetch-depth: 0
path: "pulpcore"
ref: "3.115"
ref: "3.116"

- name: "Run update"
working-directory: "pulpcore"
Expand All @@ -116,21 +116,21 @@ jobs:

- name: "Create Pull Request for CI files"
uses: "peter-evans/create-pull-request@v8"
id: "create_pr_3_115"
id: "create_pr_3_116"
with:
token: "${{ secrets.RELEASE_TOKEN }}"
path: "pulpcore"
committer: "pulpbot <pulp-infra@redhat.com>"
author: "pulpbot <pulp-infra@redhat.com>"
title: "Update CI files for branch 3.115"
branch: "update-ci/3.115"
base: "3.115"
title: "Update CI files for branch 3.116"
branch: "update-ci/3.116"
base: "3.116"
delete-branch: true
- name: "Mark PR automerge"
working-directory: "pulpcore"
run: |
gh pr merge --rebase --auto "${{ steps.create_pr_3_115.outputs.pull-request-number }}"
if: "steps.create_pr_3_115.outputs.pull-request-number"
gh pr merge --rebase --auto "${{ steps.create_pr_3_116.outputs.pull-request-number }}"
if: "steps.create_pr_3_116.outputs.pull-request-number"
env:
GH_TOKEN: "${{ secrets.RELEASE_TOKEN }}"
continue-on-error: true
Expand Down
1 change: 0 additions & 1 deletion CHANGES/+header-too-large.bugfix

This file was deleted.

1 change: 0 additions & 1 deletion CHANGES/+redis-worker-startup-poll.bugfix

This file was deleted.

1 change: 0 additions & 1 deletion CHANGES/3322.bugfix

This file was deleted.

1 change: 0 additions & 1 deletion CHANGES/7479.feature

This file was deleted.

1 change: 0 additions & 1 deletion CHANGES/7846.bugfix

This file was deleted.

1 change: 0 additions & 1 deletion CHANGES/7896.bugfix

This file was deleted.

1 change: 0 additions & 1 deletion CHANGES/7898.bugfix

This file was deleted.

1 change: 0 additions & 1 deletion CHANGES/7902.bugfix

This file was deleted.

1 change: 0 additions & 1 deletion CHANGES/7938.bugfix

This file was deleted.

2 changes: 1 addition & 1 deletion pulp_certguard/app/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ class PulpCertGuardPluginAppConfig(PulpPluginAppConfig):

name = "pulp_certguard.app"
label = "certguard"
version = "3.116.0.dev"
version = "3.117.0.dev"
python_package_name = "pulpcore"
domain_compatible = True
2 changes: 1 addition & 1 deletion pulp_file/app/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ class PulpFilePluginAppConfig(PulpPluginAppConfig):

name = "pulp_file.app"
label = "file"
version = "3.116.0.dev"
version = "3.117.0.dev"
python_package_name = "pulpcore"
domain_compatible = True
2 changes: 1 addition & 1 deletion pulpcore/app/apps.py
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ class PulpAppConfig(PulpPluginAppConfig):
label = "core"

# The version of this app
version = "3.116.0.dev"
version = "3.117.0.dev"

# The python package name providing this app
python_package_name = "pulpcore"
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 = "pulpcore"
version = "3.116.0.dev"
version = "3.117.0.dev"
description = "Pulp Django Application and Related Modules"
readme = "README.md"
authors = [
Expand Down Expand Up @@ -207,7 +207,7 @@ ignore = [
[tool.bumpversion]
# This section is managed by the plugin template. Do not edit manually.

current_version = "3.116.0.dev"
current_version = "3.117.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
5 changes: 1 addition & 4 deletions template_config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@
# After editing this file please always reapply the plugin template before committing any changes.

---
# NOTE: the S3 runner has redis disabled, domains enabled, and hide_guarded_distributions = true
# "weird" test failures unique to that runner may be due to those differences.

check_commit_message: true
check_manifest: true
check_stray_pulpcore_imports: false
Expand All @@ -28,7 +25,7 @@ extra_files:
- destination: "/etc/nginx/pulp/api_root_rewrite.conf"
origin: "pulpcore/pulpcore/tests/functional/assets/api_root_rewrite.conf"
github_org: "pulp"
latest_release_branch: "3.115"
latest_release_branch: "3.116"
lint_ignore:
- "./pulpcore/app/protobuf/*"
lint_requirements: true
Expand Down
Loading