From 6577a79a79182421d14dd40f3507d3373ca12260 Mon Sep 17 00:00:00 2001 From: Andrew Crosby Date: Thu, 26 Aug 2021 13:07:46 -0400 Subject: [PATCH] Update to galaxy-importer==0.4.0 (#903) * Update to galaxy-importer==0.4.0 * Ran plugin-template config with galaxy-importer branch change No-Issue --- .github/template_gitref | 2 +- .github/workflows/ci.yml | 46 +++++++++-- .github/workflows/create-branch.yml | 3 + .github/workflows/nightly.yml | 92 +++++++++++++++++++-- .github/workflows/release.yml | 51 +++++++++++- .github/workflows/scripts/before_install.sh | 2 +- .github/workflows/scripts/install.sh | 2 +- requirements/requirements.common.txt | 18 +++- requirements/requirements.insights.txt | 18 +++- requirements/requirements.standalone.txt | 18 +++- setup.py | 2 +- template_config.yml | 3 +- 12 files changed, 227 insertions(+), 30 deletions(-) diff --git a/.github/template_gitref b/.github/template_gitref index aff44d14c2..4b38dafdc4 100644 --- a/.github/template_gitref +++ b/.github/template_gitref @@ -1 +1 @@ -2021.04.08-99-gd8b54c6 +2021.08.26-2-gadc06df diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dcb90e378b..a0917cafa7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,6 +4,7 @@ # './plugin-template --github galaxy_ng' to update this file. # # For more info visit https://github.com/pulp/plugin_template + --- name: Galaxy CI on: {pull_request: {branches: ['*']}, push: {branches: ['*']}} @@ -92,30 +93,60 @@ jobs: sudo apt-get update -yq sudo -E apt-get -yq --no-install-suggests --no-install-recommends install httpie echo ::endgroup:: - echo "HTTPIE_CONFIG_DIR=$GITHUB_WORKSPACE/.ci/assets/httpie/" >> $GITHUB_ENV echo "TEST=${{ matrix.env.TEST }}" >> $GITHUB_ENV + echo "HTTPIE_CONFIG_DIR=$GITHUB_WORKSPACE/.ci/assets/httpie/" >> $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 }} - name: Install + run: .github/workflows/scripts/install.sh + shell: bash env: PY_COLORS: '1' ANSIBLE_FORCE_COLOR: '1' - shell: bash + 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: Install Python client + run: .github/workflows/scripts/install_python_client.sh + shell: bash - name: Install Ruby client if: ${{ env.TEST == 'bindings' }} run: .github/workflows/scripts/install_ruby_client.sh + shell: bash - name: Before Script - run: | - .github/workflows/scripts/before_script.sh + + 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 }} - name: Setting secrets if: github.event_name != 'pull_request' @@ -124,13 +155,18 @@ jobs: SECRETS_CONTEXT: ${{ toJson(secrets) }} - name: Script + run: .github/workflows/scripts/script.sh shell: bash - # env vars useful for post_script.sh when present 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: After failure if: failure() diff --git a/.github/workflows/create-branch.yml b/.github/workflows/create-branch.yml index da2b94434f..387e937dd7 100644 --- a/.github/workflows/create-branch.yml +++ b/.github/workflows/create-branch.yml @@ -4,6 +4,7 @@ # './plugin-template --github galaxy_ng' to update this file. # # For more info visit https://github.com/pulp/plugin_template + --- name: Create New Release Branch on: @@ -41,6 +42,7 @@ jobs: echo ::endgroup:: - name: Setting secrets + run: python3 .github/workflows/scripts/secrets.py "$SECRETS_CONTEXT" env: SECRETS_CONTEXT: ${{ toJson(secrets) }} @@ -67,6 +69,7 @@ jobs: - name: Make a PR with version bump uses: peter-evans/create-pull-request@v3 with: + token: ${{ secrets.RELEASE_TOKEN }} committer: ansible author: ansible branch: minor-version-bump diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index fc4288f7aa..f1d8e11a36 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -4,6 +4,7 @@ # './plugin-template --github galaxy_ng' to update this file. # # For more info visit https://github.com/pulp/plugin_template + --- name: Galaxy Nightly CI/CD on: @@ -40,44 +41,85 @@ jobs: sudo apt-get update -yq sudo -E apt-get -yq --no-install-suggests --no-install-recommends install httpie echo ::endgroup:: - echo "HTTPIE_CONFIG_DIR=$GITHUB_WORKSPACE/.ci/assets/httpie/" >> $GITHUB_ENV echo "TEST=${{ matrix.env.TEST }}" >> $GITHUB_ENV + echo "HTTPIE_CONFIG_DIR=$GITHUB_WORKSPACE/.ci/assets/httpie/" >> $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: ruby/setup-ruby@v1 + - uses: actions/setup-ruby@v1 if: ${{ env.TEST == 'bindings' || env.TEST == 'generate-bindings' }} with: ruby-version: "2.6" - name: Install + run: .github/workflows/scripts/install.sh + shell: bash env: PY_COLORS: '1' ANSIBLE_FORCE_COLOR: '1' - shell: bash + 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 + + 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 }} - name: Setting secrets + run: python3 .github/workflows/scripts/secrets.py "$SECRETS_CONTEXT" env: SECRETS_CONTEXT: ${{ toJson(secrets) }} - name: Install Python client + run: .github/workflows/scripts/install_python_client.sh + shell: bash - name: Install Ruby client if: ${{ env.TEST == 'bindings' || env.TEST == 'generate-bindings' }} run: .github/workflows/scripts/install_ruby_client.sh + shell: bash - 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: Upload python client packages if: ${{ env.TEST == 'bindings' || env.TEST == 'generate-bindings' }} @@ -103,6 +145,7 @@ jobs: - name: After failure if: failure() run: | + echo "Need to debug? Please check: https://github.com/marketplace/actions/debugging-with-tmate" http --timeout 30 --check-status --pretty format --print hb http://pulp/pulp/api/v3/status/ || true docker images || true docker ps -a || true @@ -130,6 +173,7 @@ jobs: python-version: "3.8" - uses: actions/setup-ruby@v1 + with: ruby-version: "2.6" @@ -139,6 +183,7 @@ jobs: sudo apt-get update -yq sudo -E apt-get -yq --no-install-suggests --no-install-recommends install httpie echo ::endgroup:: + echo "TEST=${{ matrix.env.TEST }}" >> $GITHUB_ENV echo "HTTPIE_CONFIG_DIR=$GITHUB_WORKSPACE/.ci/assets/httpie/" >> $GITHUB_ENV - name: Install python dependencies @@ -148,27 +193,59 @@ jobs: echo ::endgroup:: - 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 }} - name: Install + run: .github/workflows/scripts/install.sh + shell: bash env: PY_COLORS: '1' ANSIBLE_FORCE_COLOR: '1' - shell: bash + 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: Install Python client + run: .github/workflows/scripts/install_python_client.sh + shell: bash - name: Install Ruby client - if: ${{ env.TEST == 'bindings' }} || env.TEST == 'generate-bindings' }} + if: ${{ env.TEST == 'bindings' || env.TEST == 'generate-bindings' }} run: .github/workflows/scripts/install_ruby_client.sh + shell: bash - 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 }} - name: Setting secrets + run: python3 .github/workflows/scripts/secrets.py "$SECRETS_CONTEXT" env: SECRETS_CONTEXT: ${{ toJson(secrets) }} @@ -182,6 +259,7 @@ jobs: - name: After failure if: failure() run: | + echo "Need to debug? Please check: https://github.com/marketplace/actions/debugging-with-tmate" http --timeout 30 --check-status --pretty format --print hb http://pulp/pulp/api/v3/status/ || true docker images || true docker ps -a || true diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index da379ea26d..6945a19706 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -4,6 +4,7 @@ # './plugin-template --github galaxy_ng' to update this file. # # For more info visit https://github.com/pulp/plugin_template + --- name: Release Pipeline on: @@ -51,6 +52,7 @@ jobs: git config --global user.email 'ansible-infra@redhat.com' - name: Setting secrets + run: python3 .github/workflows/scripts/secrets.py "$SECRETS_CONTEXT" env: SECRETS_CONTEXT: ${{ toJson(secrets) }} @@ -107,12 +109,22 @@ jobs: sudo apt-get update -yq sudo -E apt-get -yq --no-install-suggests --no-install-recommends install httpie echo ::endgroup:: - echo "HTTPIE_CONFIG_DIR=$GITHUB_WORKSPACE/.ci/assets/httpie/" >> $GITHUB_ENV echo "TEST=${{ matrix.env.TEST }}" >> $GITHUB_ENV + echo "HTTPIE_CONFIG_DIR=$GITHUB_WORKSPACE/.ci/assets/httpie/" >> $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 }} - name: Install run: | @@ -121,23 +133,43 @@ jobs: 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 }} shell: bash - name: Before Script - run: | - .github/workflows/scripts/before_script.sh + + 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 }} - name: Setting secrets + run: python3 .github/workflows/scripts/secrets.py "$SECRETS_CONTEXT" env: SECRETS_CONTEXT: ${{ toJson(secrets) }} - name: Install Python client + run: .github/workflows/scripts/install_python_client.sh + shell: bash - name: Install Ruby client if: ${{ env.TEST == 'bindings' || env.TEST == 'generate-bindings' }} run: .github/workflows/scripts/install_ruby_client.sh + shell: bash - name: Additional before_script run: ${{ github.event.inputs.before_script }} @@ -147,6 +179,15 @@ jobs: if: ${{ env.TEST != 'generate-bindings' }} 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: Upload python client packages if: ${{ env.TEST == 'bindings' || env.TEST == 'generate-bindings' }} @@ -172,6 +213,7 @@ jobs: - name: After failure if: failure() run: | + echo "Need to debug? Please check: https://github.com/marketplace/actions/debugging-with-tmate" http --timeout 30 --check-status --pretty format --print hb http://pulp/pulp/api/v3/status/ || true docker images || true docker ps -a || true @@ -199,6 +241,7 @@ jobs: python-version: "3.8" - uses: actions/setup-ruby@v1 + with: ruby-version: "2.6" @@ -222,6 +265,7 @@ jobs: git checkout "origin/${GITHUB_REF##*/}" -- .github - name: Setting secrets + run: python3 .github/workflows/scripts/secrets.py "$SECRETS_CONTEXT" env: SECRETS_CONTEXT: ${{ toJson(secrets) }} @@ -249,6 +293,7 @@ jobs: - name: Create Pull Request for Changelog uses: peter-evans/create-pull-request@v3 with: + token: ${{ secrets.RELEASE_TOKEN }} committer: ansible author: ansible branch: changelog/${{ github.event.inputs.release }} diff --git a/.github/workflows/scripts/before_install.sh b/.github/workflows/scripts/before_install.sh index 1600d29300..05c78bea82 100755 --- a/.github/workflows/scripts/before_install.sh +++ b/.github/workflows/scripts/before_install.sh @@ -142,7 +142,7 @@ fi cd .. -git clone --depth=1 https://github.com/ansible/galaxy-importer.git --branch v0.3.4 +git clone --depth=1 https://github.com/ansible/galaxy-importer.git --branch v0.4.0 cd galaxy-importer if [ -n "$GALAXY_IMPORTER_PR_NUMBER" ]; then diff --git a/.github/workflows/scripts/install.sh b/.github/workflows/scripts/install.sh index 100f7f468a..39a9821b64 100755 --- a/.github/workflows/scripts/install.sh +++ b/.github/workflows/scripts/install.sh @@ -41,7 +41,7 @@ fi if [ -e $REPO_ROOT/../galaxy-importer ]; then GALAXY_IMPORTER=./galaxy-importer else - GALAXY_IMPORTER=git+https://github.com/ansible/galaxy-importer.git@v0.3.4 + GALAXY_IMPORTER=git+https://github.com/ansible/galaxy-importer.git@v0.4.0 fi if [[ "$TEST" == "plugin-from-pypi" ]]; then PLUGIN_NAME=galaxy_ng diff --git a/requirements/requirements.common.txt b/requirements/requirements.common.txt index 56e3561ff5..2ffebe62d6 100644 --- a/requirements/requirements.common.txt +++ b/requirements/requirements.common.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with python 3.8 +# This file is autogenerated by pip-compile with python 3.9 # To update, run: # # pip-compile --output-file=requirements/requirements.common.txt setup.py @@ -12,6 +12,8 @@ aiohttp==3.7.4.post0 # via pulpcore aioredis==2.0.0a1 # via pulpcore +ansible-builder==1.0.1 + # via galaxy-importer ansible-core==2.11.0 # via galaxy-importer ansible-lint==5.0.8 @@ -31,6 +33,8 @@ attrs==21.2.0 # jsonschema backoff==1.10.0 # via pulpcore +bindep==2.9.0 + # via ansible-builder bleach==3.3.0 # via galaxy-importer bleach-allowlist==1.0.3 @@ -63,6 +67,8 @@ defusedxml==0.7.1 # via odfpy diff-match-patch==20200713 # via django-import-export +distro==1.6.0 + # via bindep django==2.2.24 # via # django-automated-logging @@ -76,7 +82,6 @@ django==2.2.24 # djangorestframework # drf-nested-routers # drf-spectacular - # galaxy-ng (setup.py) # pulpcore django-automated-logging==6.1.1 # via galaxy-ng (setup.py) @@ -125,7 +130,7 @@ flake8==3.9.2 # via galaxy-importer future==0.18.2 # via pyjwkest -galaxy-importer==0.3.4 +galaxy-importer==0.4.0 # via # galaxy-ng (setup.py) # pulp-ansible @@ -169,6 +174,10 @@ packaging==20.9 # ansible-lint # bleach # pulp-ansible +parsley==1.3 + # via bindep +pbr==5.6.0 + # via bindep prometheus-client==0.10.1 # via django-prometheus psycopg2==2.8.6 @@ -212,6 +221,7 @@ pytz==2021.1 # via django pyyaml==5.4.1 # via + # ansible-builder # ansible-core # ansible-lint # drf-spectacular @@ -227,6 +237,8 @@ requests==2.25.1 # via # galaxy-importer # pyjwkest +requirements-parser==0.2.0 + # via ansible-builder resolvelib==0.5.4 # via ansible-core rich==10.1.0 diff --git a/requirements/requirements.insights.txt b/requirements/requirements.insights.txt index 0425671b7a..26e742ad2d 100644 --- a/requirements/requirements.insights.txt +++ b/requirements/requirements.insights.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with python 3.8 +# This file is autogenerated by pip-compile with python 3.9 # To update, run: # # pip-compile --output-file=requirements/requirements.insights.txt requirements/requirements.insights.in setup.py @@ -12,6 +12,8 @@ aiohttp==3.7.4.post0 # via pulpcore aioredis==2.0.0a1 # via pulpcore +ansible-builder==1.0.1 + # via galaxy-importer ansible-core==2.11.0 # via galaxy-importer ansible-lint==5.0.8 @@ -33,6 +35,8 @@ attrs==21.2.0 # jsonschema backoff==1.10.0 # via pulpcore +bindep==2.9.0 + # via ansible-builder bleach==3.3.0 # via galaxy-importer bleach-allowlist==1.0.3 @@ -74,6 +78,8 @@ defusedxml==0.7.1 # via odfpy diff-match-patch==20200713 # via django-import-export +distro==1.6.0 + # via bindep django==2.2.24 # via # django-automated-logging @@ -88,7 +94,6 @@ django==2.2.24 # djangorestframework # drf-nested-routers # drf-spectacular - # galaxy-ng (setup.py) # pulpcore django-automated-logging==6.1.1 # via galaxy-ng (setup.py) @@ -139,7 +144,7 @@ flake8==3.9.2 # via galaxy-importer future==0.18.2 # via pyjwkest -galaxy-importer==0.3.4 +galaxy-importer==0.4.0 # via # galaxy-ng (setup.py) # pulp-ansible @@ -189,6 +194,10 @@ packaging==20.9 # ansible-lint # bleach # pulp-ansible +parsley==1.3 + # via bindep +pbr==5.6.0 + # via bindep prometheus-client==0.10.1 # via django-prometheus psycopg2==2.8.6 @@ -234,6 +243,7 @@ pytz==2021.1 # via django pyyaml==5.4.1 # via + # ansible-builder # ansible-core # ansible-lint # drf-spectacular @@ -249,6 +259,8 @@ requests==2.25.1 # via # galaxy-importer # pyjwkest +requirements-parser==0.2.0 + # via ansible-builder resolvelib==0.5.4 # via ansible-core rich==10.1.0 diff --git a/requirements/requirements.standalone.txt b/requirements/requirements.standalone.txt index 2cdb2cdf89..2d296fbc71 100644 --- a/requirements/requirements.standalone.txt +++ b/requirements/requirements.standalone.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with python 3.8 +# This file is autogenerated by pip-compile with python 3.9 # To update, run: # # pip-compile --output-file=requirements/requirements.standalone.txt requirements/requirements.standalone.in setup.py @@ -12,6 +12,8 @@ aiohttp==3.7.4.post0 # via pulpcore aioredis==2.0.0a1 # via pulpcore +ansible-builder==1.0.1 + # via galaxy-importer ansible-core==2.11.0 # via galaxy-importer ansible-lint==5.0.8 @@ -31,6 +33,8 @@ attrs==21.2.0 # jsonschema backoff==1.10.0 # via pulpcore +bindep==2.9.0 + # via ansible-builder bleach==3.3.0 # via galaxy-importer bleach-allowlist==1.0.3 @@ -63,6 +67,8 @@ defusedxml==0.7.1 # via odfpy diff-match-patch==20200713 # via django-import-export +distro==1.6.0 + # via bindep django==2.2.24 # via # django-automated-logging @@ -76,7 +82,6 @@ django==2.2.24 # djangorestframework # drf-nested-routers # drf-spectacular - # galaxy-ng (setup.py) # pulpcore django-automated-logging==6.1.1 # via @@ -127,7 +132,7 @@ flake8==3.9.2 # via galaxy-importer future==0.18.2 # via pyjwkest -galaxy-importer==0.3.4 +galaxy-importer==0.4.0 # via # galaxy-ng (setup.py) # pulp-ansible @@ -171,6 +176,10 @@ packaging==20.9 # ansible-lint # bleach # pulp-ansible +parsley==1.3 + # via bindep +pbr==5.6.0 + # via bindep prometheus-client==0.10.1 # via django-prometheus psycopg2==2.8.6 @@ -214,6 +223,7 @@ pytz==2021.1 # via django pyyaml==5.4.1 # via + # ansible-builder # ansible-core # ansible-lint # drf-spectacular @@ -229,6 +239,8 @@ requests==2.25.1 # via # galaxy-importer # pyjwkest +requirements-parser==0.2.0 + # via ansible-builder resolvelib==0.5.4 # via ansible-core rich==10.1.0 diff --git a/setup.py b/setup.py index 2935facbf1..64a811a183 100644 --- a/setup.py +++ b/setup.py @@ -88,7 +88,7 @@ def run(self): requirements = [ - "galaxy-importer==0.3.4", + "galaxy-importer==0.4.0", "pulpcore>=3.14.0,<3.15.0", "pulp-ansible>=0.9.0,<0.10.0", "django-prometheus>=2.0.0", diff --git a/template_config.yml b/template_config.yml index ff65392327..64d641031a 100644 --- a/template_config.yml +++ b/template_config.yml @@ -13,7 +13,7 @@ additional_repos: name: pulp_container org: pulp - bindings: false - branch: v0.3.4 + branch: v0.4.0 name: galaxy-importer org: ansible black: false @@ -83,4 +83,3 @@ travis_addtl_services: [] travis_notifications: null update_redmine: false upgrade_range: [] -