From 6b9a035ddcf58c8979b1805335d685a675be5b77 Mon Sep 17 00:00:00 2001 From: pulpbot Date: Wed, 11 Dec 2024 17:32:20 +0000 Subject: [PATCH] Bump minor version --- .github/workflows/update_ci.yml | 14 +++++++------- CHANGES/+core_in_bindings_spec.feature | 1 - CHANGES/+created_resource_schema.bugfix | 1 - CHANGES/+task_error_schema.bugfix | 1 - CHANGES/1975.doc | 1 - CHANGES/3212.doc | 1 - CHANGES/5012.bugfix | 3 --- CHANGES/5725.bugfix | 4 ---- CHANGES/5937.bugfix | 2 -- CHANGES/6053.bugfix | 2 -- CHANGES/plugin_api/+expose-json-dict.misc | 7 ------- CHANGES/plugin_api/+squash_migrations.feature | 3 --- .../domain-get-create-serializer-mixin.bugfix | 1 - pulp_certguard/app/__init__.py | 2 +- pulp_file/app/__init__.py | 2 +- pulpcore/app/apps.py | 2 +- pyproject.toml | 4 ++-- template_config.yml | 2 +- 18 files changed, 13 insertions(+), 40 deletions(-) delete mode 100644 CHANGES/+core_in_bindings_spec.feature delete mode 100644 CHANGES/+created_resource_schema.bugfix delete mode 100644 CHANGES/+task_error_schema.bugfix delete mode 100644 CHANGES/1975.doc delete mode 100644 CHANGES/3212.doc delete mode 100644 CHANGES/5012.bugfix delete mode 100644 CHANGES/5725.bugfix delete mode 100644 CHANGES/5937.bugfix delete mode 100644 CHANGES/6053.bugfix delete mode 100644 CHANGES/plugin_api/+expose-json-dict.misc delete mode 100644 CHANGES/plugin_api/+squash_migrations.feature delete mode 100644 CHANGES/plugin_api/domain-get-create-serializer-mixin.bugfix diff --git a/.github/workflows/update_ci.yml b/.github/workflows/update_ci.yml index f8ce21e5a7..b278464eb0 100644 --- a/.github/workflows/update_ci.yml +++ b/.github/workflows/update_ci.yml @@ -233,7 +233,7 @@ jobs: with: fetch-depth: 0 path: "pulpcore" - ref: "3.68" + ref: "3.69" - name: "Run update" working-directory: "pulpcore" @@ -242,21 +242,21 @@ jobs: - name: "Create Pull Request for CI files" uses: "peter-evans/create-pull-request@v6" - id: "create_pr_3_68" + id: "create_pr_3_69" with: token: "${{ secrets.RELEASE_TOKEN }}" path: "pulpcore" committer: "pulpbot " author: "pulpbot " - title: "Update CI files for branch 3.68" - branch: "update-ci/3.68" - base: "3.68" + title: "Update CI files for branch 3.69" + branch: "update-ci/3.69" + base: "3.69" delete-branch: true - name: "Mark PR automerge" working-directory: "pulpcore" run: | - gh pr merge --rebase --auto "${{ steps.create_pr_3_68.outputs.pull-request-number }}" - if: "steps.create_pr_3_68.outputs.pull-request-number" + gh pr merge --rebase --auto "${{ steps.create_pr_3_69.outputs.pull-request-number }}" + if: "steps.create_pr_3_69.outputs.pull-request-number" env: GH_TOKEN: "${{ secrets.RELEASE_TOKEN }}" continue-on-error: true diff --git a/CHANGES/+core_in_bindings_spec.feature b/CHANGES/+core_in_bindings_spec.feature deleted file mode 100644 index 9a2b786fa8..0000000000 --- a/CHANGES/+core_in_bindings_spec.feature +++ /dev/null @@ -1 +0,0 @@ -Added core version to the bindings api spec even if core apis are not part of the spec. diff --git a/CHANGES/+created_resource_schema.bugfix b/CHANGES/+created_resource_schema.bugfix deleted file mode 100644 index 5a463a011d..0000000000 --- a/CHANGES/+created_resource_schema.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fixed the schema definition for created resources. diff --git a/CHANGES/+task_error_schema.bugfix b/CHANGES/+task_error_schema.bugfix deleted file mode 100644 index 2bbbcdc4a9..0000000000 --- a/CHANGES/+task_error_schema.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fixed the openapi schema definition of task error. diff --git a/CHANGES/1975.doc b/CHANGES/1975.doc deleted file mode 100644 index 4cc4d9b7d2..0000000000 --- a/CHANGES/1975.doc +++ /dev/null @@ -1 +0,0 @@ -Added docs about on-demand content limitations and caveats. diff --git a/CHANGES/3212.doc b/CHANGES/3212.doc deleted file mode 100644 index 4cc4d9b7d2..0000000000 --- a/CHANGES/3212.doc +++ /dev/null @@ -1 +0,0 @@ -Added docs about on-demand content limitations and caveats. diff --git a/CHANGES/5012.bugfix b/CHANGES/5012.bugfix deleted file mode 100644 index 199235e30e..0000000000 --- a/CHANGES/5012.bugfix +++ /dev/null @@ -1,3 +0,0 @@ -Fixed content-app behavior for the case where the client would get a 200 response for a package -streamed from a Remote which did not match the expected checksum. -Now, the connection is closed before finalizing the response. diff --git a/CHANGES/5725.bugfix b/CHANGES/5725.bugfix deleted file mode 100644 index 136e7ff2c9..0000000000 --- a/CHANGES/5725.bugfix +++ /dev/null @@ -1,4 +0,0 @@ -On a request for on-demand content in the content app, a corrupted Remote that -contains the wrong binary (for that content) prevented other Remotes from being -attempted on future requests. Now the last failed Remotes are temporarily ignored -and others may be picked. diff --git a/CHANGES/5937.bugfix b/CHANGES/5937.bugfix deleted file mode 100644 index b733ba80e9..0000000000 --- a/CHANGES/5937.bugfix +++ /dev/null @@ -1,2 +0,0 @@ -Disable retry logic on the context of content-app on-demand streaming, as we can't recover -from any errors after starting the streaming process (chunked transfer). diff --git a/CHANGES/6053.bugfix b/CHANGES/6053.bugfix deleted file mode 100644 index 2dd7fb3483..0000000000 --- a/CHANGES/6053.bugfix +++ /dev/null @@ -1,2 +0,0 @@ -Allowed to bind api and content workers to multiple addresses. -You can specify `--bind` multiple times on the `pulpcore-{api,content}` entrypoints. diff --git a/CHANGES/plugin_api/+expose-json-dict.misc b/CHANGES/plugin_api/+expose-json-dict.misc deleted file mode 100644 index f605ce992f..0000000000 --- a/CHANGES/plugin_api/+expose-json-dict.misc +++ /dev/null @@ -1,7 +0,0 @@ -Exposed JSONDictField and JSONListField on the plugin API. - -DRF serializers.JSONField can be any json entity, but we want more precise types -for better schema/bindings representation. New fields that are supposed to be dict -or list structures should use the new JSONDictField or JSONListField field. - -Some context: diff --git a/CHANGES/plugin_api/+squash_migrations.feature b/CHANGES/plugin_api/+squash_migrations.feature deleted file mode 100644 index fbc4e8717c..0000000000 --- a/CHANGES/plugin_api/+squash_migrations.feature +++ /dev/null @@ -1,3 +0,0 @@ -Pulpcore migrations have been squashed. -In order to allow removing the old ones, plugins should rebase their migrations on at least the 0091 migration of core. -The `pulpcore-manager rebasemigrations` command will hep with that. diff --git a/CHANGES/plugin_api/domain-get-create-serializer-mixin.bugfix b/CHANGES/plugin_api/domain-get-create-serializer-mixin.bugfix deleted file mode 100644 index 43a8c62c84..0000000000 --- a/CHANGES/plugin_api/domain-get-create-serializer-mixin.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fixed `GetOrCreateSerializerMixin` not accepting pulp_domain for the natural key creation. diff --git a/pulp_certguard/app/__init__.py b/pulp_certguard/app/__init__.py index b7dc5ef5f3..acec3c3a1b 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.69.0.dev" + version = "3.70.0.dev" python_package_name = "pulpcore" domain_compatible = True diff --git a/pulp_file/app/__init__.py b/pulp_file/app/__init__.py index d03685c1d2..5053ad39c2 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.69.0.dev" + version = "3.70.0.dev" python_package_name = "pulpcore" domain_compatible = True diff --git a/pulpcore/app/apps.py b/pulpcore/app/apps.py index e3cbaa4f79..78572f3b36 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.69.0.dev" + version = "3.70.0.dev" # The python package name providing this app python_package_name = "pulpcore" diff --git a/pyproject.toml b/pyproject.toml index 1219a5d0ce..a782c1292d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,7 +7,7 @@ build-backend = 'setuptools.build_meta' [project] name = "pulpcore" -version = "3.69.0.dev" +version = "3.70.0.dev" description = "Pulp Django Application and Related Modules" readme = "README.md" authors = [ @@ -206,7 +206,7 @@ ignore = [ [tool.bumpversion] # This section is managed by the plugin template. Do not edit manually. -current_version = "3.69.0.dev" +current_version = "3.70.0.dev" commit = false tag = false parse = "(?P\\d+)\\.(?P\\d+)\\.(?P0a)?(?P\\d+)(\\.(?P[a-z]+))?" diff --git a/template_config.yml b/template_config.yml index fdc877497d..38fc7ddbf9 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.68' +latest_release_branch: '3.69' lint_requirements: true os_required_packages: [] parallel_test_workers: 8