From 7e828483589afe654dbecb0bdbb090e1f5778328 Mon Sep 17 00:00:00 2001 From: pulpbot Date: Tue, 19 Aug 2025 19:49:23 +0000 Subject: [PATCH] Bump minor version --- .ci/ansible/settings.py.j2 | 124 ------------------------------ .github/workflows/update_ci.yml | 14 ++-- pulp_hugging_face/app/__init__.py | 2 +- pyproject.toml | 4 +- template_config.yml | 3 +- 5 files changed, 11 insertions(+), 136 deletions(-) diff --git a/.ci/ansible/settings.py.j2 b/.ci/ansible/settings.py.j2 index 2d30839..dfe2851 100644 --- a/.ci/ansible/settings.py.j2 +++ b/.ci/ansible/settings.py.j2 @@ -26,127 +26,3 @@ API_ROOT = {{ api_root | repr }} {% endfor %} {% endif %} -{# ======================================= -Macros for legacy and new storage settings -========================================== -#} - -{%- macro s3_settings(legacy) -%} - {%- if legacy %} -DEFAULT_FILE_STORAGE = "storages.backends.s3boto3.S3Boto3Storage" -AWS_ACCESS_KEY_ID = "{{ minio_access_key }}" -AWS_SECRET_ACCESS_KEY = "{{ minio_secret_key }}" -AWS_S3_REGION_NAME = "eu-central-1" -AWS_S3_ADDRESSING_STYLE = "path" -AWS_S3_SIGNATURE_VERSION = "s3v4" -AWS_STORAGE_BUCKET_NAME = "pulp3" -AWS_S3_ENDPOINT_URL = "http://minio:9000" -AWS_DEFAULT_ACL = "@none None" - {%- else %} -STORAGES = { - "default": { - "BACKEND": "storages.backends.s3boto3.S3Boto3Storage", - "OPTIONS": { - "access_key": "{{ minio_access_key }}", - "secret_key": "{{ minio_secret_key }}", - "region_name": "eu-central-1", - "addressing_style": "path", - "signature_version": "s3v4", - "bucket_name": "pulp3", - "endpoint_url": "http://minio:9000", - "default_acl": "@none None", - }, - }, - "staticfiles": { - "BACKEND": "django.contrib.staticfiles.storage.StaticFilesStorage", - }, -} - {%- endif %} -{%- endmacro -%} - -{%- macro azure_settings(legacy) -%} - {%- if legacy %} -DEFAULT_FILE_STORAGE = "storages.backends.azure_storage.AzureStorage" -AZURE_ACCOUNT_KEY = "Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==" -AZURE_ACCOUNT_NAME = "devstoreaccount1" -AZURE_CONTAINER = "pulp-test" -AZURE_LOCATION = "pulp3" -AZURE_OVERWRITE_FILES = True -AZURE_URL_EXPIRATION_SECS = 120 -AZURE_CONNECTION_STRING = 'DefaultEndpointsProtocol=http;AccountName=devstoreaccount1;AccountKey=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==;BlobEndpoint=http://ci-azurite:10000/devstoreaccount1;' - {%- else %} -STORAGES = { - "default": { - "BACKEND": "storages.backends.azure_storage.AzureStorage", - "OPTIONS": { - "account_key": "Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==", - "account_name": "devstoreaccount1", - "location": "pulp3", - "azure_container": "pulp-test", - "overwrite_files": True, - "expiration_secs": 120, - "connection_string": "DefaultEndpointsProtocol=http;AccountName=devstoreaccount1;AccountKey=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==;BlobEndpoint=http://ci-azurite:10000/devstoreaccount1;", - }, - }, - "staticfiles": { - "BACKEND": "django.contrib.staticfiles.storage.StaticFilesStorage", - }, -} - {%- endif %} -{%- endmacro -%} - -{%- macro gcp_settings(legacy) -%} - {%- if legacy %} -DEFAULT_FILE_STORAGE = "storages.backends.gcloud.GoogleCloudStorage" -GS_BUCKET_NAME = "gcppulp" -GS_CUSTOM_ENDPOINT = "http://ci-gcp:4443" - {%- else %} -STORAGES = { - "default": { - "BACKEND": "storages.backends.gcloud.GoogleCloudStorage", - "OPTIONS": { - "bucket_name": "gcppulp", - "custom_endpoint": "http://ci-gcp:4443", - }, - }, - "staticfiles": { - "BACKEND": "django.contrib.staticfiles.storage.StaticFilesStorage", - }, -} - {%- endif %} -{%- endmacro -%} - -{#- ========================================== -Render according to test_storages_compat_layer -============================================== - -Case 1) test_storages_compat_layer is unset -- All storages render the legacy setting -- Branches using pulpcore <3.70 must leave this key unset (use legacy) - -Case 2) test_storages_compat_layer is True -- To tests both work, only one setting uses the new storage setting -- Branches using pulpcore >=3.70,<3.85 must set this key to True (test both) - -Case 3) test_storages_compat_layer is False -- All storages render the new setting -- Branches using pulpcore >=3.85 must set this key to False (use new) --#} - -{% if s3_test | default(false) or azure_test | default(false) or gcp_test | default(false)%} -MEDIA_ROOT="" -{% endif %} -{%- if test_storages_compat_layer is not defined -%} - {%- if s3_test | default(false) -%}{{ s3_settings(legacy=True) }}{%- endif -%} - {%- if azure_test | default(false) -%}{{ azure_settings(legacy=True) }}{%- endif -%} - {%- if gcp_test | default(false) -%}{{ gcp_settings(legacy=True) }}{%- endif -%} -{%- else -%} - {%- if test_storages_compat_layer is true -%} - {%- if s3_test | default(false) -%}{{ s3_settings(legacy=False) }}{%- endif -%} - {%- if azure_test | default(false) -%}{{ azure_settings(legacy=True) }}{%- endif -%} - {%- if gcp_test | default(false) -%}{{ gcp_settings(legacy=True) }}{%- endif -%} - {%- elif test_storages_compat_layer is false -%} - {%- if s3_test | default(false) -%}{{ s3_settings(legacy=False) }}{%- endif -%} - {%- if azure_test | default(false) -%}{{ azure_settings(legacy=False) }}{%- endif -%} - {%- if gcp_test | default(false) -%}{{ gcp_settings(legacy=False) }}{%- endif -%} - {%- endif -%} -{%- endif -%} diff --git a/.github/workflows/update_ci.yml b/.github/workflows/update_ci.yml index 897aeb6..e42dfb5 100644 --- a/.github/workflows/update_ci.yml +++ b/.github/workflows/update_ci.yml @@ -78,7 +78,7 @@ jobs: with: fetch-depth: 0 path: "pulp_hugging_face" - ref: "0.0" + ref: "0.1" - name: "Run update" working-directory: "pulp_hugging_face" @@ -87,21 +87,21 @@ jobs: - name: "Create Pull Request for CI files" uses: "peter-evans/create-pull-request@v6" - id: "create_pr_0_0" + id: "create_pr_0_1" with: token: "${{ secrets.RELEASE_TOKEN }}" path: "pulp_hugging_face" committer: "pulpbot " author: "pulpbot " - title: "Update CI files for branch 0.0" - branch: "update-ci/0.0" - base: "0.0" + title: "Update CI files for branch 0.1" + branch: "update-ci/0.1" + base: "0.1" delete-branch: true - name: "Mark PR automerge" working-directory: "pulp_hugging_face" run: | - gh pr merge --rebase --auto "${{ steps.create_pr_0_0.outputs.pull-request-number }}" - if: "steps.create_pr_0_0.outputs.pull-request-number" + gh pr merge --rebase --auto "${{ steps.create_pr_0_1.outputs.pull-request-number }}" + if: "steps.create_pr_0_1.outputs.pull-request-number" env: GH_TOKEN: "${{ secrets.RELEASE_TOKEN }}" continue-on-error: true diff --git a/pulp_hugging_face/app/__init__.py b/pulp_hugging_face/app/__init__.py index 00a5dd5..29bab3d 100755 --- a/pulp_hugging_face/app/__init__.py +++ b/pulp_hugging_face/app/__init__.py @@ -6,6 +6,6 @@ class PulpHuggingFacePluginAppConfig(PulpPluginAppConfig): name = "pulp_hugging_face.app" label = "hugging_face" - version = "0.1.0.dev" + version = "0.2.0.dev" python_package_name = "pulp_hugging_face" domain_compatible = True diff --git a/pyproject.toml b/pyproject.toml index 0a03609..b74e251 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,7 +7,7 @@ build-backend = 'setuptools.build_meta' [project] name = "pulp-hugging-face" -version = "0.1.0.dev" +version = "0.2.0.dev" description = "pulp-hugging-face plugin for the Pulp Project" readme = "README.md" authors = [ @@ -122,7 +122,7 @@ ignore = [ [tool.bumpversion] # This section is managed by the plugin template. Do not edit manually. -current_version = "0.1.0.dev" +current_version = "0.2.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 33b853e..498c995 100644 --- a/template_config.yml +++ b/template_config.yml @@ -24,7 +24,7 @@ extra_files: [] flake8: true flake8_ignore: [] github_org: pulp -latest_release_branch: '0.0' +latest_release_branch: '0.1' lint_requirements: true os_required_packages: [] parallel_test_workers: 8 @@ -63,6 +63,5 @@ test_lowerbounds: true test_performance: false test_reroute: true test_s3: false -test_storages_compat_layer: false use_issue_template: true