diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 7c40ae7c88..64f0d8f26b 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 3.62.0.dev +current_version = 3.63.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 1691300c87..3546645658 100644 --- a/.github/template_gitref +++ b/.github/template_gitref @@ -1 +1 @@ -2021.08.26-383-gc4cd2b8 +unknown diff --git a/.github/workflows/update_ci.yml b/.github/workflows/update_ci.yml index 18f701a80d..5585dd60aa 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.61" + ref: "3.62" - name: "Run update" working-directory: "pulpcore" @@ -83,9 +83,9 @@ jobs: path: "pulpcore" committer: "pulpbot " author: "pulpbot " - title: "Update CI files for branch 3.61" - branch: "update-ci/3.61" - base: "3.61" + title: "Update CI files for branch 3.62" + branch: "update-ci/3.62" + base: "3.62" delete-branch: true - uses: "actions/checkout@v4" with: diff --git a/CHANGES/3634.bugfix b/CHANGES/3634.bugfix deleted file mode 100644 index 1ecb92ff36..0000000000 --- a/CHANGES/3634.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fixed Publication & RepositoryVersion's `content__in` filter to properly accept an array of strings. diff --git a/CHANGES/4110.feature b/CHANGES/4110.feature deleted file mode 100644 index f2a6aca4be..0000000000 --- a/CHANGES/4110.feature +++ /dev/null @@ -1 +0,0 @@ -Added `name`, `base_url` and `last_replication` filters for UpstreamPulps. diff --git a/CHANGES/4207.feature b/CHANGES/4207.feature deleted file mode 100644 index 293fd0da65..0000000000 --- a/CHANGES/4207.feature +++ /dev/null @@ -1,2 +0,0 @@ -Added new setting ``API_ROOT_REWRITE_HEADER`` that when specified allows the API_ROOT to be rewritten -per request based on the header's value. diff --git a/CHANGES/5087.feature b/CHANGES/5087.feature deleted file mode 100644 index 672ad13808..0000000000 --- a/CHANGES/5087.feature +++ /dev/null @@ -1,3 +0,0 @@ -Added new `q_select` field to UpstreamPulp to allow for more advanced filtering on upstream distributions. -`pulp_label_select` has been removed and its values have been migrated to this new field. -Please upgrade every API worker before issuing a new replicate task to avoid unwanted behavior. diff --git a/CHANGES/5807.doc b/CHANGES/5807.doc deleted file mode 100644 index 668cbe49e4..0000000000 --- a/CHANGES/5807.doc +++ /dev/null @@ -1 +0,0 @@ -Document the environment variables used in the test fixture `bindings_cfg`. diff --git a/CHANGES/plugin_api/3649.deprecation b/CHANGES/plugin_api/3649.deprecation deleted file mode 100644 index 850d2269c2..0000000000 --- a/CHANGES/plugin_api/3649.deprecation +++ /dev/null @@ -1,2 +0,0 @@ -Deprecated Replicator's `distribution_data`, plugins should switch to `distribution_extra_fields`. -`distribution_data` will be removed in pulpcore==3.70. diff --git a/CHANGES/plugin_api/4207.feature b/CHANGES/plugin_api/4207.feature deleted file mode 100644 index 950dc94b96..0000000000 --- a/CHANGES/plugin_api/4207.feature +++ /dev/null @@ -1,2 +0,0 @@ -Added new ``reverse`` method that handles Pulp specific url formatting. Plugins should update -instances of ``django.urls.reverse`` and ``rest_framework.reverse`` to this new Pulp one. diff --git a/pulp_certguard/app/__init__.py b/pulp_certguard/app/__init__.py index 8d853adc6d..99bd6d286f 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.62.0.dev" + version = "3.63.0.dev" python_package_name = "pulpcore" domain_compatible = True diff --git a/pulp_file/app/__init__.py b/pulp_file/app/__init__.py index 1c1c073c62..ab11dd91bd 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.62.0.dev" + version = "3.63.0.dev" python_package_name = "pulpcore" domain_compatible = True diff --git a/pulpcore/app/apps.py b/pulpcore/app/apps.py index 38723a9a9c..e7e225941f 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.62.0.dev" + version = "3.63.0.dev" # The python package name providing this app python_package_name = "pulpcore" diff --git a/setup.py b/setup.py index e94a534565..27542cd8e4 100644 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ setup( name="pulpcore", - version="3.62.0.dev", + version="3.63.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 430265cf3c..f876ea6d74 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.61' +latest_release_branch: '3.62' lint_requirements: true os_required_packages: [] parallel_test_workers: 8