Bump minor version

[noissue]

.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<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\.(?P<release>[a-z]+))?

.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() %}

.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}"

.github/template_gitref

@@ -1 +1 @@
-2021.08.26-354-g82d22de
+2021.08.26-361-gcd6f9f0

.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

.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

.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 <[email protected]>"
           author: "pulpbot <[email protected]>"
-          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
 

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.

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):

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+",

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 [email protected]354-g82d22de
+# generated with [email protected]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: []