From 3a016094ecc7bb17ebab8ca37804f75f8f53fee6 Mon Sep 17 00:00:00 2001 From: pulpbot Date: Sun, 21 Jul 2024 02:40:13 +0000 Subject: [PATCH] Update CI files [noissue] --- .ci/ansible/Containerfile.j2 | 7 +++++-- .ci/scripts/calc_constraints.py | 2 ++ .github/template_gitref | 2 +- .github/workflows/scripts/build_python_client.sh | 4 +--- .github/workflows/scripts/build_ruby_client.sh | 10 +--------- 5 files changed, 10 insertions(+), 15 deletions(-) diff --git a/.ci/ansible/Containerfile.j2 b/.ci/ansible/Containerfile.j2 index 6cf81f25..afe0b118 100644 --- a/.ci/ansible/Containerfile.j2 +++ b/.ci/ansible/Containerfile.j2 @@ -9,7 +9,9 @@ ADD ./{{ item.name }} ./{{ item.name }} # S3 botocore needs to be patched to handle responses from minio during 0-byte uploads # Hacking botocore (https://github.com/boto/botocore/pull/1990) -RUN pip3 install +RUN pip3 install --upgrade pip setuptools wheel && \ + rm -rf /root/.cache/pip && \ + pip3 install {%- if s3_test | default(false) -%} {{ " " }}git+https://github.com/gerrod3/botocore.git@fix-100-continue {%- endif -%} @@ -25,7 +27,8 @@ RUN pip3 install {{ " " }}-r ./{{ item.name }}/ci_requirements.txt {%- endif -%} {%- endfor %} -{{ " " }}-c ./{{ plugins[0].name }}/.ci/assets/ci_constraints.txt +{{ " " }}-c ./{{ plugins[0].name }}/.ci/assets/ci_constraints.txt && \ + rm -rf /root/.cache/pip {% if pulp_env is defined and pulp_env %} {% for key, value in pulp_env.items() %} diff --git a/.ci/scripts/calc_constraints.py b/.ci/scripts/calc_constraints.py index 3d00b040..badca1c9 100755 --- a/.ci/scripts/calc_constraints.py +++ b/.ci/scripts/calc_constraints.py @@ -62,6 +62,8 @@ def to_upper_bound(req): max_version = f"{version.major}.{version.minor}.{version.micro-1}" elif version.minor != 0: max_version = f"{version.major}.{version.minor-1}" + elif version.major != 0: + max_version = f"{version.major-1}.0" else: return f"# NO BETTER CONSTRAINT: {req}" return f"{requirement.name}{operator}{max_version}" diff --git a/.github/template_gitref b/.github/template_gitref index c16f42b6..3d9674dc 100644 --- a/.github/template_gitref +++ b/.github/template_gitref @@ -1 +1 @@ -2021.08.26-354-g82d22de +2021.08.26-361-gcd6f9f0 diff --git a/.github/workflows/scripts/build_python_client.sh b/.github/workflows/scripts/build_python_client.sh index 5bf6e16d..e86ffc29 100755 --- a/.github/workflows/scripts/build_python_client.sh +++ b/.github/workflows/scripts/build_python_client.sh @@ -18,9 +18,7 @@ cd "$(dirname "$(realpath -e "$0")")"/../../.. pushd ../pulp-openapi-generator rm -rf "pulp_python-client" -# We need to copy that over to be visible in the container. -cp "../pulp_python/python-api.json" . -./gen-client.sh "python-api.json" "python" python "pulp_python" +./gen-client.sh "../pulp_python/python-api.json" "python" python "pulp_python" pushd pulp_python-client python setup.py sdist bdist_wheel --python-tag py3 diff --git a/.github/workflows/scripts/build_ruby_client.sh b/.github/workflows/scripts/build_ruby_client.sh index a4abec1d..6b433edd 100755 --- a/.github/workflows/scripts/build_ruby_client.sh +++ b/.github/workflows/scripts/build_ruby_client.sh @@ -18,15 +18,7 @@ cd "$(dirname "$(realpath -e "$0")")"/../../.. pushd ../pulp-openapi-generator rm -rf "pulp_python-client" -# We need to copy that over to be visible in the container. -#cp "../pulp_python/python-api.json" . -#./gen-client.sh "python-api.json" "python" ruby "pulp_python" - -# ------------- -# The generator still needs to have it called api.json at this time... -cp "../pulp_python/api.json" . -./gen-client.sh "api.json" "python" ruby "pulp_python" -# ------------- +./gen-client.sh "../pulp_python/python-api.json" "python" ruby "pulp_python" pushd pulp_python-client gem build pulp_python_client