Bump minor version

[noissue]
gerrod3 · Nov 15, 2023 · aae2b4b · aae2b4b
1 parent e7c2bd0
commit aae2b4b
Show file tree

Hide file tree

Showing 26 changed files with 296 additions and 199 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 3.41.0.dev
+current_version = 3.42.0.dev
 commit = False
 tag = False
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\.(?P<release>[a-z]+))?

diff --git a/.github/template_gitref b/.github/template_gitref
@@ -1 +1 @@
-2021.08.26-251-g45d399d
+2021.08.26-255-g20bf8c0
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -0,0 +1,37 @@
+# WARNING: DO NOT EDIT!
+#
+# This file was generated by plugin_template, and is managed by it. Please use
+# './plugin-template --github pulpcore' to update this file.
+#
+# For more info visit https://github.com/pulp/plugin_template
+
+---
+name: Build
+on:
+  workflow_call:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 1
+      - uses: actions/setup-python@v4
+        with:
+          python-version: "3.8"
+      - name: Install python dependencies
+        run: |
+          echo ::group::PYDEPS
+          pip install packaging wheel
+          echo ::endgroup::
+      - name: Build package
+        run: python3 setup.py sdist bdist_wheel --python-tag py3
+      - name: 'Upload Package whl'
+        uses: actions/upload-artifact@v3
+        with:
+          name: plugin_package
+          path: dist/
+          if-no-files-found: error
+          retention-days: 5
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -40,170 +40,17 @@ jobs:
         run: sh .github/workflows/scripts/check_commit.sh
       - name: Verify requirements files
         run: python .ci/scripts/check_requirements.py
-  single_commit:
-    runs-on: ubuntu-latest
-    name: Assert single commit
-    if: github.base_ref == 'main'
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-      - name: Checkout main
-        run: git fetch origin main
-      - name: create local main branch
-        run: git branch main origin/main
-      - name: Commit Count Check
-        run: test `git log  --oneline --no-merges HEAD ^main  | wc -l ` = 1
 
   lint:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 1
-      - uses: actions/setup-python@v4
-        with:
-          python-version: "3.8"
-      # lint_requirements contains tools needed for flake8, etc.
-      - name: Install requirements
-        run: pip3 install -r lint_requirements.txt
-
-      # run black separately from flake8 to get a diff
-      - name: Run black
-        run: |
-          black --version
-          black --check --diff .
-
-      # Lint code.
-      - name: Run flake8
-        run: flake8
-
-      - name: Run extra lint checks
-        run: "[ ! -x .ci/scripts/extra_linting.sh ] || .ci/scripts/extra_linting.sh"
-
-      # check for any files unintentionally left out of MANIFEST.in
-      - name: Check manifest
-        run: check-manifest
-
-
+    uses: "./.github/workflows/lint.yml"
 
-      - name: Check for gettext problems
-        run: sh .ci/scripts/check_gettext.sh
-
-  test:
-    runs-on: ubuntu-latest
-    # run only after lint finishes
+  build:
     needs: lint
