From c5cbdcee0506663f2fd90050992a6b68e40bf565 Mon Sep 17 00:00:00 2001 From: pulpbot Date: Wed, 6 Nov 2024 13:55:53 +0000 Subject: [PATCH] Bump minor version --- .bumpversion.cfg | 2 +- .github/template_gitref | 2 +- .github/workflows/update_ci.yml | 8 ++++---- CHANGES/+fix-any-type.bugfix | 2 -- CHANGES/5834.doc | 1 - CHANGES/5882.feature | 2 -- CHANGES/5911.bugfix | 1 - CHANGES/5934.bugfix | 1 - CHANGES/5943.feature | 3 --- CHANGES/plugin_api/5822.removal | 1 - CHANGES/plugin_api/5912.bugfix | 1 - pulp_certguard/app/__init__.py | 2 +- pulp_file/app/__init__.py | 2 +- pulpcore/app/apps.py | 2 +- releasing.md | 14 ++++++++------ setup.py | 2 +- template_config.yml | 6 +++--- 17 files changed, 21 insertions(+), 31 deletions(-) delete mode 100644 CHANGES/+fix-any-type.bugfix delete mode 100644 CHANGES/5834.doc delete mode 100644 CHANGES/5882.feature delete mode 100644 CHANGES/5911.bugfix delete mode 100644 CHANGES/5934.bugfix delete mode 100644 CHANGES/5943.feature delete mode 100644 CHANGES/plugin_api/5822.removal delete mode 100644 CHANGES/plugin_api/5912.bugfix diff --git a/.bumpversion.cfg b/.bumpversion.cfg index d1cfe00f25..bb19753213 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 3.67.0.dev +current_version = 3.68.0.dev commit = False tag = False parse = (?P\d+)\.(?P\d+)\.(?P\d+)(\.(?P[a-z]+))? diff --git a/.github/template_gitref b/.github/template_gitref index 77b8478b45..3546645658 100644 --- a/.github/template_gitref +++ b/.github/template_gitref @@ -1 +1 @@ -2021.08.26-388-g624de1a +unknown diff --git a/.github/workflows/update_ci.yml b/.github/workflows/update_ci.yml index f599ca6f41..0bf54debf4 100644 --- a/.github/workflows/update_ci.yml +++ b/.github/workflows/update_ci.yml @@ -69,7 +69,7 @@ jobs: with: fetch-depth: 0 path: "pulpcore" - ref: "3.66" + ref: "3.67" - name: "Run update" working-directory: "pulpcore" @@ -83,9 +83,9 @@ jobs: path: "pulpcore" committer: "pulpbot " author: "pulpbot " - title: "Update CI files for branch 3.66" - branch: "update-ci/3.66" - base: "3.66" + title: "Update CI files for branch 3.67" + branch: "update-ci/3.67" + base: "3.67" delete-branch: true - uses: "actions/checkout@v4" with: diff --git a/CHANGES/+fix-any-type.bugfix b/CHANGES/+fix-any-type.bugfix deleted file mode 100644 index 89ea25f511..0000000000 --- a/CHANGES/+fix-any-type.bugfix +++ /dev/null @@ -1,2 +0,0 @@ -Fixed the JSONField specification so it doesn't break ruby bindings. -See context [here](https://github.com/pulp/pulp_rpm/issues/3639). diff --git a/CHANGES/5834.doc b/CHANGES/5834.doc deleted file mode 100644 index ecb3669893..0000000000 --- a/CHANGES/5834.doc +++ /dev/null @@ -1 +0,0 @@ -Fixed pulpcore code-api generated docs, which was not using the right mkdocstring directives yet. diff --git a/CHANGES/5882.feature b/CHANGES/5882.feature deleted file mode 100644 index 42dd4d5638..0000000000 --- a/CHANGES/5882.feature +++ /dev/null @@ -1,2 +0,0 @@ -Added `DefaultAccessPolicy` that will always use the default policy declared on the views. -Added `AccessPolicyFromSettings` that will read policies from the `ACCESS_POLICIES` setting first. diff --git a/CHANGES/5911.bugfix b/CHANGES/5911.bugfix deleted file mode 100644 index 62612a6481..0000000000 --- a/CHANGES/5911.bugfix +++ /dev/null @@ -1 +0,0 @@ -pass envvars to Signing Scripts to access GNUPGHOME diff --git a/CHANGES/5934.bugfix b/CHANGES/5934.bugfix deleted file mode 100644 index 3c71e491de..0000000000 --- a/CHANGES/5934.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fixed repository modify allowing content from separate domains. diff --git a/CHANGES/5943.feature b/CHANGES/5943.feature deleted file mode 100644 index 79cd9b4608..0000000000 --- a/CHANGES/5943.feature +++ /dev/null @@ -1,3 +0,0 @@ -Replaced built-in opentelemetry metrics with custom middlewares. Additionally, introduced a new -setting `OTEL_ENABLED` that toggles the opentelemetry instrumentation on and off. It defaults to -`False`. diff --git a/CHANGES/plugin_api/5822.removal b/CHANGES/plugin_api/5822.removal deleted file mode 100644 index c18ac52c00..0000000000 --- a/CHANGES/plugin_api/5822.removal +++ /dev/null @@ -1 +0,0 @@ -Deprecated `AccessPolicyFromDB` for removal in 4.0. diff --git a/CHANGES/plugin_api/5912.bugfix b/CHANGES/plugin_api/5912.bugfix deleted file mode 100644 index 42cd05d5ad..0000000000 --- a/CHANGES/plugin_api/5912.bugfix +++ /dev/null @@ -1 +0,0 @@ -Downloaders now always ensure the download ends up under `WORKING_DIRECTORY`. diff --git a/pulp_certguard/app/__init__.py b/pulp_certguard/app/__init__.py index 556cbb59eb..fd2e774c83 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.67.0.dev" + version = "3.68.0.dev" python_package_name = "pulpcore" domain_compatible = True diff --git a/pulp_file/app/__init__.py b/pulp_file/app/__init__.py index f7258e6f33..7f4a63551f 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.67.0.dev" + version = "3.68.0.dev" python_package_name = "pulpcore" domain_compatible = True diff --git a/pulpcore/app/apps.py b/pulpcore/app/apps.py index 98ac6eec90..2d9f70ac61 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.67.0.dev" + version = "3.68.0.dev" # The python package name providing this app python_package_name = "pulpcore" diff --git a/releasing.md b/releasing.md index b1d93e889d..03a69b84b3 100644 --- a/releasing.md +++ b/releasing.md @@ -9,19 +9,21 @@ This document outlines the steps to perform a release. ### Determine if a Release is Required +- Make sure to have GitPython python package installed - Run the release checker script: ``` python3 .ci/scripts/check_release.py ``` -### Create a New Y-branch (e.g., 3.23) -- If a new minor version (Y) is needed, trigger a [Create New Release Branch](https://github.com/pulp/pulpcore/actions/workflows/create-branch.yml) job via the GitHub Actions. +### Release a New Y-version (e.g., 3.23.0) +- If a new minor version (Y) is needed, trigger a [Create New Release Branch](https://github.com/pulp/pulpcore/actions/workflows/create-branch.yml) job from the main branch via the GitHub Actions. - Look for the "Bump minor version" pull request and merge it. +- Trigger a [Release Pipeline](https://github.com/pulp/pulpcore/actions/workflows/release.yml) job by specifying the new release branch (X.**Y**) via the GitHub Actions. ### Release a New Z-version (Patch Release) (e.g., 3.23.1, 3.22.12) - Trigger a [Release Pipeline](https://github.com/pulp/pulpcore/actions/workflows/release.yml) job by specifying the release branch (X.Y) via the GitHub Actions. -### Final Steps (Optional but Recommended) -- Ensure the new version appears on PyPI. -- Verify that the changelog has been updated by looking for the "Update Changelog" pull request. -- Post a brief announcement about the new release on the [Pulp Discourse](https://discourse.pulpproject.org/). +## Final Steps +- Ensure the new version appears on PyPI (it should appear after [Publish Release](https://github.com/pulp/pulpcore/actions/workflows/publish.yml) workflow succeeds). +- Verify that the changelog has been updated by looking for the "Update Changelog" pull request (A new PR should be available on the next day). +- [optional] Post a brief announcement about the new release on the [Pulp Discourse](https://discourse.pulpproject.org/). diff --git a/setup.py b/setup.py index 95347f85f5..87be108814 100644 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ setup( name="pulpcore", - version="3.67.0.dev", + version="3.68.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 0ee074ea2c..26d010b57b 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.66' +latest_release_branch: '3.67' lint_requirements: true os_required_packages: [] parallel_test_workers: 8 @@ -61,7 +61,7 @@ pulp_settings_azure: api_root_rewrite_header: X-API-Root domain_enabled: true rest_framework__default_permission_classes: - - "pulpcore.plugin.access_policy.DefaultAccessPolicy" + - pulpcore.plugin.access_policy.DefaultAccessPolicy pulp_settings_gcp: null pulp_settings_s3: DISABLED_authentication_backends: '@merge django.contrib.auth.backends.RemoteUserBackend' @@ -79,7 +79,7 @@ pulp_settings_s3: domain_enabled: true hide_guarded_distributions: true rest_framework__default_permission_classes: - - "pulpcore.plugin.access_policy.AccessPolicyFromSettings" + - pulpcore.plugin.access_policy.AccessPolicyFromSettings pydocstyle: true release_email: pulp-infra@redhat.com release_user: pulpbot