Bump minor version

[noissue]

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 3.60.0.dev
+current_version = 3.61.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,9 +9,10 @@ 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)
 
+# This MUST be the ONLY call to pip install in inside the container.
 RUN pip3 install --upgrade pip setuptools wheel && \
   rm -rf /root/.cache/pip && \
-  pip3 install
+  pip3 install pipdeptree
 {%- if s3_test | default(false) -%}
 {{ " " }}git+https://github.com/gerrod3/botocore.git@fix-100-continue
 {%- endif -%}

.github/template_gitref

@@ -1 +1 @@
-2021.08.26-379-gece49c9
+unknown

.github/workflows/scripts/install.sh

@@ -166,5 +166,5 @@ if [[ "$TEST" = "azure" ]]; then
 fi
 
 echo ::group::PIP_LIST
-cmd_prefix bash -c "pip3 list && pip3 install pipdeptree && pipdeptree"
+cmd_prefix bash -c "pip3 list && pipdeptree"
 echo ::endgroup::

.github/workflows/update_ci.yml

@@ -74,7 +74,7 @@ jobs:
         with:
           fetch-depth: 0
           path: "pulpcore"
-          ref: "3.59"
+          ref: "3.60"
 
       - name: "Run update"
         working-directory: "pulpcore"
@@ -88,10 +88,10 @@ jobs:
           path: "pulpcore"
           committer: "pulpbot <[email protected]>"
           author: "pulpbot <[email protected]>"
-          title: "Update CI files for branch 3.59"
+          title: "Update CI files for branch 3.60"
           body: ""
-          branch: "update-ci/3.59"
-          base: "3.59"
+          branch: "update-ci/3.60"
+          base: "3.60"
           commit-message: |
             Update CI files
 

pulp_certguard/app/__init__.py

@@ -6,6 +6,6 @@ class PulpCertGuardPluginAppConfig(PulpPluginAppConfig):
 
     name = "pulp_certguard.app"
     label = "certguard"
-    version = "3.60.0.dev"
+    version = "3.61.0.dev"
     python_package_name = "pulpcore"
     domain_compatible = True

pulp_file/app/__init__.py

@@ -8,6 +8,6 @@ class PulpFilePluginAppConfig(PulpPluginAppConfig):
 
     name = "pulp_file.app"
     label = "file"
-    version = "3.60.0.dev"
+    version = "3.61.0.dev"
     python_package_name = "pulpcore"
     domain_compatible = True

pulpcore/app/apps.py

@@ -239,7 +239,7 @@ class PulpAppConfig(PulpPluginAppConfig):
     label = "core"
 
     # The version of this app
-    version = "3.60.0.dev"
+    version = "3.61.0.dev"
 
     # The python package name providing this app
     python_package_name = "pulpcore"

setup.py

@@ -8,7 +8,7 @@
 
 setup(
     name="pulpcore",
-    version="3.60.0.dev",
+    version="3.61.0.dev",
     description="Pulp Django Application and Related Modules",
     long_description=long_description,
     long_description_content_type="text/markdown",

template_config.yml

@@ -25,7 +25,7 @@ flake8: true
 flake8_ignore:
 - ./pulpcore/app/protobuf/*
 github_org: pulp
-latest_release_branch: '3.59'
+latest_release_branch: '3.60'
 lint_requirements: true
 noissue_marker: '[noissue]'
 os_required_packages: []
@@ -78,9 +78,9 @@ pulp_settings_s3:
           api.console: grant_access_to_pulp
         tokenUrl: https://your-identity-provider/token/issuer
     type: oauth2
+  DISABLED_rest_framework__default_authentication_classes: '@merge pulpcore.app.authentication.JSONHeaderRemoteAuthentication'
   domain_enabled: true
   hide_guarded_distributions: true
-  DISABLED_rest_framework__default_authentication_classes: '@merge pulpcore.app.authentication.JSONHeaderRemoteAuthentication'
 pydocstyle: true
 release_email: [email protected]
 release_user: pulpbot