From 6e9de910b26d8c0d9ada2bff9c92863f5bb9e515 Mon Sep 17 00:00:00 2001 From: pulpbot Date: Wed, 14 Jan 2026 13:28:18 +0000 Subject: [PATCH] Update CI files --- .ci/assets/ci_constraints.txt | 8 ++++++ .github/workflows/release.yml | 4 +-- .../workflows/scripts/publish_client_gem.sh | 28 ------------------- .../workflows/scripts/publish_client_pypi.sh | 26 ----------------- .../workflows/scripts/publish_plugin_pypi.sh | 26 ----------------- .github/workflows/test.yml | 2 +- lint_requirements.txt | 3 -- 7 files changed, 10 insertions(+), 87 deletions(-) delete mode 100755 .github/workflows/scripts/publish_client_gem.sh delete mode 100755 .github/workflows/scripts/publish_client_pypi.sh delete mode 100755 .github/workflows/scripts/publish_plugin_pypi.sh diff --git a/.ci/assets/ci_constraints.txt b/.ci/assets/ci_constraints.txt index 8f41e3f65..c8070aff5 100644 --- a/.ci/assets/ci_constraints.txt +++ b/.ci/assets/ci_constraints.txt @@ -8,3 +8,11 @@ tablib!=3.6.0 multidict!=6.3.0 # This release failed the lower bounds test for some case sensitivity in CIMultiDict. + + +azure-storage-blob!=12.28.* +# Apparently does not work with current azurite. + + +pycares<5 +# older aiodns versions don't pin pycares UB, and are broken by pycares>=5 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8d512074e..cb0d4b090 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -32,12 +32,10 @@ jobs: with: python-version: "3.11" - # Click is pinned because of: - # https://github.com/pallets/click/issues/3065 - name: "Install python dependencies" run: | echo ::group::PYDEPS - pip install bump-my-version towncrier 'click<8.3' + pip install bump-my-version towncrier echo ::endgroup:: - name: "Configure Git with pulpbot name and email" diff --git a/.github/workflows/scripts/publish_client_gem.sh b/.github/workflows/scripts/publish_client_gem.sh deleted file mode 100755 index 2c9ef9a3c..000000000 --- a/.github/workflows/scripts/publish_client_gem.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -# WARNING: DO NOT EDIT! -# -# This file was generated by plugin_template, and is managed by it. Please use -# './plugin-template --github pulp_ansible' to update this file. -# -# For more info visit https://github.com/pulp/plugin_template - -set -euv - -# make sure this script runs at the repo root -cd "$(dirname "$(realpath -e "$0")")"/../../.. - -VERSION="$1" - -if [[ -z "${VERSION}" ]] -then - echo "No version specified." - exit 1 -fi - -mkdir -p ~/.gem -touch ~/.gem/credentials -echo "--- -:rubygems_api_key: ${RUBYGEMS_API_KEY}" > ~/.gem/credentials -sudo chmod 600 ~/.gem/credentials -gem push "pulp_ansible_client-${VERSION}.gem" diff --git a/.github/workflows/scripts/publish_client_pypi.sh b/.github/workflows/scripts/publish_client_pypi.sh deleted file mode 100755 index 8dddec7e0..000000000 --- a/.github/workflows/scripts/publish_client_pypi.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash - -# WARNING: DO NOT EDIT! -# -# This file was generated by plugin_template, and is managed by it. Please use -# './plugin-template --github pulp_ansible' to update this file. -# -# For more info visit https://github.com/pulp/plugin_template - -set -euv - -# make sure this script runs at the repo root -cd "$(dirname "$(realpath -e "$0")")/../../.." - -VERSION="$1" - -if [[ -z "${VERSION}" ]] -then - echo "No version specified." - exit 1 -fi - -twine upload -u __token__ -p "${PYPI_API_TOKEN}" \ -"dist/pulp_ansible_client-${VERSION}-py3-none-any.whl" \ -"dist/pulp_ansible_client-${VERSION}.tar.gz" \ -; diff --git a/.github/workflows/scripts/publish_plugin_pypi.sh b/.github/workflows/scripts/publish_plugin_pypi.sh deleted file mode 100755 index 503de6791..000000000 --- a/.github/workflows/scripts/publish_plugin_pypi.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash - -# WARNING: DO NOT EDIT! -# -# This file was generated by plugin_template, and is managed by it. Please use -# './plugin-template --github pulp_ansible' to update this file. -# -# For more info visit https://github.com/pulp/plugin_template - -set -euv - -# make sure this script runs at the repo root -cd "$(dirname "$(realpath -e "$0")")"/../../.. - -VERSION="$1" - -if [[ -z "${VERSION}" ]] -then - echo "No version specified." - exit 1 -fi - -twine upload -u __token__ -p "${PYPI_API_TOKEN}" \ -dist/pulp?ansible-"${VERSION}"-py3-none-any.whl \ -dist/pulp?ansible-"${VERSION}".tar.gz \ -; diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 744e971fe..e6b45a92b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -71,7 +71,7 @@ jobs: - name: "Install python dependencies" run: | echo ::group::PYDEPS - pip install build towncrier twine wheel httpie docker netaddr boto3 'ansible~=10.3.0' mkdocs jq jsonpatch bump-my-version 'click<8.3' + pip install build towncrier twine wheel httpie docker netaddr boto3 'ansible~=10.3.0' mkdocs jq jsonpatch bump-my-version echo "HTTPIE_CONFIG_DIR=$GITHUB_WORKSPACE/pulp_ansible/.ci/assets/httpie/" >> $GITHUB_ENV echo ::endgroup:: diff --git a/lint_requirements.txt b/lint_requirements.txt index 2dfb7d84a..46a422b8d 100644 --- a/lint_requirements.txt +++ b/lint_requirements.txt @@ -6,9 +6,6 @@ # For more info visit https://github.com/pulp/plugin_template black==24.3.0 -# Click is pinned because of: -# https://github.com/pallets/click/issues/3065 -click<8.3 bump-my-version check-manifest flake8