Update CI files for branch main

.ci/ansible/filter/repr.py

@@ -1,4 +1,5 @@
 from __future__ import absolute_import, division, print_function
+
 from packaging.version import parse as parse_version
 
 __metaclass__ = type

.ci/scripts/calc_constraints.py

@@ -7,11 +7,12 @@
 
 import argparse
 import fileinput
-import urllib.request
 import sys
+import urllib.request
+
+import yaml
 from packaging.requirements import Requirement
 from packaging.version import Version
-import yaml
 
 try:
     import tomllib

.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" pulpcore pulp_file pulp_certguard | grep -v "tests\|plugin")"
 
 if [ $? -ne 1 ]; then
   printf "\nERROR: Detected bad imports from pulpcore:\n"

.ci/scripts/check_release.py

@@ -9,16 +9,16 @@
 # ///
 
 import argparse
-import re
 import os
+import re
 import sys
 import tomllib
 import typing as t
 from pathlib import Path
 
 import yaml
-from packaging.version import Version
 from git import Repo
+from packaging.version import Version
 
 RELEASE_BRANCH_REGEX = r"^([0-9]+)\.([0-9]+)$"
 Y_CHANGELOG_EXTS = [".feature"]
@@ -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

@@ -7,12 +7,12 @@
 
 import tomllib
 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/schema.py

@@ -9,6 +9,7 @@
 """
 
 import json
+
 from drf_spectacular.validation import JSON_SCHEMA_SPEC_PATH
 
 with open(JSON_SCHEMA_SPEC_PATH) as fh:

.ci/scripts/skip_tests.py

@@ -15,12 +15,13 @@
     *: Error
 """
 
-import sys
+import argparse
 import os
 import re
-import git
+import sys
 import textwrap
-import argparse
+
+import git
 
 DOC_PATTERNS = [
     r"^docs/",

.ci/scripts/update_github.py

@@ -6,6 +6,7 @@
 # For more info visit https://github.com/pulp/plugin_template
 
 import os
+
 from github import Github
 
 g = Github(os.environ.get("GITHUB_TOKEN"))

.ci/scripts/validate_commit_message.py

@@ -6,9 +6,9 @@
 import subprocess
 import sys
 import tomllib
-import yaml
 from pathlib import Path
 
+import yaml
 from github import Github
 
 

.github/workflows/lint.yml

@@ -36,20 +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
-
-      - name: "Check for common gettext problems"
-        run: |
-          sh .ci/scripts/check_gettext.sh
+          ruff check
 
       - name: "Run extra lint checks"
         run: |

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

@@ -12,13 +12,15 @@
 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)
 

.github/workflows/scripts/update_backport_labels.py

@@ -5,10 +5,11 @@
 #
 # For more info visit https://github.com/pulp/plugin_template
 
+import os
+import random
+
 import requests
 import yaml
-import random
-import os
 
 
 def random_color():

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

pulp_certguard/app/models.py

@@ -1,12 +1,11 @@
-from logging import getLogger
-from gettext import gettext as _
 import re
+from gettext import gettext as _
+from logging import getLogger
 from urllib.parse import unquote
 
+from cryptography import x509
 from django.conf import settings
 from django.db import models
-
-from cryptography import x509
 from OpenSSL import crypto as openssl
 
 from pulpcore.plugin.models import ContentGuard

pulp_certguard/app/serializers.py

@@ -1,11 +1,10 @@
 from gettext import gettext as _
 
 from OpenSSL import crypto as openssl
+from rest_framework import serializers
 
 from pulpcore.plugin.serializers import ContentGuardSerializer
 
-from rest_framework import serializers
-
 from .models import RHSMCertGuard, X509CertGuard
 
 

pulp_certguard/rhsm/rhsm_check_path.py

@@ -1,9 +1,10 @@
-import typing as t
-from cryptography import x509
-from heapq import heappush, heappop
 import itertools
 import re
+import typing as t
 import zlib
+from heapq import heappop, heappush
+
+from cryptography import x509
 
 RH_OID = "1.3.6.1.4.1.2312.9"
 RH_ORDER_NAME_OID = RH_OID + ".4.1"

pulp_certguard/tests/functional/api/test_rhsm_certguard.py

@@ -1,29 +1,29 @@
-import pytest
 import uuid
+from urllib.parse import quote, urljoin
 
+import pytest
 import requests
-from urllib.parse import urljoin, quote
 from django.conf import settings
 
 from pulp_certguard.tests.functional.constants import (
     RHSM_CA_CERT_FILE_PATH,
     RHSM_CLIENT_CERT_FROM_UNTRUSTED_CA,
     RHSM_CLIENT_CERT_TRUSTED_BUT_EXPIRED,
-    THIRDPARTY_CA_CERT_FILE_PATH,
     RHSM_UBER_CERT_BASE_PATH_ONE,
     RHSM_UBER_CERT_BASE_PATH_TWO,
     RHSM_UBER_CLIENT_CERT,
     RHSM_V1_ONE_AND_TWO_VAR_CLIENT_CERT,
     RHSM_V1_ONE_VAR_BASE_PATH,
     RHSM_V1_TWO_VAR_BASE_PATH,
-    RHSM_V1_ZERO_VAR_CLIENT_CERT,
     RHSM_V1_ZERO_VAR_BASE_PATH,
+    RHSM_V1_ZERO_VAR_CLIENT_CERT,
     RHSM_V3_INVALID_BASE_PATH,
     RHSM_V3_ONE_AND_TWO_VAR_CLIENT_CERT,
     RHSM_V3_ONE_VAR_BASE_PATH,
     RHSM_V3_TWO_VAR_BASE_PATH,
-    RHSM_V3_ZERO_VAR_CLIENT_CERT,
     RHSM_V3_ZERO_VAR_BASE_PATH,
+    RHSM_V3_ZERO_VAR_CLIENT_CERT,
+    THIRDPARTY_CA_CERT_FILE_PATH,
 )
 
 if settings.DOMAIN_ENABLED:

pulp_certguard/tests/functional/api/test_x509_certguard.py

@@ -1,15 +1,15 @@
-import pytest
 import uuid
+from urllib.parse import quote, urljoin
 
+import pytest
 import requests
-from urllib.parse import urljoin, quote
 
 from pulp_certguard.tests.functional.constants import (
     X509_BASE_PATH,
     X509_CA_CERT_FILE_PATH,
     X509_CLIENT_CERT_FILE_PATH,
-    X509_UNTRUSTED_CLIENT_CERT_FILE_PATH,
     X509_UN_URLENCODED_CLIENT_CERT_FILE_PATH,
+    X509_UNTRUSTED_CLIENT_CERT_FILE_PATH,
 )
 
 

pulp_certguard/tests/unit/test_rhsm_check_path.py

@@ -1,18 +1,18 @@
-from cryptography import x509
 import pytest
-
-from . import certdata
+from cryptography import x509
 
 from pulp_certguard.rhsm import check_path
 from pulp_certguard.rhsm.rhsm_check_path import (
-    bitstream,
+    V1_PATH_OID_REGEX,
     Entitlement,
     HuffmannNode,
+    bitstream,
     cert_version,
     split_count,
-    V1_PATH_OID_REGEX,
 )
 
+from . import certdata
+
 
 @pytest.fixture(scope="session")
 def ent_v1() -> x509.Certificate:

pulp_file/app/modelresource.py

@@ -1,5 +1,6 @@
 from pulpcore.plugin.importexport import BaseContentResource
 from pulpcore.plugin.modelresources import RepositoryResource
+
 from pulp_file.app.models import FileContent, FileRepository