From f90ba0b55280118d6a8358a962b29287ce1c27db Mon Sep 17 00:00:00 2001 From: pulpbot Date: Tue, 12 Sep 2023 16:14:20 +0000 Subject: [PATCH] Bump minor version [noissue] --- .bumpversion.cfg | 2 +- .github/workflows/update_ci.yml | 8 ++++---- CHANGES/4368.bugfix | 1 - CHANGES/4372.bugfix | 2 -- CHANGES/plugin_api/3332.feature | 3 --- CHANGES/plugin_api/3401.feature | 2 -- docs/conf.py | 4 ++-- pulpcore/app/apps.py | 2 +- setup.py | 2 +- template_config.yml | 6 +++--- 10 files changed, 12 insertions(+), 20 deletions(-) delete mode 100644 CHANGES/4368.bugfix delete mode 100644 CHANGES/4372.bugfix delete mode 100644 CHANGES/plugin_api/3332.feature delete mode 100644 CHANGES/plugin_api/3401.feature diff --git a/.bumpversion.cfg b/.bumpversion.cfg index cf05556ef8..c319ebc8d6 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 3.34.0.dev +current_version = 3.35.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 ac32fa7973..eb0809595a 100644 --- a/.github/workflows/update_ci.yml +++ b/.github/workflows/update_ci.yml @@ -236,7 +236,7 @@ jobs: - uses: actions/checkout@v3 with: path: pulpcore - ref: '3.33' + ref: '3.34' fetch-depth: 0 - name: Run update @@ -251,10 +251,10 @@ jobs: path: pulpcore committer: pulpbot author: pulpbot - title: 'Update CI files for branch 3.33' + title: 'Update CI files for branch 3.34' body: '[noissue]' - branch: 'update-ci/3.33' - base: '3.33' + branch: 'update-ci/3.34' + base: '3.34' commit-message: | Update CI files diff --git a/CHANGES/4368.bugfix b/CHANGES/4368.bugfix deleted file mode 100644 index 6d18d2ebc0..0000000000 --- a/CHANGES/4368.bugfix +++ /dev/null @@ -1 +0,0 @@ -Added missing ``--preload`` option to ``pulpcore-api`` and ``pulpcore-content``. diff --git a/CHANGES/4372.bugfix b/CHANGES/4372.bugfix deleted file mode 100644 index 96ede9a060..0000000000 --- a/CHANGES/4372.bugfix +++ /dev/null @@ -1,2 +0,0 @@ -Ensured that repository and remote delete is always executed in a task. This fixes a bug when the -deletion blocks the gunicorn api worker for too long. diff --git a/CHANGES/plugin_api/3332.feature b/CHANGES/plugin_api/3332.feature deleted file mode 100644 index 524de9d883..0000000000 --- a/CHANGES/plugin_api/3332.feature +++ /dev/null @@ -1,3 +0,0 @@ -Added a ``LabelsMixin`` for views to allow syncronous manipulation of labels on existing objects. -Repository, remote and distribution views inherit this from pulpcore, but default access policies -need to be adjusted. diff --git a/CHANGES/plugin_api/3401.feature b/CHANGES/plugin_api/3401.feature deleted file mode 100644 index 3f3577dc16..0000000000 --- a/CHANGES/plugin_api/3401.feature +++ /dev/null @@ -1,2 +0,0 @@ -Added a migration operation ``RequireVersion`` that refuses to complete as long as active -server components exist in the database. diff --git a/docs/conf.py b/docs/conf.py index 098a556838..fa1e1be359 100755 --- a/docs/conf.py +++ b/docs/conf.py @@ -75,9 +75,9 @@ # built documents. # # The short X.Y version. -version = "3.34.0.dev" +version = "3.35.0.dev" # The full version, including alpha/beta/rc tags. -release = "3.34.0.dev" +release = "3.35.0.dev" # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/pulpcore/app/apps.py b/pulpcore/app/apps.py index 09954e83da..2ccd1c552e 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.34.0.dev" + version = "3.35.0.dev" # The python package name providing this app python_package_name = "pulpcore" diff --git a/setup.py b/setup.py index 32537e6683..e1e6234ee4 100644 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ setup( name="pulpcore", - version="3.34.0.dev", + version="3.35.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 bef5090465..1aeaad2a3a 100644 --- a/template_config.yml +++ b/template_config.yml @@ -1,7 +1,7 @@ # This config represents the latest values used when running the plugin-template. Any settings that # were not present before running plugin-template have been added with their default values. -# generated with plugin_template@2021.08.26-241-g9cfc63e +# generated with plugin_template@2021.08.26-246-g98b439a additional_repos: - branch: main @@ -25,9 +25,9 @@ ci_update_branches: - '3.22' - '3.23' - '3.28' -- '3.33' +- '3.34' ci_update_docs: true -ci_update_release_behavior: 'replace-previous-version' +ci_update_release_behavior: replace-previous-version cli_package: pulp-cli cli_repo: https://github.com/pulp/pulp-cli.git core_import_allowed: []