Skip to content
Draft
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
2 changes: 2 additions & 0 deletions .ci/assets/ci_constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,5 @@ azure-storage-blob!=12.28.*
# Apparently does not work with current azurite.


pycares<5
# older aiodns versions don't pin pycares UB, and are broken by pycares>=5
3 changes: 2 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ jobs:
- uses: "actions/checkout@v6"
with:
fetch-depth: 1
repository: "pulp/pulp-openapi-generator"
repository: "jobselko/pulp-openapi-generator"
ref: "129"
path: "pulp-openapi-generator"
- uses: "actions/setup-python@v6"
with:
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/scripts/script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ source .github/workflows/scripts/utils.sh

export POST_SCRIPT=$PWD/.github/workflows/scripts/post_script.sh
export FUNC_TEST_SCRIPT=$PWD/.github/workflows/scripts/func_test_script.sh
# export OPENAPI_PYTHON_IMAGE="docker.io/openapitools/openapi-generator-cli:v7.14.0"

# Needed for starting the service
# Gets set in .github/settings.yml, but doesn't seem to inherited by
Expand Down Expand Up @@ -53,7 +54,7 @@ pushd ../pulp-openapi-generator
# reliable client.
if [ "$TEST" = "pulp" ]
then
BUILT_CLIENTS=" core file certguard "
BUILT_CLIENTS=""
else
BUILT_CLIENTS=""
fi
Expand Down Expand Up @@ -175,7 +176,7 @@ then
pip install -r test_requirements.txt
pytest -v tests -m "pulpcore or pulp_file or pulp_certguard"
else
PULP_CA_BUNDLE="/usr/local/share/ca-certificates/pulp_webserver.crt" make livetest
PULP_CA_BUNDLE="/usr/local/share/ca-certificates/pulp_webserver.crt" make livetest PYTEST_MARK="live and (pulpcore or pulp_file or pulp_certguard)"
fi
popd

Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ jobs:
- uses: "actions/checkout@v6"
with:
fetch-depth: 1
repository: "pulp/pulp-openapi-generator"
repository: "jobselko/pulp-openapi-generator"
ref: "129"
path: "pulp-openapi-generator"

- uses: "actions/setup-python@v6"
Expand Down
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.113"
ref: "3.114"

- 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_113"
id: "create_pr_3_114"
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.113"
branch: "update-ci/3.113"
base: "3.113"
title: "Update CI files for branch 3.114"
branch: "update-ci/3.114"
base: "3.114"
delete-branch: true
- name: "Mark PR automerge"
working-directory: "pulpcore"
run: |
gh pr merge --rebase --auto "${{ steps.create_pr_3_113.outputs.pull-request-number }}"
if: "steps.create_pr_3_113.outputs.pull-request-number"
gh pr merge --rebase --auto "${{ steps.create_pr_3_114.outputs.pull-request-number }}"
if: "steps.create_pr_3_114.outputs.pull-request-number"
env:
GH_TOKEN: "${{ secrets.RELEASE_TOKEN }}"
continue-on-error: true
Expand Down
1 change: 0 additions & 1 deletion CHANGES/+optimize_resync.feature

This file was deleted.

1 change: 0 additions & 1 deletion CHANGES/+respect-etc-hosts.bugfix

This file was deleted.

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

This file was deleted.

1 change: 0 additions & 1 deletion CHANGES/plugin_api/+optimize_resync.feature

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.114.0.dev"
version = "3.115.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.114.0.dev"
version = "3.115.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.114.0.dev"
version = "3.115.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.114.0.dev"
version = "3.115.0.dev"
description = "Pulp Django Application and Related Modules"
readme = "README.md"
authors = [
Expand Down Expand Up @@ -206,7 +206,7 @@ ignore = [
[tool.bumpversion]
# This section is managed by the plugin template. Do not edit manually.

current_version = "3.114.0.dev"
current_version = "3.115.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 @@ -25,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.113"
latest_release_branch: "3.114"
lint_ignore:
- "./pulpcore/app/protobuf/*"
lint_requirements: true
Expand Down