WIP Experiment with CI cleanup

.ci/scripts/check_gettext.sh

@@ -10,9 +10,9 @@
 # make sure this script runs at the repo root
 cd "$(dirname "$(realpath -e "$0")")"/../..
 
-set -uv
+set -u
 
-MATCHES=$(grep -n -r --include \*.py "_(f")
+MATCHES="$(grep -n -r --include \*.py "_(f" pulp_gem )"
 
 if [ $? -ne 1 ]; then
   printf "\nERROR: Detected mix of f-strings and gettext:\n"

.ci/scripts/check_pulpcore_imports.sh

@@ -10,10 +10,10 @@
 # make sure this script runs at the repo root
 cd "$(dirname "$(realpath -e "$0")")"/../..
 
-set -uv
+set -u
 
 # check for imports not from pulpcore.plugin. exclude tests
-MATCHES=$(grep -n -r --include \*.py "from pulpcore.*import" . | grep -v "tests\|plugin")
+MATCHES="$(grep -n -r --include \*.py "from pulpcore.*import" pulp_gem | grep -v "tests\|plugin")"
 
 if [ $? -ne 1 ]; then
   printf "\nERROR: Detected bad imports from pulpcore:\n"

.ci/scripts/check_release.py

@@ -157,9 +157,9 @@ def main(options: argparse.Namespace, template_config: dict[str, t.Any]) -> int:
 
             if reasons:
                 curr_version = Version(last_tag)
-                assert curr_version.base_version.startswith(
-                    branch
-                ), "Current-version has to belong to the current branch!"
+                assert curr_version.base_version.startswith(branch), (
+                    "Current-version has to belong to the current branch!"
+                )
                 next_version = Version(f"{branch}.{curr_version.micro + 1}")
                 print(
                     f"A Z-release is needed for {branch}, "

.ci/scripts/check_requirements.py

@@ -9,10 +9,10 @@
 import warnings
 from packaging.requirements import Requirement
 
+
 CHECK_MATRIX = [
     ("pyproject.toml", True, True, True),
     ("requirements.txt", True, True, True),
-    ("dev_requirements.txt", False, True, False),
     ("ci_requirements.txt", False, True, True),
     ("doc_requirements.txt", False, True, False),
     ("lint_requirements.txt", False, True, True),

.ci/scripts/collect_changes.py

@@ -25,6 +25,7 @@
 from git import GitCommandError, Repo
 from packaging.version import parse as parse_version
 
+
 PYPI_PROJECT = "pulp_gem"
 
 # Read Towncrier settings

.github/workflows/lint.yml

@@ -36,16 +36,13 @@ jobs:
         run: |
           yamllint -s -d '{extends: relaxed, rules: {line-length: disable}}' .github/workflows
 
-      # run black separately from flake8 to get a diff
-      - name: "Run black"
+      - name: "Check formating"
         run: |
-          black --version
-          black --check --diff .
+          ruff format --check --diff
 
-      # Lint code.
-      - name: "Run flake8"
+      - name: "Lint code"
         run: |
-          flake8
+          ruff check --diff
 
       - name: "Check for common gettext problems"
         run: |

.github/workflows/scripts/stage-changelog-for-default-branch.py

@@ -12,13 +12,16 @@
 from git import Repo
 from git.exc import GitCommandError
 
-helper = textwrap.dedent("""\
+
+helper = textwrap.dedent(
+    """\
         Stage the changelog for a release on main branch.
 
         Example:
             $ python .github/workflows/scripts/stage-changelog-for-default-branch.py 3.4.0
 
-    """)
+    """
+)
 
 parser = argparse.ArgumentParser(formatter_class=argparse.RawTextHelpFormatter, description=helper)
 

MANIFEST.in

@@ -9,5 +9,6 @@ include test_requirements.txt
 include unittest_requirements.txt
 include pyproject.toml
 exclude releasing.md
+exclude Makefile
 
-exclude .gitleaks.toml
+exclude .gitleaks.toml

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_gem' to update this file.
+#
+# For more info visit https://github.com/pulp/plugin_template
+
+.PHONY: format
+format:
+	ruff format
+
+.PHONY: lint
+lint:
+	yamllint -s -d '{extends: relaxed, rules: {line-length: disable}}' .github/workflows
+	bump-my-version bump --dry-run release
+	ruff format --check --diff
+	ruff check --diff
+	check-manifest
+	python .ci/scripts/check_requirements.py
+	sh .ci/scripts/check_pulpcore_imports.sh
+	sh .ci/scripts/check_gettext.sh

lint_requirements.txt

@@ -5,10 +5,8 @@
 #
 # For more info visit https://github.com/pulp/plugin_template
 
-black~=26.3  # Pin style to the year. https://black.readthedocs.io/en/stable/faq.html#how-stable-is-black-s-style
 bump-my-version
 check-manifest
-flake8
-flake8-black
 packaging
+ruff
 yamllint

pyproject.toml

@@ -92,6 +92,8 @@ replace = "version = \"{new_version}\""
 filename = "./pyproject.toml"
 search = "version = \"{current_version}\""
 replace = "version = \"{new_version}\""
+
+
 [tool.towncrier]
 package = "pulp_gem"
 filename = "CHANGES.md"
@@ -119,7 +121,13 @@ exclude = '''
 )/
 '''
 
-
+[tool.ruff]
+# This section is managed by the plugin template. Do not edit manually.
+line-length = 100
+extend-exclude = [
+  "docs/**",
+  "**/migrations/*.py",
+]
 [tool.check-manifest]
 ignore = [
     "CHANGES/**",

template_config.yml

@@ -6,7 +6,6 @@
 # After editing this file please always reapply the plugin template before committing any changes.
 
 ---
-black: true
 check_commit_message: true
 check_gettext: true
 check_manifest: true
@@ -23,10 +22,9 @@ deploy_to_pypi: true
 disabled_redis_runners: []
 docker_fixtures: false
 extra_files: []
-flake8: true
-flake8_ignore: []
 github_org: "pulp"
 latest_release_branch: "0.7"
+lint_ignore: []
 lint_requirements: true
 os_required_packages: []
 parallel_test_workers: 8
@@ -93,7 +91,6 @@ pulp_settings_s3:
     - "sha512"
   api_root: "/rerouted/djnd/"
   domain_enabled: true
-pydocstyle: true
 release_email: "pulp-infra@redhat.com"
 release_user: "pulpbot"
 stalebot: true