-    strategy:
-      fail-fast: false
-      matrix:
-        env:
-          - TEST: pulp
-          - TEST: docs
-          - TEST: azure
-          - TEST: s3
-          - TEST: lowerbounds
-    outputs:
-      deprecations-pulp: ${{ steps.deprecations.outputs.deprecations-pulp }}
-      deprecations-azure: ${{ steps.deprecations.outputs.deprecations-azure }}
-      deprecations-s3: ${{ steps.deprecations.outputs.deprecations-s3 }}
-      deprecations-lowerbounds: ${{ steps.deprecations.outputs.deprecations-lowerbounds }}
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 1
-
-      - uses: actions/setup-python@v4
-        with:
-          python-version: "3.8"
-
-      - name: Install httpie
-        run: |
-          echo ::group::HTTPIE
-          pip install httpie
-          echo ::endgroup::
-          echo "HTTPIE_CONFIG_DIR=$GITHUB_WORKSPACE/.ci/assets/httpie/" >> $GITHUB_ENV
-
-      - name: Set environment variables
-        run: |
-          echo "TEST=${{ matrix.env.TEST }}" >> $GITHUB_ENV
-
-      - name: Before Install
-        run: .github/workflows/scripts/before_install.sh
-        shell: bash
-        env:
-          PY_COLORS: '1'
-          ANSIBLE_FORCE_COLOR: '1'
-          GITHUB_PULL_REQUEST: ${{ github.event.number }}
-          GITHUB_PULL_REQUEST_BODY: ${{ github.event.pull_request.body }}
-          GITHUB_BRANCH: ${{ github.head_ref }}
-          GITHUB_REPO_SLUG: ${{ github.repository }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          GITHUB_CONTEXT: ${{ github.event.pull_request.commits_url }}
+    uses: "./.github/workflows/build.yml"
 
-      - name: Install
-        run: .github/workflows/scripts/install.sh
-        shell: bash
-        env:
-          PY_COLORS: '1'
-          ANSIBLE_FORCE_COLOR: '1'
-          GITHUB_PULL_REQUEST: ${{ github.event.number }}
-          GITHUB_PULL_REQUEST_BODY: ${{ github.event.pull_request.body }}
-          GITHUB_BRANCH: ${{ github.head_ref }}
-          GITHUB_REPO_SLUG: ${{ github.repository }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          GITHUB_CONTEXT: ${{ github.event.pull_request.commits_url }}
-
-      - name: Before Script
-        run: .github/workflows/scripts/before_script.sh
-        shell: bash
-        env:
-          PY_COLORS: '1'
-          ANSIBLE_FORCE_COLOR: '1'
-          GITHUB_PULL_REQUEST: ${{ github.event.number }}
-          GITHUB_PULL_REQUEST_BODY: ${{ github.event.pull_request.body }}
-          GITHUB_BRANCH: ${{ github.head_ref }}
-          GITHUB_REPO_SLUG: ${{ github.repository }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          GITHUB_CONTEXT: ${{ github.event.pull_request.commits_url }}
-          REDIS_DISABLED: ${{ contains('s3', matrix.env.TEST) }}
-
-      - name: Setting secrets
-        if: github.event_name != 'pull_request'
-        run: python3 .github/workflows/scripts/secrets.py "$SECRETS_CONTEXT"
-        env:
-          SECRETS_CONTEXT: ${{ toJson(secrets) }}
-
-      - name: Script
-        run: .github/workflows/scripts/script.sh
-        shell: bash
-        env:
-          PY_COLORS: '1'
-          ANSIBLE_FORCE_COLOR: '1'
-          GITHUB_PULL_REQUEST: ${{ github.event.number }}
-          GITHUB_PULL_REQUEST_BODY: ${{ github.event.pull_request.body }}
-          GITHUB_BRANCH: ${{ github.head_ref }}
-          GITHUB_REPO_SLUG: ${{ github.repository }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          GITHUB_CONTEXT: ${{ github.event.pull_request.commits_url }}
-
-      - name: Extract Deprecations from Logs
-        id: deprecations
-        run: echo deprecations-${{ matrix.env.TEST }}=$(docker logs pulp 2>&1 | grep -i pulpcore.deprecation | base64 -w 0) >> $GITHUB_OUTPUT
-
-      - name: Logs
-        if: always()
-        run: |
-          echo "Need to debug? Please check: https://github.com/marketplace/actions/debugging-with-tmate"
-          http --timeout 30 --check-status --pretty format --print hb "https://pulp${PULP_API_ROOT}api/v3/status/" || true
-          docker images || true
-          docker ps -a || true
-          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"
+  test:
+    needs: build
+    uses: "./.github/workflows/test.yml"
   deprecations:
     runs-on: ubuntu-latest
     if: github.base_ref == 'main'

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -0,0 +1,48 @@
+# WARNING: DO NOT EDIT!
+#
+# This file was generated by plugin_template, and is managed by it. Please use
+# './plugin-template --github pulpcore' to update this file.
+#
+# For more info visit https://github.com/pulp/plugin_template
+
+---
+name: Lint
+on:
+  workflow_call:
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 1
+      - uses: actions/setup-python@v4
+        with:
+          python-version: "3.8"
+      # lint_requirements contains tools needed for flake8, etc.
+      - name: Install requirements
+        run: pip3 install -r lint_requirements.txt
+
+      # run black separately from flake8 to get a diff
+      - name: Run black
+        run: |
+          black --version
+          black --check --diff .
+
+      # Lint code.
+      - name: Run flake8
+        run: flake8
+
+      - name: Run extra lint checks
+        run: "[ ! -x .ci/scripts/extra_linting.sh ] || .ci/scripts/extra_linting.sh"
+
+      # check for any files unintentionally left out of MANIFEST.in
+      - name: Check manifest
+        run: check-manifest
+
+
+
+      - name: Check for gettext problems
+        run: sh .ci/scripts/check_gettext.sh
diff --git a/.github/workflows/pr_checks.yml b/.github/workflows/pr_checks.yml
@@ -0,0 +1,55 @@
+# WARNING: DO NOT EDIT!
+#
+# This file was generated by plugin_template, and is managed by it. Please use
+# './plugin-template --github pulpcore' to update this file.
+#
+# For more info visit https://github.com/pulp/plugin_template
+
+---
+name: Pulpcore PR static checks
+on:
+  pull_request_target:
+    types: [opened, synchronize, reopened]
+
+# This workflow runs with elevated permissions.
+# Do not even think about running a single bit of code from the PR.
+# Static analysis should be fine however.
+
+concurrency:
+  group: ${{ github.ref_name }}-${{ github.workflow }}
+  cancel-in-progress: true
+
+jobs:
+  single_commit:
+    runs-on: ubuntu-latest
+    name: Label multiple commit PR
+    permissions:
+      pull-requests: write
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Commit Count Check
+        run: echo "COMMIT_COUNT=$(git log  --oneline --no-merges origin/${{ github.base_ref }}..${{ github.event.pull_request.head.sha }} | wc -l)" >> "$GITHUB_ENV"
+      - uses: actions/github-script@v7
+        with:
+          script: |
+            const { COMMIT_COUNT } = process.env
+            if (COMMIT_COUNT == 1)
+            {
+              github.rest.issues.removeLabel({
+                issue_number: context.issue.number,
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                name: ["multi-commit"]
+              })
+            }
+            else
+            {
+              github.rest.issues.addLabels({
+                issue_number: context.issue.number,
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                labels: ["multi-commit"]
+              })
+            }
diff --git a/.github/workflows/scripts/install.sh b/.github/workflows/scripts/install.sh
@@ -15,6 +15,9 @@ set -euv
 
 source .github/workflows/scripts/utils.sh
 
+PLUGIN_VERSION="$(sed -n -e 's/^\s*current_version\s*=\s*//p' .bumpversion.cfg | python -c 'from packaging.version import Version; print(Version(input()))')"
+PLUGIN_NAME="./pulpcore/dist/pulpcore-${PLUGIN_VERSION}-py3-none-any.whl"
+
 export PULP_API_ROOT="/pulp/"
 
 PIP_REQUIREMENTS=("pulp-cli")
@@ -34,11 +37,6 @@ fi
 
 cd .ci/ansible/
 
-if [[ "${RELEASE_WORKFLOW:-false}" == "true" ]]; then
-  PLUGIN_NAME=./pulpcore/dist/pulpcore-$PLUGIN_VERSION-py3-none-any.whl
-else
-  PLUGIN_NAME=./pulpcore
-fi
 cat >> vars/main.yaml << VARSYAML
 image:
   name: pulp