diff --git a/.ci/ansible/inventory.yaml b/.ci/ansible/inventory.yaml index 3b85c5f..ad2fbce 100644 --- a/.ci/ansible/inventory.yaml +++ b/.ci/ansible/inventory.yaml @@ -5,7 +5,7 @@ all: hosts: pulp: pulp-fixtures: - minio: + rustfs: ci-sftp: vars: ansible_connection: docker diff --git a/.ci/ansible/start_container.yaml b/.ci/ansible/start_container.yaml index f0b4d43..d471c64 100644 --- a/.ci/ansible/start_container.yaml +++ b/.ci/ansible/start_container.yaml @@ -64,9 +64,9 @@ from botocore.exceptions import ClientError client = boto3.client( "s3", - aws_access_key_id="{{ minio_access_key }}", - aws_secret_access_key="{{ minio_secret_key }}", - endpoint_url="http://minio:9000", + aws_access_key_id="{{ rustfs_access_key }}", + aws_secret_access_key="{{ rustfs_secret_key }}", + endpoint_url="http://rustfs:9000", region_name="eu-central-1", ) try: diff --git a/.ci/scripts/pr_labels.py b/.ci/scripts/pr_labels.py index 0c478a2..e36f588 100755 --- a/.ci/scripts/pr_labels.py +++ b/.ci/scripts/pr_labels.py @@ -1,4 +1,10 @@ #!/bin/env python3 +# /// script +# requires-python = ">=3.12" +# dependencies = [ +# "gitpython>=3.1.62", +# ] +# /// # This script is running with elevated privileges from the main branch against pull requests. diff --git a/.github/workflows/pr_checks.yml b/.github/workflows/pr_checks.yml index 785dd6b..b2da640 100644 --- a/.github/workflows/pr_checks.yml +++ b/.github/workflows/pr_checks.yml @@ -40,7 +40,7 @@ jobs: fetch-depth: 0 - uses: "actions/setup-python@v6" with: - python-version: "3.11" + python-version: "3.14" - name: "Install uv" uses: "astral-sh/setup-uv@v7" with: @@ -49,7 +49,7 @@ jobs: run: | uv pip install GitPython==3.1.42 git fetch origin ${{ github.event.pull_request.head.sha }} - python .ci/scripts/pr_labels.py "origin/${{ github.base_ref }}" "${{ github.event.pull_request.head.sha }}" >> "$GITHUB_ENV" + uv run --script .ci/scripts/pr_labels.py "origin/${{ github.base_ref }}" "${{ github.event.pull_request.head.sha }}" >> "$GITHUB_ENV" - uses: "actions/github-script@v8" name: "Apply PR Labels" with: diff --git a/.github/workflows/scripts/before_install.sh b/.github/workflows/scripts/before_install.sh index 9430664..6c1df7c 100755 --- a/.github/workflows/scripts/before_install.sh +++ b/.github/workflows/scripts/before_install.sh @@ -70,18 +70,18 @@ services: VARSYAML if [ "$TEST" = "s3" ]; then - MINIO_ACCESS_KEY=AKIAIT2Z5TDYPX3ARJBA - MINIO_SECRET_KEY=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 + RUSTFS_ACCESS_KEY=AKIAIT2Z5TDYPX3ARJBA + RUSTFS_SECRET_KEY=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 cat >> .ci/ansible/vars/main.yaml << VARSYAML - - name: "minio" - image: "minio/minio" + - name: "rustfs" + image: "rustfs/rustfs" env: - MINIO_ACCESS_KEY: "${MINIO_ACCESS_KEY}" - MINIO_SECRET_KEY: "${MINIO_SECRET_KEY}" + RUSTFS_ACCESS_KEY: "${RUSTFS_ACCESS_KEY}" + RUSTFS_SECRET_KEY: "${RUSTFS_SECRET_KEY}" command: "server /data" s3_test: true -minio_access_key: "${MINIO_ACCESS_KEY}" -minio_secret_key: "${MINIO_SECRET_KEY}" +rustfs_access_key: "${RUSTFS_ACCESS_KEY}" +rustfs_secret_key: "${RUSTFS_SECRET_KEY}" pulp_scenario_settings: {"api_root": "/rerouted/djnd/"} # MinIO omits 100-continue on 0-byte PUTs; stock botocore hangs without this (boto/botocore#3123). pulp_scenario_env: {"BOTO_EXPERIMENTAL__NO_EMPTY_CONTINUE": "true"} diff --git a/.github/workflows/update_ci.yml b/.github/workflows/update_ci.yml index bb07b54..20a9e59 100644 --- a/.github/workflows/update_ci.yml +++ b/.github/workflows/update_ci.yml @@ -83,7 +83,7 @@ jobs: with: fetch-depth: 0 path: "pulp_smart_proxy" - ref: "0.5" + ref: "0.6" - name: "Run update" working-directory: "pulp_smart_proxy" @@ -92,21 +92,21 @@ jobs: - name: "Create Pull Request for CI files" uses: "peter-evans/create-pull-request@v8" - id: "create_pr_0_5" + id: "create_pr_0_6" with: token: "${{ secrets.RELEASE_TOKEN }}" path: "pulp_smart_proxy" committer: "theforeman-bot " author: "theforeman-bot " - title: "Update CI files for branch 0.5" - branch: "update-ci/0.5" - base: "0.5" + title: "Update CI files for branch 0.6" + branch: "update-ci/0.6" + base: "0.6" delete-branch: true - name: "Mark PR automerge" working-directory: "pulp_smart_proxy" run: | - gh pr merge --rebase --auto "${{ steps.create_pr_0_5.outputs.pull-request-number }}" - if: "steps.create_pr_0_5.outputs.pull-request-number" + gh pr merge --rebase --auto "${{ steps.create_pr_0_6.outputs.pull-request-number }}" + if: "steps.create_pr_0_6.outputs.pull-request-number" env: GH_TOKEN: "${{ secrets.RELEASE_TOKEN }}" continue-on-error: true diff --git a/CHANGES/+support_pulpcore_3.129.feature b/CHANGES/+support_pulpcore_3.129.feature deleted file mode 100644 index f2c1b5d..0000000 --- a/CHANGES/+support_pulpcore_3.129.feature +++ /dev/null @@ -1 +0,0 @@ -Add support for Pulpcore versions up to 3.129. Follows the Pulpcore plugin breaking changes schedule. diff --git a/pulp_smart_proxy/app/__init__.py b/pulp_smart_proxy/app/__init__.py index a199214..e5accf8 100644 --- a/pulp_smart_proxy/app/__init__.py +++ b/pulp_smart_proxy/app/__init__.py @@ -6,6 +6,6 @@ class PulpSmartProxyPluginAppConfig(PulpPluginAppConfig): name = "pulp_smart_proxy.app" label = "smart_proxy" - version = "0.6.0.dev" + version = "0.7.0.dev" python_package_name = "pulp_smart_proxy" domain_compatible = True diff --git a/pyproject.toml b/pyproject.toml index 8da9a70..5fe3e36 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,7 +7,7 @@ build-backend = 'setuptools.build_meta' [project] name = "pulp-smart-proxy" -version = "0.6.0.dev" +version = "0.7.0.dev" description = "pulp-smart-proxy plugin for the Pulp Project" readme = "README.md" authors = [ @@ -120,7 +120,7 @@ ignore = [ [tool.bumpversion] # This section is managed by the plugin template. Do not edit manually. -current_version = "0.6.0.dev" +current_version = "0.7.0.dev" commit = false tag = false parse = "(?P\\d+)\\.(?P\\d+)\\.(?P0a)?(?P\\d+)(\\.(?P[a-z]+))?" diff --git a/template_config.yml b/template_config.yml index b80dcc8..d836d5a 100644 --- a/template_config.yml +++ b/template_config.yml @@ -22,7 +22,7 @@ disabled_redis_runners: [] docker_fixtures: false extra_files: [] github_org: "theforeman" -latest_release_branch: "0.5" +latest_release_branch: "0.6" lint_ignore: [] lint_requirements: true os_required_packages: []