Update CI & base-image to centos9

gerrod3 · gerrod3 · commit c6d23d2ba86c · 2024-05-13T15:57:44.000-04:00
[noissue]
diff --git a/.github/template_gitref b/.github/template_gitref
@@ -1 +1 @@
-2021.08.26-327-g6a0d984
+2021.08.26-330-g0b7d0c1
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -23,7 +23,7 @@ jobs:
         with:
           fetch-depth: 1
           path: "pulp_python"
-      - uses: "actions/setup-python@v4"
+      - uses: "actions/setup-python@v5"
         with:
           python-version: "3.11"
       - name: "Install python dependencies"
@@ -36,7 +36,7 @@ jobs:
           python3 setup.py sdist bdist_wheel --python-tag py3
           twine check dist/*
       - name: "Upload Package whl"
-        uses: "actions/upload-artifact@v3"
+        uses: "actions/upload-artifact@v4"
         with:
           name: "plugin_package"
           path: "pulp_python/dist/"
diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml
@@ -28,7 +28,7 @@ jobs:
         with:
           fetch-depth: 1
 
-      - uses: "actions/setup-python@v4"
+      - uses: "actions/setup-python@v5"
         with:
           python-version: "3.11"
 
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -25,7 +25,7 @@ jobs:
         with:
           fetch-depth: 0
           path: "pulp_python"
-      - uses: "actions/setup-python@v4"
+      - uses: "actions/setup-python@v5"
         with:
           python-version: "3.11"
       - name: "Install python dependencies"
@@ -67,10 +67,11 @@ jobs:
           mkdir -p "pulp_python"
         working-directory: "."
       - name: "Download Deprecations"
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
-          name: "deprecations"
+          pattern: "deprecations-*"
           path: "pulp_python"
+          merge-multiple: true
       - name: "Print deprecations"
         run: |
           cat deprecations-*.txt | sort -u
diff --git a/.github/workflows/create-branch.yml b/.github/workflows/create-branch.yml
@@ -26,7 +26,7 @@ jobs:
           fetch-depth: 0
           path: "pulp_python"
 
-      - uses: "actions/setup-python@v4"
+      - uses: "actions/setup-python@v5"
         with:
           python-version: "3.11"
 
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -24,7 +24,7 @@ jobs:
           fetch-depth: 1
           path: "pulp_python"
 
-      - uses: "actions/setup-python@v4"
+      - uses: "actions/setup-python@v5"
         with:
           python-version: "3.11"
 
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -38,7 +38,7 @@ jobs:
           fetch-depth: 0
           path: "pulp_python"
 
-      - uses: "actions/setup-python@v4"
+      - uses: "actions/setup-python@v5"
         with:
           python-version: "3.11"
 
@@ -76,12 +76,12 @@ jobs:
           fetch-depth: 1
           path: "pulp_python"
 
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: "plugin_package"
           path: "pulp_python/dist/"
 
-      - uses: "actions/setup-python@v4"
+      - uses: "actions/setup-python@v5"
         with:
           python-version: "3.11"
 
@@ -96,13 +96,13 @@ jobs:
           echo "TEST=${{ matrix.env.TEST }}" >> $GITHUB_ENV
 
       - name: Download built docs
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: "docs.tar"
           path: "pulp_python"
 
       - name: Download Python client docs
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: "python-client-docs.tar"
           path: "pulp_python"
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -39,11 +39,11 @@ jobs:
           repository: "pulp/pulp-openapi-generator"
           path: "pulp-openapi-generator"
 
-      - uses: "actions/setup-python@v4"
+      - uses: "actions/setup-python@v5"
         with:
           python-version: "3.11"
 
-      - uses: "actions/download-artifact@v3"
+      - uses: "actions/download-artifact@v4"
         with:
           name: "plugin_package"
           path: "pulp_python/dist/"
@@ -89,20 +89,20 @@ jobs:
           .github/workflows/scripts/install_ruby_client.sh
         shell: "bash"
       - name: "Upload python client packages"
-        uses: "actions/upload-artifact@v3"
+        uses: "actions/upload-artifact@v4"
         with:
           name: "python-client.tar"
           path: "pulp_python/python-python-client.tar"
           if-no-files-found: "error"
 
       - name: "Upload python client docs"
-        uses: "actions/upload-artifact@v3"
+        uses: "actions/upload-artifact@v4"
         with:
           name: "python-client-docs.tar"
           path: "pulp_python/python-python-client-docs.tar"
           if-no-files-found: "error"
       - name: "Upload ruby client packages"
-        uses: "actions/upload-artifact@v3"
+        uses: "actions/upload-artifact@v4"
         with:
           name: "ruby-client.tar"
           path: "pulp_python/python-ruby-client.tar"
@@ -115,7 +115,7 @@ jobs:
           tar -cvf docs/docs.tar docs/_build
 
       - name: "Upload built docs"
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: "docs.tar"
           path: "pulp_python/docs/docs.tar"
@@ -145,12 +145,12 @@ jobs:
           fetch-depth: 1
           path: "pulp_python"
 
-      - uses: "actions/download-artifact@v3"
+      - uses: "actions/download-artifact@v4"
         with:
           name: "plugin_package"
           path: "pulp_python/dist/"
 
-      - uses: "actions/setup-python@v4"
+      - uses: "actions/setup-python@v5"
         with:
           python-version: "3.11"
 
@@ -184,7 +184,7 @@ jobs:
           path: "pulp_python"
 
       - name: "Download Python client"
-        uses: "actions/download-artifact@v3"
+        uses: "actions/download-artifact@v4"
         with:
           name: "python-client.tar"
           path: "pulp_python/"
@@ -193,7 +193,7 @@ jobs:
         run: |
           tar -xvf python-python-client.tar
 
-      - uses: "actions/setup-python@v4"
+      - uses: "actions/setup-python@v5"
         with:
           python-version: "3.11"
 
@@ -227,7 +227,7 @@ jobs:
           path: "pulp_python"
 
       - name: "Download Ruby client"
-        uses: "actions/download-artifact@v3"
+        uses: "actions/download-artifact@v4"
         with:
           name: "ruby-client.tar"
           path: "pulp_python/"
@@ -263,7 +263,7 @@ jobs:
           fetch-depth: 1
           path: "pulp_python"
 
-      - uses: "actions/setup-python@v4"
+      - uses: "actions/setup-python@v5"
         with:
           python-version: "3.11"
 
@@ -280,13 +280,13 @@ jobs:
           SECRETS_CONTEXT: "${{ toJson(secrets) }}"
 
       - name: "Download built docs"
-        uses: "actions/download-artifact@v3"
+        uses: "actions/download-artifact@v4"
         with:
           name: "docs.tar"
           path: "pulp_python/"
 
       - name: "Download Python client docs"
-        uses: "actions/download-artifact@v3"
+        uses: "actions/download-artifact@v4"
         with:
           name: "python-client-docs.tar"
           path: "pulp_python/"
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -28,7 +28,7 @@ jobs:
           path: "pulp_python"
           token: ${{ secrets.RELEASE_TOKEN }}
 
-      - uses: "actions/setup-python@v4"
+      - uses: "actions/setup-python@v5"
         with:
           python-version: "3.11"
 
diff --git a/.github/workflows/scripts/install.sh b/.github/workflows/scripts/install.sh
@@ -81,7 +81,7 @@ cat >> vars/main.yaml << VARSYAML
 pulp_env: {}
 pulp_settings: {"allowed_export_paths": "/tmp", "allowed_import_paths": "/tmp", "orphan_protection_time": 0, "pypi_api_hostname": "https://pulp:443"}
 pulp_scheme: https
-pulp_default_container: ghcr.io/pulp/pulp-ci-centos:latest
+pulp_default_container: ghcr.io/pulp/pulp-ci-centos9:latest
 VARSYAML
 
 if [ "$TEST" = "s3" ]; then
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -39,11 +39,11 @@ jobs:
           repository: "pulp/pulp-openapi-generator"
           path: "pulp-openapi-generator"
 
-      - uses: "actions/setup-python@v4"
+      - uses: "actions/setup-python@v5"
         with:
           python-version: "3.11"
 
-      - uses: "actions/download-artifact@v3"
+      - uses: "actions/download-artifact@v4"
         with:
           name: "plugin_package"
           path: "pulp_python/dist/"
@@ -119,15 +119,15 @@ jobs:
           docker logs pulp 2>&1 | grep -i pulpcore.deprecation | tee deprecations-${{ matrix.env.TEST }}.txt
 
       - name: "Upload Deprecations"
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: "deprecations"
+          name: "deprecations-${{ matrix.env.TEST }}"
           path: "pulp_python/deprecations-${{ matrix.env.TEST }}.txt"
           if-no-files-found: "error"
           retention-days: 5
       - name: Upload python client packages
         if: ${{ env.TEST == 'pulp' }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: "python-client.tar"
           path: "pulp_python/python-python-client.tar"
@@ -136,23 +136,23 @@ jobs:
 
       - name: Upload python client docs
         if: ${{ env.TEST == 'pulp' }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: "python-client-docs.tar"
           path: "pulp_python/python-python-client-docs.tar"
           if-no-files-found: "error"
           retention-days: 5
       - name: Upload Ruby client
         if: ${{ env.TEST == 'pulp' }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: "ruby-client.tar"
           path: "pulp_python/python-ruby-client.tar"
           if-no-files-found: "error"
           retention-days: 5
       - name: Upload built docs
         if: ${{ env.TEST == 'docs' }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: "docs.tar"
           path: "pulp_python/docs/docs.tar"
diff --git a/.github/workflows/update-labels.yml b/.github/workflows/update-labels.yml
@@ -19,7 +19,7 @@ jobs:
   update_backport_labels:
     runs-on: "ubuntu-latest"
     steps:
-      - uses: "actions/setup-python@v4"
+      - uses: "actions/setup-python@v5"
         with:
           python-version: "3.11"
       - name: "Configure Git with pulpbot name and email"
diff --git a/.github/workflows/update_ci.yml b/.github/workflows/update_ci.yml
@@ -29,7 +29,7 @@ jobs:
           repository: "pulp/plugin_template"
           path: "plugin_template"
 
-      - uses: "actions/setup-python@v4"
+      - uses: "actions/setup-python@v5"
         with:
           python-version: "3.11"
 
diff --git a/setup.py b/setup.py
@@ -15,7 +15,7 @@
     long_description=long_description,
     long_description_content_type="text/markdown",
     license="GPLv2+",
-    python_requires=">=3.8",
+    python_requires=">=3.9",
     author="Pulp Project Developers",
     author_email="pulp-list@redhat.com",
     url="https://www.pulpproject.org",
@@ -29,7 +29,6 @@
         "Framework :: Django",
         "Programming Language :: Python",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
     ),
     entry_points={"pulpcore.plugin": ["pulp_python = pulp_python:default_app_config", ]},
diff --git a/template_config.yml b/template_config.yml
@@ -9,7 +9,7 @@ check_commit_message: true
 check_gettext: true
 check_manifest: true
 check_stray_pulpcore_imports: true
-ci_base_image: ghcr.io/pulp/pulp-ci-centos
+ci_base_image: ghcr.io/pulp/pulp-ci-centos9
 ci_env: {}
 ci_trigger: '{pull_request: {branches: [''*'']}}'
 ci_update_docs: false

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-2021.08.26-327-g6a0d984`
	`1`	`+2021.08.26-330-g0b7d0c1`