From 31f961d5814b582a5606c8f9b516c6698720d264 Mon Sep 17 00:00:00 2001 From: pulpbot Date: Sun, 3 Aug 2025 03:13:42 +0000 Subject: [PATCH] Update CI files --- .ci/ansible/Containerfile.j2 | 6 +++--- pyproject.toml | 1 - template_config.yml | 2 ++ 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.ci/ansible/Containerfile.j2 b/.ci/ansible/Containerfile.j2 index d57b44ed..01469b64 100644 --- a/.ci/ansible/Containerfile.j2 +++ b/.ci/ansible/Containerfile.j2 @@ -5,9 +5,9 @@ FROM {{ ci_base | default(pulp_default_container) }} ADD ./{{ item.name }} ./{{ item.name }} {% endfor %} -# Install python packages -# S3 botocore needs to be patched to handle responses from minio during 0-byte uploads -# Hacking botocore (https://github.com/boto/botocore/pull/1990) +{% for item in extra_files | default([]) %} +ADD ./{{ item.origin }} {{ item.destination }} +{% endfor %} # This MUST be the ONLY call to pip install in inside the container. RUN pip3 install --upgrade pip setuptools wheel && \ diff --git a/pyproject.toml b/pyproject.toml index 2bc16372..d4bb83ef 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -122,6 +122,5 @@ replace = "version = \"{new_version}\"" filename = "./pyproject.toml" search = "version = \"{current_version}\"" replace = "version = \"{new_version}\"" - [tool.black] line-length = 100 diff --git a/template_config.yml b/template_config.yml index 03f04ab7..705fa106 100644 --- a/template_config.yml +++ b/template_config.yml @@ -20,6 +20,7 @@ deploy_client_to_rubygems: true deploy_to_pypi: true disabled_redis_runners: [] docker_fixtures: false +extra_files: [] flake8: true flake8_ignore: [] github_org: pulp @@ -74,3 +75,4 @@ test_reroute: true test_s3: true test_storages_compat_layer: true use_issue_template: true +