diff --git a/.bumpversion.cfg b/.bumpversion.cfg index ad8097fe8..639032b8e 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 2.21.0.dev +current_version = 2.22.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 6cf81f25b..afe0b118d 100644 --- a/.ci/ansible/Containerfile.j2 +++ b/.ci/ansible/Containerfile.j2 @@ -9,7 +9,9 @@ ADD ./{{ item.name }} ./{{ item.name }} # S3 botocore needs to be patched to handle responses from minio during 0-byte uploads # Hacking botocore (https://github.com/boto/botocore/pull/1990) -RUN pip3 install +RUN pip3 install --upgrade pip setuptools wheel && \ + rm -rf /root/.cache/pip && \ + pip3 install {%- if s3_test | default(false) -%} {{ " " }}git+https://github.com/gerrod3/botocore.git@fix-100-continue {%- endif -%} @@ -25,7 +27,8 @@ RUN pip3 install {{ " " }}-r ./{{ item.name }}/ci_requirements.txt {%- endif -%} {%- endfor %} -{{ " " }}-c ./{{ plugins[0].name }}/.ci/assets/ci_constraints.txt +{{ " " }}-c ./{{ plugins[0].name }}/.ci/assets/ci_constraints.txt && \ + rm -rf /root/.cache/pip {% if pulp_env is defined and pulp_env %} {% for key, value in pulp_env.items() %} diff --git a/.ci/scripts/calc_constraints.py b/.ci/scripts/calc_constraints.py index 37ba326a5..4c9efab2a 100755 --- a/.ci/scripts/calc_constraints.py +++ b/.ci/scripts/calc_constraints.py @@ -62,6 +62,8 @@ def to_upper_bound(req): max_version = f"{version.major}.{version.minor}.{version.micro-1}" elif version.minor != 0: max_version = f"{version.major}.{version.minor-1}" + elif version.major != 0: + max_version = f"{version.major-1}.0" else: return f"# NO BETTER CONSTRAINT: {req}" return f"{requirement.name}{operator}{max_version}" diff --git a/.github/template_gitref b/.github/template_gitref index c16f42b6e..3d9674dcd 100644 --- a/.github/template_gitref +++ b/.github/template_gitref @@ -1 +1 @@ -2021.08.26-354-g82d22de +2021.08.26-361-gcd6f9f0 diff --git a/.github/workflows/scripts/build_python_client.sh b/.github/workflows/scripts/build_python_client.sh index 456e97677..ec4988962 100755 --- a/.github/workflows/scripts/build_python_client.sh +++ b/.github/workflows/scripts/build_python_client.sh @@ -18,9 +18,7 @@ cd "$(dirname "$(realpath -e "$0")")"/../../.. pushd ../pulp-openapi-generator rm -rf "pulp_container-client" -# We need to copy that over to be visible in the container. -cp "../pulp_container/container-api.json" . -./gen-client.sh "container-api.json" "container" python "pulp_container" +./gen-client.sh "../pulp_container/container-api.json" "container" python "pulp_container" pushd pulp_container-client python setup.py sdist bdist_wheel --python-tag py3 diff --git a/.github/workflows/scripts/build_ruby_client.sh b/.github/workflows/scripts/build_ruby_client.sh index 0786c510a..deb3e8e39 100755 --- a/.github/workflows/scripts/build_ruby_client.sh +++ b/.github/workflows/scripts/build_ruby_client.sh @@ -18,15 +18,7 @@ cd "$(dirname "$(realpath -e "$0")")"/../../.. pushd ../pulp-openapi-generator rm -rf "pulp_container-client" -# We need to copy that over to be visible in the container. -#cp "../pulp_container/container-api.json" . -#./gen-client.sh "container-api.json" "container" ruby "pulp_container" - -# ------------- -# The generator still needs to have it called api.json at this time... -cp "../pulp_container/api.json" . -./gen-client.sh "api.json" "container" ruby "pulp_container" -# ------------- +./gen-client.sh "../pulp_container/container-api.json" "container" ruby "pulp_container" pushd pulp_container-client gem build pulp_container_client diff --git a/.github/workflows/update_ci.yml b/.github/workflows/update_ci.yml index 43f6154d9..9643d2ddc 100644 --- a/.github/workflows/update_ci.yml +++ b/.github/workflows/update_ci.yml @@ -74,7 +74,7 @@ jobs: with: fetch-depth: 0 path: "pulp_container" - ref: "2.20" + ref: "2.21" - name: "Run update" working-directory: "pulp_container" @@ -88,10 +88,10 @@ jobs: path: "pulp_container" committer: "pulpbot " author: "pulpbot " - title: "Update CI files for branch 2.20" + title: "Update CI files for branch 2.21" body: "" - branch: "update-ci/2.20" - base: "2.20" + branch: "update-ci/2.21" + base: "2.21" commit-message: | Update CI files diff --git a/CHANGES/1347.bugfix b/CHANGES/1347.bugfix deleted file mode 100644 index 5656e314b..000000000 --- a/CHANGES/1347.bugfix +++ /dev/null @@ -1,2 +0,0 @@ -The pulp signing task that produces atomic type signature no longer signs cosign signatures, -attestations and sboms (images that end with .sig, .att, or .sbom), and ignores them instead. diff --git a/CHANGES/1493.bugfix b/CHANGES/1493.bugfix deleted file mode 100644 index 37b7ebc2d..000000000 --- a/CHANGES/1493.bugfix +++ /dev/null @@ -1,2 +0,0 @@ -Fixed a bug that caused intermittent failures during the pull-through caching when using non-local -filesystem storage. diff --git a/CHANGES/1499.bugfix b/CHANGES/1499.bugfix deleted file mode 100644 index acec620eb..000000000 --- a/CHANGES/1499.bugfix +++ /dev/null @@ -1 +0,0 @@ -Made the pull-through caching machinery resilient to connection errors. diff --git a/CHANGES/1550.bugfix b/CHANGES/1550.bugfix deleted file mode 100644 index 54f524512..000000000 --- a/CHANGES/1550.bugfix +++ /dev/null @@ -1,2 +0,0 @@ -Pulp Container specific settings are now properly validated during the deployment checks of a Pulp -instance. diff --git a/CHANGES/1602.bugfix b/CHANGES/1602.bugfix deleted file mode 100644 index 396bb32ad..000000000 --- a/CHANGES/1602.bugfix +++ /dev/null @@ -1 +0,0 @@ -Tasks created after uploading manifests will now remain available for further inspection and will not be deleted. diff --git a/CHANGES/1607.misc b/CHANGES/1607.misc deleted file mode 100644 index 951ddbc4b..000000000 --- a/CHANGES/1607.misc +++ /dev/null @@ -1 +0,0 @@ -Disabled token authentication for the S3 test runner. diff --git a/CHANGES/1623.bugfix b/CHANGES/1623.bugfix deleted file mode 100644 index a27049eb7..000000000 --- a/CHANGES/1623.bugfix +++ /dev/null @@ -1 +0,0 @@ -Disallowed anonymous users to pull images from private pull-through distributions. diff --git a/CHANGES/1624.bugfix b/CHANGES/1624.bugfix deleted file mode 100644 index 48f1ee1ec..000000000 --- a/CHANGES/1624.bugfix +++ /dev/null @@ -1,2 +0,0 @@ -Permitted users with the `pull_new_containerdistribution` permission to pull new data via -pull-through distributions. diff --git a/CHANGES/1648.feature b/CHANGES/1648.feature deleted file mode 100644 index 82c36acb2..000000000 --- a/CHANGES/1648.feature +++ /dev/null @@ -1,3 +0,0 @@ -Added support for the Replication feature. The replication process allows a Pulp instance to -replicate container repositories from an upstream Pulp, creating the required remotes, -repositories (those will always be read-only), and distributions. diff --git a/CHANGES/1651.bugfix b/CHANGES/1651.bugfix deleted file mode 100644 index d0e7c4f66..000000000 --- a/CHANGES/1651.bugfix +++ /dev/null @@ -1,2 +0,0 @@ -Modified the `_catalog` endpoint to allow non-authed users to see all repos in catalog -(private and public) when token-auth is disabled. diff --git a/CHANGES/1657.bugfix b/CHANGES/1657.bugfix deleted file mode 100644 index 8c3e751cb..000000000 --- a/CHANGES/1657.bugfix +++ /dev/null @@ -1,2 +0,0 @@ -Disallowed anonymous users to pull new content via a pull-through caching distribution. Content that -is already cached/downloaded can be still pulled. diff --git a/CHANGES/1681.misc b/CHANGES/1681.misc deleted file mode 100644 index a2cd58f26..000000000 --- a/CHANGES/1681.misc +++ /dev/null @@ -1 +0,0 @@ -Made the plugin compatible with pulpcore v3.55. diff --git a/CHANGES/459.feature b/CHANGES/459.feature deleted file mode 100644 index 3c6260473..000000000 --- a/CHANGES/459.feature +++ /dev/null @@ -1,2 +0,0 @@ -Added support for filtering remote repositories in pull-through caching using `includes` and -`excludes` fields. These fields can be set on pull-through caching remote objects. diff --git a/docs/conf.py b/docs/conf.py index 06ceeff9e..93211056d 100755 --- a/docs/conf.py +++ b/docs/conf.py @@ -73,9 +73,9 @@ # built documents. # # The short X.Y version. -version = "2.21.0.dev" +version = "2.22.0.dev" # The full version, including alpha/beta/rc tags. -release = "2.21.0.dev" +release = "2.22.0.dev" # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/pulp_container/app/__init__.py b/pulp_container/app/__init__.py index d02fc572d..d1f0304fa 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.21.0.dev" + version = "2.22.0.dev" python_package_name = "pulp-container" def ready(self): diff --git a/setup.py b/setup.py index cf10cce67..daa08ff4e 100755 --- a/setup.py +++ b/setup.py @@ -10,7 +10,7 @@ setup( name="pulp-container", - version="2.21.0.dev", + version="2.22.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 c10ec8472..63112bd04 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-354-g82d22de +# generated with plugin_template@2021.08.26-361-gcd6f9f0 api_root: /pulp/ black: true @@ -28,7 +28,7 @@ flake8_ignore: [] github_org: pulp issue_tracker: github kanban: true -latest_release_branch: '2.20' +latest_release_branch: '2.21' lint_requirements: true noissue_marker: '[noissue]' os_required_packages: []