diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 157fa11126..d1cfe00f25 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 3.66.0.dev +current_version = 3.67.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 4fb36e9605..3546645658 100644 --- a/.github/template_gitref +++ b/.github/template_gitref @@ -1 +1 @@ -2021.08.26-387-ge627e91 +unknown diff --git a/.github/workflows/update_ci.yml b/.github/workflows/update_ci.yml index eba24323b8..f599ca6f41 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.65" + ref: "3.66" - name: "Run update" working-directory: "pulpcore" @@ -83,9 +83,9 @@ jobs: path: "pulpcore" committer: "pulpbot " author: "pulpbot " - title: "Update CI files for branch 3.65" - branch: "update-ci/3.65" - base: "3.65" + title: "Update CI files for branch 3.66" + branch: "update-ci/3.66" + base: "3.66" delete-branch: true - uses: "actions/checkout@v4" with: diff --git a/CHANGES/3024.feature b/CHANGES/3024.feature deleted file mode 100644 index 65eb912766..0000000000 --- a/CHANGES/3024.feature +++ /dev/null @@ -1 +0,0 @@ -Added OpenPGP keyring repository type and OpenPGP key content type. diff --git a/CHANGES/5762.feature b/CHANGES/5762.feature deleted file mode 100644 index b886a938b1..0000000000 --- a/CHANGES/5762.feature +++ /dev/null @@ -1 +0,0 @@ -Re-enabled and refactored the Domain Storage metric emitter. diff --git a/CHANGES/5767.feature b/CHANGES/5767.feature deleted file mode 100644 index 52c14e0936..0000000000 --- a/CHANGES/5767.feature +++ /dev/null @@ -1,3 +0,0 @@ -Added a formal "immediate" type of Task and changed workers behavior to prioritize those. -This labeling is exlusive to plugin code and should only be applied where it's known that -the task will finish shortly, like in updates of repositories, remotes, and distributions. diff --git a/CHANGES/5881.bugfix b/CHANGES/5881.bugfix deleted file mode 100644 index d9122aefad..0000000000 --- a/CHANGES/5881.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fixed task purge to not expect a user, when a run has been scheduled by Pulp itself. diff --git a/pulp_certguard/app/__init__.py b/pulp_certguard/app/__init__.py index 6f4bf25e1d..556cbb59eb 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.66.0.dev" + version = "3.67.0.dev" python_package_name = "pulpcore" domain_compatible = True diff --git a/pulp_file/app/__init__.py b/pulp_file/app/__init__.py index 895a5743f5..f7258e6f33 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.66.0.dev" + version = "3.67.0.dev" python_package_name = "pulpcore" domain_compatible = True diff --git a/pulpcore/app/apps.py b/pulpcore/app/apps.py index 3f579f22cd..98ac6eec90 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.66.0.dev" + version = "3.67.0.dev" # The python package name providing this app python_package_name = "pulpcore" diff --git a/setup.py b/setup.py index 5e04a61e49..95347f85f5 100644 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ setup( name="pulpcore", - version="3.66.0.dev", + version="3.67.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 22cfbe1cd9..281c85faba 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.65' +latest_release_branch: '3.66' lint_requirements: true os_required_packages: [] parallel_test_workers: 8