diff --git a/.github/workflows/update_ci.yml b/.github/workflows/update_ci.yml index c210a0f61b9..a969d2ab72b 100644 --- a/.github/workflows/update_ci.yml +++ b/.github/workflows/update_ci.yml @@ -74,6 +74,37 @@ jobs: env: GH_TOKEN: "${{ secrets.RELEASE_TOKEN }}" continue-on-error: true + - uses: "actions/checkout@v4" + with: + fetch-depth: 0 + path: "pulpcore" + ref: "3.100" + + - name: "Run update" + working-directory: "pulpcore" + run: | + ../plugin_template/scripts/update_ci.sh --release + + - name: "Create Pull Request for CI files" + uses: "peter-evans/create-pull-request@v6" + id: "create_pr_3_100" + with: + token: "${{ secrets.RELEASE_TOKEN }}" + path: "pulpcore" + committer: "pulpbot " + author: "pulpbot " + title: "Update CI files for branch 3.100" + branch: "update-ci/3.100" + base: "3.100" + delete-branch: true + - name: "Mark PR automerge" + working-directory: "pulpcore" + run: | + gh pr merge --rebase --auto "${{ steps.create_pr_3_100.outputs.pull-request-number }}" + if: "steps.create_pr_3_100.outputs.pull-request-number" + env: + GH_TOKEN: "${{ secrets.RELEASE_TOKEN }}" + continue-on-error: true - uses: "actions/checkout@v4" with: fetch-depth: 0 @@ -229,35 +260,4 @@ jobs: env: GH_TOKEN: "${{ secrets.RELEASE_TOKEN }}" continue-on-error: true - - uses: "actions/checkout@v4" - with: - fetch-depth: 0 - path: "pulpcore" - ref: "3.95" - - - name: "Run update" - working-directory: "pulpcore" - run: | - ../plugin_template/scripts/update_ci.sh --release - - - name: "Create Pull Request for CI files" - uses: "peter-evans/create-pull-request@v6" - id: "create_pr_3_95" - with: - token: "${{ secrets.RELEASE_TOKEN }}" - path: "pulpcore" - committer: "pulpbot " - author: "pulpbot " - title: "Update CI files for branch 3.95" - branch: "update-ci/3.95" - base: "3.95" - delete-branch: true - - name: "Mark PR automerge" - working-directory: "pulpcore" - run: | - gh pr merge --rebase --auto "${{ steps.create_pr_3_95.outputs.pull-request-number }}" - if: "steps.create_pr_3_95.outputs.pull-request-number" - env: - GH_TOKEN: "${{ secrets.RELEASE_TOKEN }}" - continue-on-error: true ... diff --git a/CHANGES/+improve-migration-err-msg.misc b/CHANGES/+improve-migration-err-msg.misc deleted file mode 100644 index 2f6437f9164..00000000000 --- a/CHANGES/+improve-migration-err-msg.misc +++ /dev/null @@ -1,2 +0,0 @@ -Improved the error message for incompatible component versions when doing a migration. -Now it instructs the user with a safe path to take when the components were improperly shutdown. diff --git a/CHANGES/5324.feature b/CHANGES/5324.feature deleted file mode 100644 index 342ea25ddc8..00000000000 --- a/CHANGES/5324.feature +++ /dev/null @@ -1,2 +0,0 @@ -Adapted PulpImport/Export to allow update django-import-export==4.x. - diff --git a/CHANGES/6988.feature b/CHANGES/6988.feature deleted file mode 100644 index b01354bfbae..00000000000 --- a/CHANGES/6988.feature +++ /dev/null @@ -1 +0,0 @@ -Allow use of Django5 as well as Django4. diff --git a/CHANGES/7157.bugfix b/CHANGES/7157.bugfix deleted file mode 100644 index 663b0075095..00000000000 --- a/CHANGES/7157.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fixed file handle leak when content app access triggers downloads due to on_demand or streamed policy. diff --git a/CHANGES/plugin_api/6079.removal b/CHANGES/plugin_api/6079.removal deleted file mode 100644 index 34ba8a87d83..00000000000 --- a/CHANGES/plugin_api/6079.removal +++ /dev/null @@ -1,2 +0,0 @@ -Removed the fallback for unserializable task return values. -Tasks resulting from an api action should use the corresponding serializer to produce useful output. Maintenance tasks should return nothing. diff --git a/pulp_certguard/app/__init__.py b/pulp_certguard/app/__init__.py index afdfa86224b..cff7c1b96af 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.100.0.dev" + version = "3.101.0.dev" python_package_name = "pulpcore" domain_compatible = True diff --git a/pulp_file/app/__init__.py b/pulp_file/app/__init__.py index ad18b5a51b6..245355e3641 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.100.0.dev" + version = "3.101.0.dev" python_package_name = "pulpcore" domain_compatible = True diff --git a/pulpcore/app/apps.py b/pulpcore/app/apps.py index 936d4d0957f..b7a7689b389 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.100.0.dev" + version = "3.101.0.dev" # The python package name providing this app python_package_name = "pulpcore" diff --git a/pyproject.toml b/pyproject.toml index 26919c3e635..71654c4fbe5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,7 +7,7 @@ build-backend = 'setuptools.build_meta' [project] name = "pulpcore" -version = "3.100.0.dev" +version = "3.101.0.dev" description = "Pulp Django Application and Related Modules" readme = "README.md" authors = [ @@ -204,7 +204,7 @@ ignore = [ [tool.bumpversion] # This section is managed by the plugin template. Do not edit manually. -current_version = "3.100.0.dev" +current_version = "3.101.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 b5fd9df7180..c9f50596b53 100644 --- a/template_config.yml +++ b/template_config.yml @@ -28,7 +28,7 @@ flake8: true flake8_ignore: - ./pulpcore/app/protobuf/* github_org: pulp -latest_release_branch: '3.95' +latest_release_branch: '3.100' lint_requirements: true os_required_packages: [] parallel_test_workers: 8