From 3531c2e4aec8572b6cd32d2192611e84a7de57bf Mon Sep 17 00:00:00 2001 From: pulpbot Date: Thu, 3 Oct 2024 15:34:58 +0000 Subject: [PATCH] Bump minor version --- .bumpversion.cfg | 2 +- .github/workflows/update_ci.yml | 8 ++++---- CHANGES/5817.bugfix | 1 - CHANGES/5833.feature | 1 - CHANGES/5844.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 | 2 +- 10 files changed, 10 insertions(+), 13 deletions(-) delete mode 100644 CHANGES/5817.bugfix delete mode 100644 CHANGES/5833.feature delete mode 100644 CHANGES/5844.feature diff --git a/.bumpversion.cfg b/.bumpversion.cfg index f7d44aa7c9..47765d06c8 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 3.64.0.dev +current_version = 3.65.0.dev commit = False tag = False parse = (?P\d+)\.(?P\d+)\.(?P\d+)(\.(?P[a-z]+))? diff --git a/.github/workflows/update_ci.yml b/.github/workflows/update_ci.yml index d7fe13c955..a9323fcbf2 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.63" + ref: "3.64" - name: "Run update" working-directory: "pulpcore" @@ -83,9 +83,9 @@ jobs: path: "pulpcore" committer: "pulpbot " author: "pulpbot " - title: "Update CI files for branch 3.63" - branch: "update-ci/3.63" - base: "3.63" + title: "Update CI files for branch 3.64" + branch: "update-ci/3.64" + base: "3.64" delete-branch: true - uses: "actions/checkout@v4" with: diff --git a/CHANGES/5817.bugfix b/CHANGES/5817.bugfix deleted file mode 100644 index d313546db7..0000000000 --- a/CHANGES/5817.bugfix +++ /dev/null @@ -1 +0,0 @@ -Started collecting artifact size metrics even after caching the served content. diff --git a/CHANGES/5833.feature b/CHANGES/5833.feature deleted file mode 100644 index ae5175a505..0000000000 --- a/CHANGES/5833.feature +++ /dev/null @@ -1 +0,0 @@ -Started using an upstream version of the OpenTelemetry aiohttp server instrumentation. diff --git a/CHANGES/5844.feature b/CHANGES/5844.feature deleted file mode 100644 index 0585747f54..0000000000 --- a/CHANGES/5844.feature +++ /dev/null @@ -1 +0,0 @@ -Included the worker's name in the ``http.server.duration`` OpenTelemetry metric attributes. diff --git a/pulp_certguard/app/__init__.py b/pulp_certguard/app/__init__.py index 83e73e078c..5c57878607 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.64.0.dev" + version = "3.65.0.dev" python_package_name = "pulpcore" domain_compatible = True diff --git a/pulp_file/app/__init__.py b/pulp_file/app/__init__.py index 4dd855b765..d463702f54 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.64.0.dev" + version = "3.65.0.dev" python_package_name = "pulpcore" domain_compatible = True diff --git a/pulpcore/app/apps.py b/pulpcore/app/apps.py index 11acfd7cd2..b0d5a1c637 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.64.0.dev" + version = "3.65.0.dev" # The python package name providing this app python_package_name = "pulpcore" diff --git a/setup.py b/setup.py index 9448e97b97..e6a0a9a3ca 100644 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ setup( name="pulpcore", - version="3.64.0.dev", + version="3.65.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 1b5bb46574..1101d81e1a 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.63' +latest_release_branch: '3.64' lint_requirements: true os_required_packages: [] parallel_test_workers: 8