diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 9fa613b966..f006699d01 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 3.42.0.dev +current_version = 3.43.0.dev commit = False tag = False parse = (?P\d+)\.(?P\d+)\.(?P\d+)(\.(?P[a-z]+))? diff --git a/.github/template_gitref b/.github/template_gitref index 99cbe10009..eefaa803c7 100644 --- a/.github/template_gitref +++ b/.github/template_gitref @@ -1 +1 @@ -2021.08.26-278-g22c5b00 +2021.08.26-282-g53132bb diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 995bc1fa0b..6d75d3fbcf 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,14 +19,14 @@ jobs: runs-on: "ubuntu-latest" steps: - - uses: actions/checkout@v4 + - uses: "actions/checkout@v4" with: fetch-depth: 1 path: "pulpcore" - - uses: actions/setup-python@v4 + - uses: "actions/setup-python@v4" with: python-version: "3.8" - - name: Install python dependencies + - name: "Install python dependencies" run: | echo ::group::PYDEPS pip install packaging wheel diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index 092eba4b5f..9610b40ba7 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -6,53 +6,53 @@ # For more info visit https://github.com/pulp/plugin_template --- -name: Core changelog update +name: "Core changelog update" on: push: branches: - - main + - "main" paths: - - CHANGES.rst - - CHANGES.md + - "CHANGES.rst" + - "CHANGES.md" workflow_dispatch: jobs: update-changelog: - runs-on: ubuntu-latest + runs-on: "ubuntu-latest" strategy: fail-fast: false steps: - - uses: actions/checkout@v4 + - uses: "actions/checkout@v4" with: fetch-depth: 1 - - uses: actions/setup-python@v4 + - uses: "actions/setup-python@v4" with: python-version: "3.8" - - name: Install python dependencies + - name: "Install python dependencies" run: | echo ::group::PYDEPS pip install -r doc_requirements.txt echo ::endgroup:: - - name: Fake api schema + - name: "Fake api schema" run: | mkdir -p docs/_build/html echo "{}" > docs/_build/html/api.json mkdir -p docs/_static echo "{}" > docs/_static/api.json - - name: + - name: "Build Docs" run: | - pip install "Jinja2<3.1" make diagrams html - working-directory: ./docs + working-directory: "./docs" env: PULP_CONTENT_ORIGIN: "http://localhost/" - - name: Publish changlog to pulpproject.org - run: .github/workflows/scripts/publish_docs.sh changelog ${GITHUB_REF##*/} + - name: "Publish changlog to pulpproject.org" + run: | + .github/workflows/scripts/publish_docs.sh changelog ${GITHUB_REF##*/} env: - PULP_DOCS_KEY: ${{ secrets.PULP_DOCS_KEY }} + PULP_DOCS_KEY: "${{ secrets.PULP_DOCS_KEY }}" diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 722743c4d5..54771a8009 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,7 +6,7 @@ # For more info visit https://github.com/pulp/plugin_template --- -name: Core CI +name: "Core CI" on: {pull_request: {branches: ['*']}} concurrency: @@ -18,59 +18,60 @@ defaults: working-directory: "pulpcore" jobs: - ready-to-ship: - runs-on: ubuntu-latest + runs-on: "ubuntu-latest" steps: - - uses: actions/checkout@v4 + - uses: "actions/checkout@v4" with: fetch-depth: 0 path: "pulpcore" - - uses: actions/setup-python@v4 + - uses: "actions/setup-python@v4" with: python-version: "3.8" - - name: Install requirements - run: pip3 install github - - name: Check commit message + - name: "Install python dependencies" + run: | + echo ::group::PYDEPS + pip install requests pygithub + echo ::endgroup:: + - name: "Check commit message" if: github.event_name == 'pull_request' env: - PY_COLORS: '1' - ANSIBLE_FORCE_COLOR: '1' - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - GITHUB_CONTEXT: ${{ github.event.pull_request.commits_url }} - run: sh .github/workflows/scripts/check_commit.sh - - name: Verify requirements files - run: python .ci/scripts/check_requirements.py + PY_COLORS: "1" + ANSIBLE_FORCE_COLOR: "1" + GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" + GITHUB_CONTEXT: "${{ github.event.pull_request.commits_url }}" + run: | + .github/workflows/scripts/check_commit.sh + - name: "Verify requirements files" + run: | + python .ci/scripts/check_requirements.py lint: uses: "./.github/workflows/lint.yml" build: - needs: lint + needs: "lint" uses: "./.github/workflows/build.yml" test: - needs: build + needs: "build" uses: "./.github/workflows/test.yml" deprecations: - defaults: - run: - working-directory: "." - runs-on: ubuntu-latest + runs-on: "ubuntu-latest" if: github.base_ref == 'main' - needs: test + needs: "test" steps: - - name: Fail on deprecations + - name: "Create working directory" run: | - test -z "${{ needs.test.outputs.deprecations-pulp }}" - test -z "${{ needs.test.outputs.deprecations-azure }}" - test -z "${{ needs.test.outputs.deprecations-s3 }}" - test -z "${{ needs.test.outputs.deprecations-lowerbounds }}" - - name: Print deprecations - if: failure() + mkdir -p "pulpcore" + working-directory: "." + - name: "Download Deprecations" + uses: actions/download-artifact@v3 + with: + name: "deprecations" + path: "pulpcore" + - name: "Print deprecations" run: | - echo "${{ needs.test.outputs.deprecations-pulp }}" | base64 -d - echo "${{ needs.test.outputs.deprecations-azure }}" | base64 -d - echo "${{ needs.test.outputs.deprecations-s3 }}" | base64 -d - echo "${{ needs.test.outputs.deprecations-lowerbounds }}" | base64 -d + cat deprecations-*.txt | sort -u + ! cat deprecations-*.txt | grep '[^[:space:]]' diff --git a/.github/workflows/create-branch.yml b/.github/workflows/create-branch.yml index a2f064c5e2..8d8a58d22c 100644 --- a/.github/workflows/create-branch.yml +++ b/.github/workflows/create-branch.yml @@ -21,26 +21,27 @@ jobs: fail-fast: false steps: - - uses: actions/checkout@v4 + - uses: "actions/checkout@v4" with: fetch-depth: 0 path: "pulpcore" - - uses: actions/setup-python@v4 + - uses: "actions/setup-python@v4" with: python-version: "3.8" - - name: Install python dependencies + - name: "Install python dependencies" run: | echo ::group::PYDEPS pip install bump2version jinja2 pyyaml echo ::endgroup:: - - name: Setting secrets - working-directory: pulpcore - run: python3 .github/workflows/scripts/secrets.py "$SECRETS_CONTEXT" + - name: "Setting secrets" + working-directory: "pulpcore" + run: | + python3 .github/workflows/scripts/secrets.py "$SECRETS_CONTEXT" env: - SECRETS_CONTEXT: ${{ toJson(secrets) }} + SECRETS_CONTEXT: "${{ toJson(secrets) }}" - name: Determine new branch name working-directory: pulpcore diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index c415f972ee..9d20c8c498 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -19,18 +19,20 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: "actions/checkout@v4" with: fetch-depth: 1 path: "pulpcore" - - uses: actions/setup-python@v4 + - 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 + - name: "Install python dependencies" + run: | + echo ::group::PYDEPS + pip install -r lint_requirements.txt + echo ::endgroup:: - name: Lint workflow files run: | diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index cca2a24595..848163431f 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -33,22 +33,22 @@ jobs: changelog: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: "actions/checkout@v4" with: fetch-depth: 0 path: "pulpcore" - - uses: actions/setup-python@v4 + - uses: "actions/setup-python@v4" with: python-version: "3.11" - - name: Install python dependencies + - name: "Install python dependencies" run: | echo ::group::PYDEPS pip install gitpython toml echo ::endgroup:: - - name: Configure Git with pulpbot name and email + - name: "Configure Git with pulpbot name and email" run: | git config --global user.name 'pulpbot' git config --global user.email 'pulp-infra@redhat.com' @@ -71,7 +71,7 @@ jobs: needs: test steps: - - uses: actions/checkout@v4 + - uses: "actions/checkout@v4" with: fetch-depth: 1 path: "pulpcore" @@ -81,17 +81,17 @@ jobs: name: "plugin_package" path: "pulpcore/dist/" - - uses: actions/setup-python@v4 + - uses: "actions/setup-python@v4" with: python-version: "3.8" - - name: Install python dependencies + - name: "Install python dependencies" run: | echo ::group::PYDEPS - pip install requests + pip install requests packaging~=21.3 mkdocs pymdown-extensions Jinja2<3.1 echo ::endgroup:: - - name: Set environment variables + - name: "Set environment variables" run: | echo "TEST=${{ matrix.env.TEST }}" >> $GITHUB_ENV @@ -107,24 +107,13 @@ jobs: name: "python-client-docs.tar" path: "pulpcore" - - name: Setting secrets - run: python3 .github/workflows/scripts/secrets.py "$SECRETS_CONTEXT" + - name: "Setting secrets" + run: | + python3 .github/workflows/scripts/secrets.py "$SECRETS_CONTEXT" env: - SECRETS_CONTEXT: ${{ toJson(secrets) }} + SECRETS_CONTEXT: "${{ toJson(secrets) }}" - name: Publish docs to pulpproject.org run: | tar -xvf docs.tar -C ./docs .github/workflows/scripts/publish_docs.sh nightly ${GITHUB_REF##*/} - - - 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" diff --git a/.github/workflows/pr_checks.yml b/.github/workflows/pr_checks.yml index fe9fe7b4ca..6267ab526a 100644 --- a/.github/workflows/pr_checks.yml +++ b/.github/workflows/pr_checks.yml @@ -26,7 +26,7 @@ jobs: permissions: pull-requests: write steps: - - uses: actions/checkout@v4 + - uses: "actions/checkout@v4" with: fetch-depth: 0 - name: Commit Count Check diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f37130608b..741cb2e7ee 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -25,30 +25,31 @@ jobs: fail-fast: false steps: - - uses: actions/checkout@v4 + - uses: "actions/checkout@v4" with: fetch-depth: 0 path: "pulpcore" - - uses: actions/setup-python@v4 + - uses: "actions/setup-python@v4" with: python-version: "3.8" - - name: Install python dependencies + - name: "Install python dependencies" run: | echo ::group::PYDEPS - pip install packaging~=21.3 bump2version gitpython towncrier==19.9.0 wheel requests + pip install packaging~=21.3 bump2version gitpython towncrier wheel requests echo ::endgroup:: - - name: Configure Git with pulpbot name and email + - name: "Configure Git with pulpbot name and email" run: | git config --global user.name 'pulpbot' git config --global user.email 'pulp-infra@redhat.com' - - name: Setting secrets - run: python3 .github/workflows/scripts/secrets.py "$SECRETS_CONTEXT" + - name: "Setting secrets" + run: | + python3 .github/workflows/scripts/secrets.py "$SECRETS_CONTEXT" env: - SECRETS_CONTEXT: ${{ toJson(secrets) }} + SECRETS_CONTEXT: "${{ toJson(secrets) }}" - name: Create the release commit, tag it, create a post-release commit, and build plugin package run: python .github/workflows/scripts/release.py ${{ github.event.inputs.release }} @@ -77,13 +78,13 @@ jobs: name: "pulpcore.tar" path: "pulpcore/" - - uses: actions/checkout@v4 + - uses: "actions/checkout@v4" with: fetch-depth: 1 repository: "pulp/pulp-openapi-generator" path: "pulp-openapi-generator" - - uses: actions/setup-python@v4 + - uses: "actions/setup-python@v4" with: python-version: "3.8" - uses: ruby/setup-ruby@v1 @@ -94,41 +95,44 @@ jobs: run: | tar -xf pulpcore.tar - - name: Install httpie + - name: "Install python dependencies" run: | - echo ::group::HTTPIE - pip install httpie - echo ::endgroup:: + echo ::group::PYDEPS + pip install towncrier twine wheel httpie docker netaddr boto3 ansible echo "HTTPIE_CONFIG_DIR=$GITHUB_WORKSPACE/pulpcore/.ci/assets/httpie/" >> $GITHUB_ENV + echo ::endgroup:: # Building the bindings and docs requires accessing the OpenAPI specs endpoint, so we need to # setup the Pulp instance. - - name: Before Install - run: .github/workflows/scripts/before_install.sh - shell: bash + - name: "Before Install" + run: | + .github/workflows/scripts/before_install.sh + shell: "bash" env: - PY_COLORS: '1' - ANSIBLE_FORCE_COLOR: '1' - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - GITHUB_CONTEXT: ${{ github.event.pull_request.commits_url }} + PY_COLORS: "1" + ANSIBLE_FORCE_COLOR: "1" + GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" + GITHUB_CONTEXT: "${{ github.event.pull_request.commits_url }}" - name: Install run: | export PLUGIN_VERSION=${{ github.event.inputs.release }} .github/workflows/scripts/install.sh env: - PY_COLORS: '1' - ANSIBLE_FORCE_COLOR: '1' - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - GITHUB_CONTEXT: ${{ github.event.pull_request.commits_url }} + PY_COLORS: "1" + ANSIBLE_FORCE_COLOR: "1" + GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" + GITHUB_CONTEXT: "${{ github.event.pull_request.commits_url }}" shell: bash - - name: Install Python client - run: .github/workflows/scripts/install_python_client.sh - shell: bash - - name: Install Ruby client - run: .github/workflows/scripts/install_ruby_client.sh - shell: bash + - name: "Install Python client" + run: | + .github/workflows/scripts/install_python_client.sh + shell: "bash" + - name: "Install Ruby client" + run: | + .github/workflows/scripts/install_ruby_client.sh + shell: "bash" - name: "Upload python client packages" uses: actions/upload-artifact@v3 with: @@ -180,7 +184,7 @@ jobs: name: "docs.tar" path: "pulpcore/docs/docs.tar" - - name: Logs + - name: "Logs" if: always() run: | echo "Need to debug? Please check: https://github.com/marketplace/actions/debugging-with-tmate" @@ -207,7 +211,7 @@ jobs: name: "pulpcore.tar" path: "pulpcore/" - - uses: actions/setup-python@v4 + - uses: "actions/setup-python@v4" with: python-version: "3.8" @@ -215,7 +219,7 @@ jobs: with: ruby-version: "2.6" - - name: Configure Git with pulpbot name and email + - name: "Configure Git with pulpbot name and email" run: | git config --global user.name 'pulpbot' git config --global user.email 'pulp-infra@redhat.com' @@ -224,15 +228,16 @@ jobs: run: | tar -xf pulpcore.tar - - name: Setting secrets - run: python3 .github/workflows/scripts/secrets.py "$SECRETS_CONTEXT" + - name: "Setting secrets" + run: | + python3 .github/workflows/scripts/secrets.py "$SECRETS_CONTEXT" env: - SECRETS_CONTEXT: ${{ toJson(secrets) }} + SECRETS_CONTEXT: "${{ toJson(secrets) }}" - - name: Install python dependencies + - name: "Install python dependencies" run: | echo ::group::PYDEPS - pip install gitpython requests packaging~=21.3 + pip install twine gitpython requests packaging~=21.3 mkdocs pymdown-extensions Jinja2<3.1 echo ::endgroup:: - name: Push branch and tag to GitHub diff --git a/.github/workflows/scripts/before_install.sh b/.github/workflows/scripts/before_install.sh index 577edf3193..a3c2a31a40 100755 --- a/.github/workflows/scripts/before_install.sh +++ b/.github/workflows/scripts/before_install.sh @@ -55,9 +55,6 @@ then echo $COMMIT_MSG | sed -n -e 's/.*CI Base Image:\s*\([-_/[:alnum:]]*:[-_[:alnum:]]*\).*/ci_base: "\1"/p' >> .ci/ansible/vars/main.yaml fi -# Intall requirements for ansible playbooks -pip install docker netaddr boto3 ansible - for i in {1..3} do ansible-galaxy collection install "amazon.aws:1.5.0" && s=0 && break || s=$? && sleep 3 diff --git a/.github/workflows/scripts/check_commit.sh b/.github/workflows/scripts/check_commit.sh index 20b8b94b75..76bf6cf796 100755 --- a/.github/workflows/scripts/check_commit.sh +++ b/.github/workflows/scripts/check_commit.sh @@ -8,20 +8,13 @@ # For more info visit https://github.com/pulp/plugin_template # make sure this script runs at the repo root -cd "$(dirname "$(realpath -e "$0")")"/../../.. +cd "$(dirname "$(realpath -e "$0")")/../../.." set -euv -echo ::group::REQUESTS -pip3 install requests - -pip3 install pygithub - -echo ::endgroup:: - -for sha in $(curl -H "Authorization: token $GITHUB_TOKEN" $GITHUB_CONTEXT | jq '.[].sha' | sed 's/"//g') +for SHA in $(curl -H "Authorization: token $GITHUB_TOKEN" "$GITHUB_CONTEXT" | jq -r '.[].sha') do - python3 .ci/scripts/validate_commit_message.py $sha + python3 .ci/scripts/validate_commit_message.py "$SHA" VALUE=$? if [ "$VALUE" -gt 0 ]; then exit $VALUE diff --git a/.github/workflows/scripts/install_python_client.sh b/.github/workflows/scripts/install_python_client.sh index 111179a57c..b24818af3e 100755 --- a/.github/workflows/scripts/install_python_client.sh +++ b/.github/workflows/scripts/install_python_client.sh @@ -16,8 +16,6 @@ source .github/workflows/scripts/utils.sh export PULP_URL="${PULP_URL:-https://pulp}" -pip install twine wheel - REPORTED_STATUS="$(pulp status)" REPORTED_VERSION="$(echo "$REPORTED_STATUS" | jq --arg plugin "core" -r '.versions[] | select(.component == $plugin) | .version')" VERSION="$(echo "$REPORTED_VERSION" | python -c 'from packaging.version import Version; print(Version(input()))')" diff --git a/.github/workflows/scripts/publish_client_pypi.sh b/.github/workflows/scripts/publish_client_pypi.sh index 8981d5895e..bf74709186 100755 --- a/.github/workflows/scripts/publish_client_pypi.sh +++ b/.github/workflows/scripts/publish_client_pypi.sh @@ -12,8 +12,6 @@ set -euv # make sure this script runs at the repo root cd "$(dirname "$(realpath -e "$0")")/../../.." -pip install twine - VERSION="$(ls dist | sed -rn 's/pulpcore-client-(.*)\.tar.gz/\1/p')" if [[ -z "$VERSION" ]]; then diff --git a/.github/workflows/scripts/publish_docs.sh b/.github/workflows/scripts/publish_docs.sh index f9aa23d2e4..c93812f89e 100755 --- a/.github/workflows/scripts/publish_docs.sh +++ b/.github/workflows/scripts/publish_docs.sh @@ -20,8 +20,6 @@ echo "$PULP_DOCS_KEY" > ~/.ssh/pulp-infra echo "docs.pulpproject.org,8.43.85.236 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBGXG+8vjSQvnAkq33i0XWgpSrbco3rRqNZr0SfVeiqFI7RN/VznwXMioDDhc+hQtgVhd6TYBOrV07IMcKj+FAzg=" >> ~/.ssh/known_hosts chmod 644 ~/.ssh/known_hosts -pip3 install packaging - export PYTHONUNBUFFERED=1 export DJANGO_SETTINGS_MODULE=pulpcore.app.settings export PULP_SETTINGS=$PWD/.ci/ansible/settings/settings.py @@ -38,8 +36,6 @@ if [[ "$GITHUB_WORKFLOW" == "Core changelog update" ]]; then exit fi -pip install mkdocs pymdown-extensions "Jinja2<3.1" - mkdir -p ../core-bindings tar -xvf core-python-client-docs.tar --directory ../core-bindings pushd ../core-bindings diff --git a/.github/workflows/scripts/publish_plugin_pypi.sh b/.github/workflows/scripts/publish_plugin_pypi.sh index c67c2f571f..da9b6111dd 100755 --- a/.github/workflows/scripts/publish_plugin_pypi.sh +++ b/.github/workflows/scripts/publish_plugin_pypi.sh @@ -19,8 +19,6 @@ then exit fi -pip install twine - twine check dist/pulpcore-$1-py3-none-any.whl || exit 1 twine check dist/pulpcore-$1.tar.gz || exit 1 twine upload dist/pulpcore-$1-py3-none-any.whl -u pulp -p $PYPI_PASSWORD diff --git a/.github/workflows/scripts/script.sh b/.github/workflows/scripts/script.sh index d6dba44033..da1bd0f5a4 100755 --- a/.github/workflows/scripts/script.sh +++ b/.github/workflows/scripts/script.sh @@ -29,7 +29,6 @@ export PULP_URL="https://pulp" if [[ "$TEST" = "docs" ]]; then if [[ "$GITHUB_WORKFLOW" == "Core CI" ]]; then - pip install towncrier==19.9.0 towncrier --yes --version 4.0.0.ci fi cd docs diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 4c6f760584..91ab3db010 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -26,25 +26,20 @@ jobs: - 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 + - uses: "actions/checkout@v4" with: fetch-depth: 1 path: "pulpcore" - - uses: actions/checkout@v4 + - uses: "actions/checkout@v4" with: fetch-depth: 1 repository: "pulp/pulp-openapi-generator" path: "pulp-openapi-generator" - - uses: actions/setup-python@v4 + - uses: "actions/setup-python@v4" with: python-version: "3.8" @@ -53,69 +48,83 @@ jobs: name: "plugin_package" path: "pulpcore/dist/" - - name: Install httpie + - name: "Install python dependencies" run: | - echo ::group::HTTPIE - pip install httpie - echo ::endgroup:: + echo ::group::PYDEPS + pip install towncrier twine wheel httpie docker netaddr boto3 ansible echo "HTTPIE_CONFIG_DIR=$GITHUB_WORKSPACE/pulpcore/.ci/assets/httpie/" >> $GITHUB_ENV + echo ::endgroup:: - - name: Set environment variables + - name: "Set environment variables" run: | echo "TEST=${{ matrix.env.TEST }}" >> $GITHUB_ENV - - name: Before Install - run: .github/workflows/scripts/before_install.sh - shell: bash + - name: "Before Install" + run: | + .github/workflows/scripts/before_install.sh + shell: "bash" env: - PY_COLORS: '1' - ANSIBLE_FORCE_COLOR: '1' - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - GITHUB_CONTEXT: ${{ github.event.pull_request.commits_url }} + PY_COLORS: "1" + ANSIBLE_FORCE_COLOR: "1" + GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" + GITHUB_CONTEXT: "${{ github.event.pull_request.commits_url }}" - uses: ruby/setup-ruby@v1 if: ${{ env.TEST == 'pulp' }} with: ruby-version: "2.6" - - name: Install - run: .github/workflows/scripts/install.sh - shell: bash + - name: "Install" + run: | + .github/workflows/scripts/install.sh + shell: "bash" env: - PY_COLORS: '1' - ANSIBLE_FORCE_COLOR: '1' - 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 + PY_COLORS: "1" + ANSIBLE_FORCE_COLOR: "1" + 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_TOKEN: ${{ secrets.GITHUB_TOKEN }} - GITHUB_CONTEXT: ${{ github.event.pull_request.commits_url }} - REDIS_DISABLED: ${{ contains('s3', matrix.env.TEST) }} - - - name: Install Python client - run: .github/workflows/scripts/install_python_client.sh - shell: bash - - name: Install Ruby client - if: ${{ env.TEST == 'pulp' }} - run: .github/workflows/scripts/install_ruby_client.sh - shell: bash + PY_COLORS: "1" + ANSIBLE_FORCE_COLOR: "1" + GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" + GITHUB_CONTEXT: "${{ github.event.pull_request.commits_url }}" + REDIS_DISABLED: "${{ contains('s3', matrix.env.TEST) }}" + + - name: "Install Python client" + run: | + .github/workflows/scripts/install_python_client.sh + shell: "bash" + - name: "Install Ruby client" + if: "${{ env.TEST == 'pulp' }}" + run: | + .github/workflows/scripts/install_ruby_client.sh + shell: "bash" - - name: Script - run: .github/workflows/scripts/script.sh - shell: bash + - name: "Script" + run: | + .github/workflows/scripts/script.sh + shell: "bash" env: - PY_COLORS: '1' - ANSIBLE_FORCE_COLOR: '1' - 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 + PY_COLORS: "1" + ANSIBLE_FORCE_COLOR: "1" + GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" + GITHUB_CONTEXT: "${{ github.event.pull_request.commits_url }}" + + - name: "Extract Deprecations from Logs" + run: | + docker logs pulp 2>&1 | grep -i pulpcore.deprecation | tee deprecations-${{ matrix.env.TEST }}.txt + + - name: "Upload Deprecations" + uses: actions/upload-artifact@v3 + with: + name: "deprecations" + path: "pulpcore/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 @@ -173,7 +182,7 @@ jobs: name: "docs.tar" path: "pulpcore/docs/docs.tar" - - name: Logs + - name: "Logs" if: always() run: | echo "Need to debug? Please check: https://github.com/marketplace/actions/debugging-with-tmate" diff --git a/.github/workflows/update-labels.yml b/.github/workflows/update-labels.yml index ab2b4da566..5cba5d3d75 100644 --- a/.github/workflows/update-labels.yml +++ b/.github/workflows/update-labels.yml @@ -17,16 +17,16 @@ on: jobs: update_backport_labels: - runs-on: ubuntu-latest + runs-on: "ubuntu-latest" steps: - - uses: actions/setup-python@v4 + - uses: "actions/setup-python@v4" with: python-version: "3.8" - - name: Configure Git with pulpbot name and email + - name: "Configure Git with pulpbot name and email" run: | git config --global user.name 'pulpbot' git config --global user.email 'pulp-infra@redhat.com' - - name: Install python dependencies + - name: "Install python dependencies" run: | echo ::group::PYDEPS pip install requests pyyaml @@ -36,4 +36,4 @@ jobs: run: | python3 .github/workflows/scripts/update_backport_labels.py env: - GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }} + GITHUB_TOKEN: "${{ secrets.RELEASE_TOKEN }}" diff --git a/.github/workflows/update_ci.yml b/.github/workflows/update_ci.yml index 8ae38ff1b1..cb1ba9ae21 100644 --- a/.github/workflows/update_ci.yml +++ b/.github/workflows/update_ci.yml @@ -7,7 +7,7 @@ --- -name: Core CI Update +name: "Core CI Update" on: schedule: # * is a special character in YAML so you have to quote this string @@ -17,216 +17,215 @@ on: jobs: update: - runs-on: ubuntu-latest + runs-on: "ubuntu-latest" strategy: fail-fast: false steps: - - uses: actions/checkout@v3 + - uses: "actions/checkout@v4" with: - repository: pulp/plugin_template - path: plugin_template - fetch-depth: 0 - - - uses: actions/setup-python@v4 + fetch-depth: 1 + repository: "pulp/plugin_template" + path: "plugin_template" + - uses: "actions/setup-python@v4" with: python-version: "3.8" - - name: Install python dependencies + - name: "Install python dependencies" run: | echo ::group::PYDEPS pip install gitpython requests packaging jinja2 pyyaml echo ::endgroup:: - - name: Configure Git with pulpbot name and email + - name: "Configure Git with pulpbot name and email" run: | git config --global user.name 'pulpbot' git config --global user.email 'pulp-infra@redhat.com' - - uses: actions/checkout@v3 + - uses: "actions/checkout@v4" with: - path: pulpcore - ref: 'main' fetch-depth: 0 + path: "pulpcore" + ref: "main" - - name: Run update - working-directory: pulpcore + - name: "Run update" + working-directory: "pulpcore" run: | ../plugin_template/scripts/update_ci.sh - - name: Create Pull Request for CI files - uses: peter-evans/create-pull-request@v4 - with: - token: ${{ secrets.RELEASE_TOKEN }} - path: pulpcore - committer: pulpbot - author: pulpbot - title: 'Update CI files for branch main' - body: '[noissue]' - branch: 'update-ci/main' - base: 'main' + - name: "Create Pull Request for CI files" + uses: "peter-evans/create-pull-request@v4" + with: + token: "${{ secrets.RELEASE_TOKEN }}" + path: "pulpcore" + committer: "pulpbot " + author: "pulpbot " + title: "Update CI files for branch main" + body: "" + branch: "update-ci/main" + base: "main" commit-message: | Update CI files [noissue] delete-branch: true - - uses: actions/checkout@v3 + - uses: "actions/checkout@v4" with: - path: pulpcore - ref: '3.18' fetch-depth: 0 + path: "pulpcore" + ref: "3.18" - - name: Run update - working-directory: pulpcore + - name: "Run update" + working-directory: "pulpcore" run: | ../plugin_template/scripts/update_ci.sh - - name: Create Pull Request for CI files - uses: peter-evans/create-pull-request@v4 - with: - token: ${{ secrets.RELEASE_TOKEN }} - path: pulpcore - committer: pulpbot - author: pulpbot - title: 'Update CI files for branch 3.18' - body: '[noissue]' - branch: 'update-ci/3.18' - base: '3.18' + - name: "Create Pull Request for CI files" + uses: "peter-evans/create-pull-request@v4" + with: + token: "${{ secrets.RELEASE_TOKEN }}" + path: "pulpcore" + committer: "pulpbot " + author: "pulpbot " + title: "Update CI files for branch 3.18" + body: "" + branch: "update-ci/3.18" + base: "3.18" commit-message: | Update CI files [noissue] delete-branch: true - - uses: actions/checkout@v3 + - uses: "actions/checkout@v4" with: - path: pulpcore - ref: '3.21' fetch-depth: 0 + path: "pulpcore" + ref: "3.21" - - name: Run update - working-directory: pulpcore + - name: "Run update" + working-directory: "pulpcore" run: | ../plugin_template/scripts/update_ci.sh - - name: Create Pull Request for CI files - uses: peter-evans/create-pull-request@v4 - with: - token: ${{ secrets.RELEASE_TOKEN }} - path: pulpcore - committer: pulpbot - author: pulpbot - title: 'Update CI files for branch 3.21' - body: '[noissue]' - branch: 'update-ci/3.21' - base: '3.21' + - name: "Create Pull Request for CI files" + uses: "peter-evans/create-pull-request@v4" + with: + token: "${{ secrets.RELEASE_TOKEN }}" + path: "pulpcore" + committer: "pulpbot " + author: "pulpbot " + title: "Update CI files for branch 3.21" + body: "" + branch: "update-ci/3.21" + base: "3.21" commit-message: | Update CI files [noissue] delete-branch: true - - uses: actions/checkout@v3 + - uses: "actions/checkout@v4" with: - path: pulpcore - ref: '3.22' fetch-depth: 0 + path: "pulpcore" + ref: "3.22" - - name: Run update - working-directory: pulpcore + - name: "Run update" + working-directory: "pulpcore" run: | ../plugin_template/scripts/update_ci.sh - - name: Create Pull Request for CI files - uses: peter-evans/create-pull-request@v4 - with: - token: ${{ secrets.RELEASE_TOKEN }} - path: pulpcore - committer: pulpbot - author: pulpbot - title: 'Update CI files for branch 3.22' - body: '[noissue]' - branch: 'update-ci/3.22' - base: '3.22' + - name: "Create Pull Request for CI files" + uses: "peter-evans/create-pull-request@v4" + with: + token: "${{ secrets.RELEASE_TOKEN }}" + path: "pulpcore" + committer: "pulpbot " + author: "pulpbot " + title: "Update CI files for branch 3.22" + body: "" + branch: "update-ci/3.22" + base: "3.22" commit-message: | Update CI files [noissue] delete-branch: true - - uses: actions/checkout@v3 + - uses: "actions/checkout@v4" with: - path: pulpcore - ref: '3.23' fetch-depth: 0 + path: "pulpcore" + ref: "3.23" - - name: Run update - working-directory: pulpcore + - name: "Run update" + working-directory: "pulpcore" run: | ../plugin_template/scripts/update_ci.sh - - name: Create Pull Request for CI files - uses: peter-evans/create-pull-request@v4 - with: - token: ${{ secrets.RELEASE_TOKEN }} - path: pulpcore - committer: pulpbot - author: pulpbot - title: 'Update CI files for branch 3.23' - body: '[noissue]' - branch: 'update-ci/3.23' - base: '3.23' + - name: "Create Pull Request for CI files" + uses: "peter-evans/create-pull-request@v4" + with: + token: "${{ secrets.RELEASE_TOKEN }}" + path: "pulpcore" + committer: "pulpbot " + author: "pulpbot " + title: "Update CI files for branch 3.23" + body: "" + branch: "update-ci/3.23" + base: "3.23" commit-message: | Update CI files [noissue] delete-branch: true - - uses: actions/checkout@v3 + - uses: "actions/checkout@v4" with: - path: pulpcore - ref: '3.39' fetch-depth: 0 + path: "pulpcore" + ref: "3.39" - - name: Run update - working-directory: pulpcore + - name: "Run update" + working-directory: "pulpcore" run: | ../plugin_template/scripts/update_ci.sh - - name: Create Pull Request for CI files - uses: peter-evans/create-pull-request@v4 - with: - token: ${{ secrets.RELEASE_TOKEN }} - path: pulpcore - committer: pulpbot - author: pulpbot - title: 'Update CI files for branch 3.39' - body: '[noissue]' - branch: 'update-ci/3.39' - base: '3.39' + - name: "Create Pull Request for CI files" + uses: "peter-evans/create-pull-request@v4" + with: + token: "${{ secrets.RELEASE_TOKEN }}" + path: "pulpcore" + committer: "pulpbot " + author: "pulpbot " + title: "Update CI files for branch 3.39" + body: "" + branch: "update-ci/3.39" + base: "3.39" commit-message: | Update CI files [noissue] delete-branch: true - - uses: actions/checkout@v3 + - uses: "actions/checkout@v4" with: - path: pulpcore - ref: '3.41' fetch-depth: 0 + path: "pulpcore" + ref: "3.42" - - name: Run update - working-directory: pulpcore + - name: "Run update" + working-directory: "pulpcore" run: | ../plugin_template/scripts/update_ci.sh - - name: Create Pull Request for CI files - uses: peter-evans/create-pull-request@v4 - with: - token: ${{ secrets.RELEASE_TOKEN }} - path: pulpcore - committer: pulpbot - author: pulpbot - title: 'Update CI files for branch 3.41' - body: '[noissue]' - branch: 'update-ci/3.41' - base: '3.41' + - name: "Create Pull Request for CI files" + uses: "peter-evans/create-pull-request@v4" + with: + token: "${{ secrets.RELEASE_TOKEN }}" + path: "pulpcore" + committer: "pulpbot " + author: "pulpbot " + title: "Update CI files for branch 3.42" + body: "" + branch: "update-ci/3.42" + base: "3.42" commit-message: | Update CI files diff --git a/CHANGES/3829.feature b/CHANGES/3829.feature deleted file mode 100644 index 08bfcccc4a..0000000000 --- a/CHANGES/3829.feature +++ /dev/null @@ -1 +0,0 @@ -Added instrumentation to content-app to track telemetry data. diff --git a/CHANGES/4724.bugfix b/CHANGES/4724.bugfix deleted file mode 100644 index f5de72e61d..0000000000 --- a/CHANGES/4724.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fixed that `pulp_file` presented its `python_package` as `pulp_file` instead of `pulp-file`. diff --git a/docs/conf.py b/docs/conf.py index 6c130c18d1..cfff5abdc7 100755 --- a/docs/conf.py +++ b/docs/conf.py @@ -75,9 +75,9 @@ # built documents. # # The short X.Y version. -version = "3.42.0.dev" +version = "3.43.0.dev" # The full version, including alpha/beta/rc tags. -release = "3.42.0.dev" +release = "3.43.0.dev" # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/pulp_file/app/__init__.py b/pulp_file/app/__init__.py index 69422cf44e..cb0be29922 100644 --- a/pulp_file/app/__init__.py +++ b/pulp_file/app/__init__.py @@ -8,6 +8,6 @@ class PulpFilePluginAppConfig(PulpPluginAppConfig): name = "pulp_file.app" label = "file" - version = "3.42.0.dev" + version = "3.43.0.dev" python_package_name = "pulp-file" # TODO Add python_module_name domain_compatible = True diff --git a/pulpcore/app/apps.py b/pulpcore/app/apps.py index 7dca8a19dd..b71563bc8e 100644 --- a/pulpcore/app/apps.py +++ b/pulpcore/app/apps.py @@ -239,7 +239,7 @@ class PulpAppConfig(PulpPluginAppConfig): label = "core" # The version of this app - version = "3.42.0.dev" + version = "3.43.0.dev" # The python package name providing this app python_package_name = "pulpcore" diff --git a/setup.py b/setup.py index 9bdefbbb0b..abbf304852 100644 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ setup( name="pulpcore", - version="3.42.0.dev", + version="3.43.0.dev", description="Pulp Django Application and Related Modules", long_description=long_description, long_description_content_type="text/markdown", diff --git a/template_config.yml b/template_config.yml index 5de1cbe814..3e08806e0e 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-274-g4418509 +# generated with plugin_template@2021.08.26-282-g53132bb additional_repos: [] api_root: /pulp/ @@ -18,7 +18,7 @@ ci_update_branches: - '3.22' - '3.23' - '3.39' -- '3.41' +- '3.42' ci_update_docs: true ci_update_release_behavior: replace-previous-version cli_package: pulp-cli