From 58504809fe6f7c7802dddb74d4235feac5423191 Mon Sep 17 00:00:00 2001 From: pulpbot Date: Tue, 10 Sep 2024 14:22:28 +0000 Subject: [PATCH] Bump minor version [noissue] --- .bumpversion.cfg | 2 +- .ci/ansible/Containerfile.j2 | 3 ++- .github/template_gitref | 2 +- .github/workflows/scripts/install.sh | 2 +- .github/workflows/update_ci.yml | 8 ++++---- CHANGES/4602.feature | 1 - CHANGES/5693.feature | 1 - pulp_certguard/app/__init__.py | 2 +- pulp_file/app/__init__.py | 2 +- pulpcore/app/apps.py | 2 +- setup.py | 2 +- template_config.yml | 4 ++-- 12 files changed, 15 insertions(+), 16 deletions(-) delete mode 100644 CHANGES/4602.feature delete mode 100644 CHANGES/5693.feature diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 8e2a53447a..cef75560e7 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 3.60.0.dev +current_version = 3.61.0.dev commit = False tag = False parse = (?P\d+)\.(?P\d+)\.(?P\d+)(\.(?P[a-z]+))? diff --git a/.ci/ansible/Containerfile.j2 b/.ci/ansible/Containerfile.j2 index afe0b118d7..360c1c6a60 100644 --- a/.ci/ansible/Containerfile.j2 +++ b/.ci/ansible/Containerfile.j2 @@ -9,9 +9,10 @@ ADD ./{{ item.name }} ./{{ item.name }} # S3 botocore needs to be patched to handle responses from minio during 0-byte uploads # Hacking botocore (https://github.com/boto/botocore/pull/1990) +# This MUST be the ONLY call to pip install in inside the container. RUN pip3 install --upgrade pip setuptools wheel && \ rm -rf /root/.cache/pip && \ - pip3 install + pip3 install pipdeptree {%- if s3_test | default(false) -%} {{ " " }}git+https://github.com/gerrod3/botocore.git@fix-100-continue {%- endif -%} diff --git a/.github/template_gitref b/.github/template_gitref index 3e3784896c..3546645658 100644 --- a/.github/template_gitref +++ b/.github/template_gitref @@ -1 +1 @@ -2021.08.26-379-gece49c9 +unknown diff --git a/.github/workflows/scripts/install.sh b/.github/workflows/scripts/install.sh index 339fbc5365..c58d691375 100755 --- a/.github/workflows/scripts/install.sh +++ b/.github/workflows/scripts/install.sh @@ -166,5 +166,5 @@ if [[ "$TEST" = "azure" ]]; then fi echo ::group::PIP_LIST -cmd_prefix bash -c "pip3 list && pip3 install pipdeptree && pipdeptree" +cmd_prefix bash -c "pip3 list && pipdeptree" echo ::endgroup:: diff --git a/.github/workflows/update_ci.yml b/.github/workflows/update_ci.yml index 29b3ef8c35..233808074f 100644 --- a/.github/workflows/update_ci.yml +++ b/.github/workflows/update_ci.yml @@ -74,7 +74,7 @@ jobs: with: fetch-depth: 0 path: "pulpcore" - ref: "3.59" + ref: "3.60" - name: "Run update" working-directory: "pulpcore" @@ -88,10 +88,10 @@ jobs: path: "pulpcore" committer: "pulpbot " author: "pulpbot " - title: "Update CI files for branch 3.59" + title: "Update CI files for branch 3.60" body: "" - branch: "update-ci/3.59" - base: "3.59" + branch: "update-ci/3.60" + base: "3.60" commit-message: | Update CI files diff --git a/CHANGES/4602.feature b/CHANGES/4602.feature deleted file mode 100644 index 1ec5d1c88e..0000000000 --- a/CHANGES/4602.feature +++ /dev/null @@ -1 +0,0 @@ -Added metrics reporting the size of served artifacts. diff --git a/CHANGES/5693.feature b/CHANGES/5693.feature deleted file mode 100644 index 70ec60012d..0000000000 --- a/CHANGES/5693.feature +++ /dev/null @@ -1 +0,0 @@ -Pulp-workers now also log domain name in which the task is executed. diff --git a/pulp_certguard/app/__init__.py b/pulp_certguard/app/__init__.py index ecf0a48179..a33bae7984 100644 --- a/pulp_certguard/app/__init__.py +++ b/pulp_certguard/app/__init__.py @@ -6,6 +6,6 @@ class PulpCertGuardPluginAppConfig(PulpPluginAppConfig): name = "pulp_certguard.app" label = "certguard" - version = "3.60.0.dev" + version = "3.61.0.dev" python_package_name = "pulpcore" domain_compatible = True diff --git a/pulp_file/app/__init__.py b/pulp_file/app/__init__.py index 16a10bf46d..db2ca9292e 100644 --- a/pulp_file/app/__init__.py +++ b/pulp_file/app/__init__.py @@ -8,6 +8,6 @@ class PulpFilePluginAppConfig(PulpPluginAppConfig): name = "pulp_file.app" label = "file" - version = "3.60.0.dev" + version = "3.61.0.dev" python_package_name = "pulpcore" domain_compatible = True diff --git a/pulpcore/app/apps.py b/pulpcore/app/apps.py index 32700023ab..fb54f07985 100644 --- a/pulpcore/app/apps.py +++ b/pulpcore/app/apps.py @@ -239,7 +239,7 @@ class PulpAppConfig(PulpPluginAppConfig): label = "core" # The version of this app - version = "3.60.0.dev" + version = "3.61.0.dev" # The python package name providing this app python_package_name = "pulpcore" diff --git a/setup.py b/setup.py index 3063d23f0f..93e4853327 100644 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ setup( name="pulpcore", - version="3.60.0.dev", + version="3.61.0.dev", description="Pulp Django Application and Related Modules", long_description=long_description, long_description_content_type="text/markdown", diff --git a/template_config.yml b/template_config.yml index 18a215e243..3ce478e7a0 100644 --- a/template_config.yml +++ b/template_config.yml @@ -25,7 +25,7 @@ flake8: true flake8_ignore: - ./pulpcore/app/protobuf/* github_org: pulp -latest_release_branch: '3.59' +latest_release_branch: '3.60' lint_requirements: true noissue_marker: '[noissue]' os_required_packages: [] @@ -78,9 +78,9 @@ pulp_settings_s3: api.console: grant_access_to_pulp tokenUrl: https://your-identity-provider/token/issuer type: oauth2 + DISABLED_rest_framework__default_authentication_classes: '@merge pulpcore.app.authentication.JSONHeaderRemoteAuthentication' domain_enabled: true hide_guarded_distributions: true - DISABLED_rest_framework__default_authentication_classes: '@merge pulpcore.app.authentication.JSONHeaderRemoteAuthentication' pydocstyle: true release_email: pulp-infra@redhat.com release_user: pulpbot