diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 9f86512897..aea5bb5889 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 3.50.0.dev +current_version = 3.51.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 a819c62028..1d55a4ae8d 100644 --- a/.github/workflows/update_ci.yml +++ b/.github/workflows/update_ci.yml @@ -74,7 +74,7 @@ jobs: with: fetch-depth: 0 path: "pulpcore" - ref: "3.49" + ref: "3.50" - name: "Run update" working-directory: "pulpcore" @@ -88,10 +88,10 @@ jobs: path: "pulpcore" committer: "pulpbot " author: "pulpbot " - title: "Update CI files for branch 3.49" + title: "Update CI files for branch 3.50" body: "" - branch: "update-ci/3.49" - base: "3.49" + branch: "update-ci/3.50" + base: "3.50" commit-message: | Update CI files diff --git a/CHANGES/4315.deprecation b/CHANGES/4315.deprecation deleted file mode 100644 index eeab6c2e38..0000000000 --- a/CHANGES/4315.deprecation +++ /dev/null @@ -1 +0,0 @@ -Task filter ``reserved_resources_record`` has been deprecated and planned for removal in pulpcore 3.55. diff --git a/CHANGES/4315.misc b/CHANGES/4315.misc deleted file mode 100644 index 48e347ff07..0000000000 --- a/CHANGES/4315.misc +++ /dev/null @@ -1,2 +0,0 @@ -Added new task resource locking method ``get_prn`` that does not change with different settings. -``get_url`` is planned to be phased out of resource locking by pulpcore 3.55. diff --git a/CHANGES/4637.bugfix b/CHANGES/4637.bugfix deleted file mode 100644 index 8089ab7c9a..0000000000 --- a/CHANGES/4637.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fixed an issue in replicate, where an existing distribution had a conflicting publication set. diff --git a/CHANGES/5100.bugfix b/CHANGES/5100.bugfix deleted file mode 100644 index 334388ec12..0000000000 --- a/CHANGES/5100.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fixed content directory listing not showing file size for 0-byte files. diff --git a/docs/conf.py b/docs/conf.py index e065db2199..0cf20026a8 100755 --- a/docs/conf.py +++ b/docs/conf.py @@ -75,9 +75,9 @@ # built documents. # # The short X.Y version. -version = "3.50.0.dev" +version = "3.51.0.dev" # The full version, including alpha/beta/rc tags. -release = "3.50.0.dev" +release = "3.51.0.dev" # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/pulp_certguard/app/__init__.py b/pulp_certguard/app/__init__.py index 81b96b8320..2acbe22a47 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.50.0.dev" + version = "3.51.0.dev" python_package_name = "pulpcore" domain_compatible = True diff --git a/pulp_file/app/__init__.py b/pulp_file/app/__init__.py index 49b2164894..2ed387bdb9 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.50.0.dev" + version = "3.51.0.dev" python_package_name = "pulpcore" domain_compatible = True diff --git a/pulpcore/app/apps.py b/pulpcore/app/apps.py index 2e531bc730..cc52ab25ce 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.50.0.dev" + version = "3.51.0.dev" # The python package name providing this app python_package_name = "pulpcore" diff --git a/setup.py b/setup.py index fd73e876bb..e29714e910 100644 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ setup( name="pulpcore", - version="3.50.0.dev", + version="3.51.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 628cf45f32..b14e78fed4 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-319-ga283c28 +# generated with plugin_template@2021.08.26-323-g761b826 api_root: /pulp/ black: true @@ -31,7 +31,7 @@ flake8_ignore: github_org: pulp issue_tracker: github kanban: true -latest_release_branch: '3.49' +latest_release_branch: '3.50' lint_requirements: true noissue_marker: '[noissue]' parallel_test_workers: 8