diff --git a/.bumpversion.cfg b/.bumpversion.cfg index b10a9cedc..48c2c599c 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 2.22.0.dev +current_version = 2.23.0.dev commit = False tag = False parse = (?P\d+)\.(?P\d+)\.(?P\d+)(\.(?P[a-z]+))? diff --git a/.ci/ansible/Containerfile.j2 b/.ci/ansible/Containerfile.j2 index e4b863331..d57b44ed2 100644 --- a/.ci/ansible/Containerfile.j2 +++ b/.ci/ansible/Containerfile.j2 @@ -28,8 +28,7 @@ RUN pip3 install --upgrade pip setuptools wheel && \ {{ " " }}-r ./{{ item.name }}/ci_requirements.txt {%- endif -%} {%- endfor %} -{{ " " }}-c ./{{ plugins[0].name }}/.ci/assets/ci_constraints.txt \ - pipdeptree && \ +{{ " " }}-c ./{{ plugins[0].name }}/.ci/assets/ci_constraints.txt && \ rm -rf /root/.cache/pip {% if pulp_env is defined and pulp_env %} diff --git a/.ci/assets/ci_constraints.txt b/.ci/assets/ci_constraints.txt index 14b515968..2617a4089 100644 --- a/.ci/assets/ci_constraints.txt +++ b/.ci/assets/ci_constraints.txt @@ -5,8 +5,3 @@ pulpcore>=3.21.30,!=3.23.*,!=3.24.*,!=3.25.*,!=3.26.*,!=3.27.*,!=3.29.*,!=3.30.* tablib!=3.6.0 # 3.6.0: This release introduced a regression removing the "html" optional dependency. - - - -# Newer version seem to have a conflict around packaging, that pip fails to resolve in time. Remove this when this starts to impose an issue. -pipdeptree<=3.23.1 diff --git a/.github/template_gitref b/.github/template_gitref index 4fb36e960..354664565 100644 --- a/.github/template_gitref +++ b/.github/template_gitref @@ -1 +1 @@ -2021.08.26-387-ge627e91 +unknown diff --git a/.github/workflows/scripts/install.sh b/.github/workflows/scripts/install.sh index 3c6a2ba09..5ed132143 100755 --- a/.github/workflows/scripts/install.sh +++ b/.github/workflows/scripts/install.sh @@ -156,5 +156,5 @@ if [[ "$TEST" = "azure" ]]; then fi echo ::group::PIP_LIST -cmd_prefix bash -c "pip3 list && pipdeptree" +cmd_prefix bash -c "pip3 list" echo ::endgroup:: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 16bb62578..e9c81a01a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -147,5 +147,5 @@ jobs: docker logs pulp || true docker exec pulp ls -latr /etc/yum.repos.d/ || true docker exec pulp cat /etc/yum.repos.d/* || true - docker exec pulp bash -c "pip3 list && pip3 install pipdeptree && pipdeptree" + docker exec pulp bash -c "pip3 list" || true ... diff --git a/.github/workflows/update_ci.yml b/.github/workflows/update_ci.yml index 3915f3860..716e6c7a4 100644 --- a/.github/workflows/update_ci.yml +++ b/.github/workflows/update_ci.yml @@ -69,7 +69,7 @@ jobs: with: fetch-depth: 0 path: "pulp_container" - ref: "2.21" + ref: "2.22" - name: "Run update" working-directory: "pulp_container" @@ -83,9 +83,9 @@ jobs: path: "pulp_container" committer: "pulpbot " author: "pulpbot " - title: "Update CI files for branch 2.21" - branch: "update-ci/2.21" - base: "2.21" + title: "Update CI files for branch 2.22" + branch: "update-ci/2.22" + base: "2.22" delete-branch: true - uses: "actions/checkout@v4" with: diff --git a/CHANGES/+fix-any-type.bugfix b/CHANGES/+fix-any-type.bugfix deleted file mode 100644 index 89ea25f51..000000000 --- a/CHANGES/+fix-any-type.bugfix +++ /dev/null @@ -1,2 +0,0 @@ -Fixed the JSONField specification so it doesn't break ruby bindings. -See context [here](https://github.com/pulp/pulp_rpm/issues/3639). diff --git a/CHANGES/1700.bugfix b/CHANGES/1700.bugfix deleted file mode 100644 index bffe75aba..000000000 --- a/CHANGES/1700.bugfix +++ /dev/null @@ -1,2 +0,0 @@ -Resolved an issue with the pull-through cache that was causing errors when retrieving v2 schema 1 -manifests. diff --git a/CHANGES/1703.bugfix b/CHANGES/1703.bugfix deleted file mode 100644 index 231a3c156..000000000 --- a/CHANGES/1703.bugfix +++ /dev/null @@ -1,2 +0,0 @@ -Fixed an issue causing an HTTP 500 error when a GET request for a non-existing -blob was made to a distribution with only a `repository_version` set. diff --git a/CHANGES/1712.bugfix b/CHANGES/1712.bugfix deleted file mode 100644 index c323cb5ac..000000000 --- a/CHANGES/1712.bugfix +++ /dev/null @@ -1,2 +0,0 @@ -Fixed an HTTP 500 error returned when pushing an image with the same name as the name of an existing -read-only repository. diff --git a/CHANGES/1746.bugfix b/CHANGES/1746.bugfix deleted file mode 100644 index 4c2d7f70e..000000000 --- a/CHANGES/1746.bugfix +++ /dev/null @@ -1,2 +0,0 @@ -Resolved an issue with syncing content causing errors when retrieving manifests without a mediaType -definition. diff --git a/CHANGES/1751.deprecation b/CHANGES/1751.deprecation deleted file mode 100644 index 0aa486def..000000000 --- a/CHANGES/1751.deprecation +++ /dev/null @@ -1 +0,0 @@ -Deprecated the Manifest `is_flatpak` and `is_bootable` fields in favor of the new `type` field. diff --git a/CHANGES/1751.feature b/CHANGES/1751.feature deleted file mode 100644 index 4d39daf8b..000000000 --- a/CHANGES/1751.feature +++ /dev/null @@ -1,2 +0,0 @@ -Introduced the `type` field on the Manifests endpoint to enable easier differentiation of image -types. diff --git a/CHANGES/1759.bugfix b/CHANGES/1759.bugfix deleted file mode 100644 index 59623e03b..000000000 --- a/CHANGES/1759.bugfix +++ /dev/null @@ -1,2 +0,0 @@ -Resolved an issue where syncing filtered content with a `cosign` signature from a remote source lacking `Sigstore`, -and with `signed_only: true` enabled, could occasionally fail. diff --git a/CHANGES/1767.feature b/CHANGES/1767.feature deleted file mode 100644 index 5fb0797af..000000000 --- a/CHANGES/1767.feature +++ /dev/null @@ -1 +0,0 @@ -Added `architecture`, `os`, and `compressed_image_size` fields to Manifest. diff --git a/CHANGES/479.feature b/CHANGES/479.feature deleted file mode 100644 index 138d27bf4..000000000 --- a/CHANGES/479.feature +++ /dev/null @@ -1,2 +0,0 @@ -The `build_image` endpoint has been refactored to accept `build_context` -(i.e., a file repository version) instead of raw artifacts. The same applies to Containerfile." diff --git a/pulp_container/app/__init__.py b/pulp_container/app/__init__.py index d1f0304fa..6e831d11b 100644 --- a/pulp_container/app/__init__.py +++ b/pulp_container/app/__init__.py @@ -6,7 +6,7 @@ class PulpContainerPluginAppConfig(PulpPluginAppConfig): name = "pulp_container.app" label = "container" - version = "2.22.0.dev" + version = "2.23.0.dev" python_package_name = "pulp-container" def ready(self): diff --git a/setup.py b/setup.py index daa08ff4e..79fef37da 100755 --- a/setup.py +++ b/setup.py @@ -10,7 +10,7 @@ setup( name="pulp-container", - version="2.22.0.dev", + version="2.23.0.dev", description="Container plugin for the Pulp Project", long_description=long_description, license="GPLv2+", diff --git a/template_config.yml b/template_config.yml index 763d29a51..31e991237 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-382-gc88324b +# generated with plugin_template@unknown api_root: /pulp/ black: true @@ -23,7 +23,7 @@ docker_fixtures: false flake8: true flake8_ignore: [] github_org: pulp -latest_release_branch: '2.21' +latest_release_branch: '2.22' lint_requirements: true os_required_packages: [] parallel_test_workers: 8