diff --git a/.github/workflows/scripts/before_install.sh b/.github/workflows/scripts/before_install.sh index b34f7e94..9b653df2 100755 --- a/.github/workflows/scripts/before_install.sh +++ b/.github/workflows/scripts/before_install.sh @@ -55,7 +55,7 @@ pulp_scheme: "https" image: name: "pulp" tag: "ci_build" - ci_base: "ghcr.io/pulp/pulp-ci-centos9:latest" + ci_base: "ghcr.io/pulp/pulp-ci-centos10:latest" source: "${COMPONENT_SOURCE}" ci_requirements: $(test -f ci_requirements.txt && echo -n true || echo -n false) upperbounds: $(test "${TEST}" = "pulp" && echo -n true || echo -n false) diff --git a/MANIFEST.in b/MANIFEST.in index c3ca8829..678d203d 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -11,5 +11,5 @@ include unittest_requirements.txt include pulp_python/app/webserver_snippets/* include pulp_python/tests/functional/assets/* exclude releasing.md - -exclude .gitleaks.toml \ No newline at end of file +exclude Makefile +exclude .gitleaks.toml diff --git a/Makefile b/Makefile new file mode 100644 index 00000000..7bbb9367 --- /dev/null +++ b/Makefile @@ -0,0 +1,21 @@ +# WARNING: DO NOT EDIT! +# +# This file was generated by plugin_template, and is managed by it. Please use +# './plugin-template --ci pulp_python' to update this file. +# +# For more info visit https://github.com/pulp/plugin_template + +.PHONY: format +format: + ruff format + ruff check --select I --fix + +.PHONY: lint +lint: + yamllint -s -d '{extends: relaxed, rules: {line-length: disable}}' .github/workflows + bump-my-version bump --dry-run --allow-dirty release + ruff format --check --diff + ruff check + check-manifest + python .ci/scripts/check_requirements.py + sh .ci/scripts/check_pulpcore_imports.sh diff --git a/pyproject.toml b/pyproject.toml index 448acbf9..8b36063d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -125,6 +125,7 @@ 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 4ec79cda..afdd2ec7 100644 --- a/template_config.yml +++ b/template_config.yml @@ -9,7 +9,7 @@ check_commit_message: true check_manifest: true check_stray_pulpcore_imports: true -ci_base_image: "ghcr.io/pulp/pulp-ci-centos9" +ci_base_image: "ghcr.io/pulp/pulp-ci-centos10" ci_env: {} ci_trigger: "{pull_request: {branches: ['*']}}" cli_package: "pulp-cli"