ci: Replace lint and formatting tools with ruff

.gitignore

@@ -89,3 +89,6 @@ dynaconf/vendor/source
 .DS_Store
 
 .helix
+
+# pyenv
+.python-version

.pre-commit-config.yaml

@@ -5,33 +5,20 @@ repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.3.0
     hooks:
-      - id: trailing-whitespace
-      - id: end-of-file-fixer
       - id: check-yaml
         args: [--allow-multiple-documents]
       - id: check-merge-conflict
-      - id: debug-statements
-      - id: fix-encoding-pragma
-        args: [--remove]
-  - repo: https://github.com/asottile/reorder_python_imports
-    rev: v3.1.0
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    # Ruff version.
+    rev: v0.3.0
     hooks:
-      - id: reorder-python-imports
-        args: [--py37-plus, --add-import, 'from __future__ import annotations']
-  - repo: https://github.com/asottile/pyupgrade
-    rev: v2.34.0
-    hooks:
-      - id: pyupgrade
-        args: [--py38-plus]
-  - repo: https://github.com/ambv/black
-    rev: 22.3.0
-    hooks:
-      - id: black
-        args: [--line-length=79]
-  - repo: https://github.com/pycqa/flake8
-    rev: 3.9.2
-    hooks:
-      - id: flake8
+      # Sort imports.
+      - id: ruff
+        args: [--select, I, --fix]
+      # Run the linter.
+      - id: ruff
+      # Run the formatter.
+      - id: ruff-format
   - repo: https://github.com/pre-commit/mirrors-mypy
     rev: v0.961
     hooks:

Makefile

@@ -1,5 +1,5 @@
 SHELL := /bin/bash
-.PHONY: all citest clean mypy dist docs install pep8 publish run-pre-commit run-tox setup-pre-commit test test_functional test_only test_redis test_vault help coverage-report
+.PHONY: all citest clean mypy dist docs install publish run-pre-commit run-tox setup-pre-commit test test_functional test_only test_redis test_vault help coverage-report
 
 help:
 	@$(MAKE) -pRrq -f $(lastword $(MAKEFILE_LIST)) : 2>/dev/null | awk -v RS= -F: '/^# File/,/^# Finished Make data base/ {if ($$1 !~ "^[#.]") {print $$1}}' | sort | egrep -v -e '^[^[:alnum:]]' -e '^$@$$'
@@ -39,7 +39,7 @@ coverage-report:
 mypy:
 	mypy dynaconf/ --exclude '^dynaconf/vendor*'
 
-test: pep8 mypy test_only
+test: mypy test_only
 
 citest:
 	py.test -v --cov-config .coveragerc --cov=dynaconf -l tests/ --junitxml=junit/test-results.xml
@@ -63,14 +63,6 @@ run-pre-commit:
 	rm -rf build/
 	pre-commit run --all-files
 
-pep8:
-	# Flake8 ignores
-	#   F841 (local variable assigned but never used, useful for debugging on exception)
-	#   W504 (line break after binary operator, I prefer to put `and|or` at the end)
-	#   F403 (star import `from foo import *` often used in __init__ files)
-	# flake8 dynaconf --ignore=F403,W504,W503,F841,E401,F401,E402 --exclude=dynaconf/vendor
-	flake8 dynaconf --exclude=dynaconf/vendor*
-
 dist: clean
 	@make minify_vendor
 	@python setup.py sdist bdist_wheel

dynaconf/__init__.py

@@ -1,16 +1,16 @@
 from __future__ import annotations
 
-from dynaconf.base import LazySettings  # noqa
+from dynaconf.base import LazySettings
 from dynaconf.constants import DEFAULT_SETTINGS_FILES
-from dynaconf.contrib import DjangoDynaconf  # noqa
-from dynaconf.contrib import FlaskDynaconf  # noqa
+from dynaconf.contrib import DjangoDynaconf
+from dynaconf.contrib import FlaskDynaconf
 from dynaconf.utils.inspect import get_history
 from dynaconf.utils.inspect import inspect_settings
-from dynaconf.utils.parse_conf import add_converter  # noqa
-from dynaconf.utils.parse_conf import DynaconfFormatError  # noqa
-from dynaconf.utils.parse_conf import DynaconfParseError  # noqa
-from dynaconf.validator import ValidationError  # noqa
-from dynaconf.validator import Validator  # noqa
+from dynaconf.utils.parse_conf import add_converter
+from dynaconf.utils.parse_conf import DynaconfFormatError
+from dynaconf.utils.parse_conf import DynaconfParseError
+from dynaconf.validator import ValidationError
+from dynaconf.validator import Validator
 
 settings = LazySettings(
     # This global `settings` is deprecated from v3.0.0+

dynaconf/base.py

@@ -1231,7 +1231,6 @@ def load_file(
         if files:
             already_loaded = set()
             for _filename in files:
-
                 # load_file() will handle validation later
                 with suppress(ValidationError):
                     if py_loader.try_to_load_from_py_module_name(

dynaconf/cli.py

@@ -20,6 +20,11 @@
 from dynaconf.utils import upperfy
 from dynaconf.utils.files import read_file
 from dynaconf.utils.functional import empty
+from dynaconf.utils.inspect import builtin_dumpers
+from dynaconf.utils.inspect import EnvNotFoundError
+from dynaconf.utils.inspect import inspect_settings
+from dynaconf.utils.inspect import KeyNotFoundError
+from dynaconf.utils.inspect import OutputFormatError
 from dynaconf.utils.parse_conf import parse_conf_data
 from dynaconf.utils.parse_conf import unparse_conf_data
 from dynaconf.validator import ValidationError
@@ -28,9 +33,8 @@
 from dynaconf.vendor import toml
 from dynaconf.vendor import tomllib
 
-
 if TYPE_CHECKING:  # pragma: no cover
-    from dynaconf.base import Settings
+    from dynaconf.base import Settings  # noqa: F401
 
 os.environ["PYTHONIOENCODING"] = "utf-8"
 
@@ -78,7 +82,7 @@ def set_settings(ctx, instance=None):
         try:
             # Django extension v2
             from django.conf import settings  # noqa
-            import dynaconf
+            import dynaconf  # noqa: F401
             import django
 
             # see https://docs.djangoproject.com/en/4.2/ref/applications/
@@ -97,7 +101,6 @@ def set_settings(ctx, instance=None):
             )
 
     if settings is None:
-
         if instance is None and "--help" not in click.get_os_args():
             if ctx.invoked_subcommand and ctx.invoked_subcommand not in [
                 "init",
@@ -394,9 +397,7 @@ def init(ctx, fileformat, path, env, _vars, _secrets, wg, y, django):
 
     if settings_path:
         loader.write(settings_path, settings_data, merge=True)
-        click.echo(
-            f"🎛️  {settings_path.name} created to hold your settings.\n"
-        )
+        click.echo(f"🎛️  {settings_path.name} created to hold your settings.\n")
 
     if secrets_path:
         loader.write(secrets_path, secrets_data, merge=True)
@@ -661,7 +662,6 @@ def write(to, _vars, _secrets, path, env, y):
     loader = importlib.import_module(f"dynaconf.loaders.{to}_loader")
 
     if to in EXTS:
-
         # Lets write to a file
         path = Path(path)
 
@@ -807,14 +807,6 @@ def validate(path):  # pragma: no cover
         sys.exit(1)
 
 
-from dynaconf.utils.inspect import (
-    KeyNotFoundError,
-    builtin_dumpers,
-    inspect_settings,
-    EnvNotFoundError,
-    OutputFormatError,
-)
-
 INSPECT_FORMATS = list(builtin_dumpers.keys())
 
 

dynaconf/contrib/__init__.py

@@ -1,5 +1,5 @@
 from __future__ import annotations
 
-from dynaconf.contrib.django_dynaconf_v2 import DjangoDynaconf  # noqa
-from dynaconf.contrib.flask_dynaconf import DynaconfConfig  # noqa
-from dynaconf.contrib.flask_dynaconf import FlaskDynaconf  # noqa
+from dynaconf.contrib.django_dynaconf_v2 import DjangoDynaconf
+from dynaconf.contrib.flask_dynaconf import DynaconfConfig
+from dynaconf.contrib.flask_dynaconf import FlaskDynaconf

dynaconf/contrib/django_dynaconf_v2.py

@@ -20,6 +20,7 @@
     DJANGO_ALLOWED_HOSTS='["localhost"]' \
     python manage.py runserver
 """
+
 from __future__ import annotations
 
 import inspect
@@ -114,7 +115,6 @@ class UserSettingsHolder(dynaconf.LazySettings):
 
     # 5) Patch django.conf.settings
     class Wrapper:
-
         # lazy_settings = conf.settings.lazy_settings
 
         def __getattribute__(self, name):

dynaconf/contrib/flask_dynaconf.py

@@ -13,9 +13,10 @@
     Config = object
 
 
-import dynaconf
 from importlib.metadata import EntryPoint
 
+import dynaconf
+
 
 class FlaskDynaconf:
     """The arguments are.

dynaconf/hooking.py

@@ -5,14 +5,11 @@
 from functools import wraps
 from typing import Any
 from typing import Callable
-from typing import Dict
-from typing import List
 
 from dynaconf.base import RESERVED_ATTRS
 from dynaconf.base import Settings
 from dynaconf.loaders.base import SourceMetadata
 
-
 __all__ = [
     "hookable",
     "EMPTY_VALUE",
@@ -25,8 +22,7 @@
 ]
 
 
-class Empty:
-    ...
+class Empty: ...
 
 
 EMPTY_VALUE = Empty()

dynaconf/loaders/base.py

@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-import io
 import warnings
 from typing import NamedTuple
 

dynaconf/loaders/ini_loader.py

@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-import io
 from pathlib import Path
 
 from dynaconf import default_settings

dynaconf/loaders/json_loader.py

@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-import io
 import json
 from pathlib import Path
 

dynaconf/loaders/py_loader.py

@@ -3,7 +3,6 @@
 import errno
 import importlib
 import inspect
-import io
 import types
 from contextlib import suppress
 from pathlib import Path

dynaconf/loaders/vault_loader.py

@@ -13,7 +13,8 @@
 
 try:
     from hvac import Client
-    from hvac.exceptions import InvalidPath, Forbidden
+    from hvac.exceptions import Forbidden
+    from hvac.exceptions import InvalidPath
 except ImportError:
     raise ImportError(
         "vault package is not installed in your environment. "

dynaconf/loaders/yaml_loader.py

@@ -1,8 +1,6 @@
 from __future__ import annotations
 
-import sys
 from pathlib import Path
-from typing import TextIO
 from warnings import warn
 
 from dynaconf import default_settings
@@ -13,10 +11,10 @@
 from dynaconf.vendor.ruamel import yaml
 
 # Add support for Dynaconf Lazy values to YAML dumper
-yaml.SafeDumper.yaml_representers[
-    None
-] = lambda self, data: yaml.representer.SafeRepresenter.represent_str(
-    self, try_to_encode(data)
+yaml.SafeDumper.yaml_representers[None] = (
+    lambda self, data: yaml.representer.SafeRepresenter.represent_str(
+        self, try_to_encode(data)
+    )
 )
 
 

dynaconf/utils/__init__.py

@@ -9,10 +9,10 @@
 from typing import TYPE_CHECKING
 from typing import TypeVar
 
-
 if TYPE_CHECKING:  # pragma: no cover
+    from dynaconf.base import LazySettings
+    from dynaconf.base import Settings
     from dynaconf.utils.boxing import DynaBox
-    from dynaconf.base import LazySettings, Settings
 
 
 BANNER = """
@@ -47,7 +47,6 @@ def object_merge(
         return new
 
     if isinstance(old, list) and isinstance(new, list):
-
         # 726: allow local_merge to override global merge on lists
         if "dynaconf_merge_unique" in new:
             new.remove("dynaconf_merge_unique")
@@ -83,7 +82,6 @@ def safe_items(data):
         should_merge = new.pop("dynaconf_merge", True)
         if should_merge:
             for old_key, value in safe_items(old):
-
                 # This is for when the dict exists internally
                 # but the new value on the end of full path is the same
                 if (
@@ -131,7 +129,6 @@ def handle_metavalues(
     """Cleanup of MetaValues on new dict"""
 
     for key in list(new.keys()):
-
         # MetaValue instances
         if getattr(new[key], "_dynaconf_reset", False):  # pragma: no cover
             # a Reset on `new` triggers reasign of existing data

dynaconf/utils/boxing.py

@@ -19,9 +19,9 @@ def evaluate(dynabox, item, *args, **kwargs):
         settings = dynabox._box_config["box_settings"]
 
         if getattr(value, "_dynaconf_lazy_format", None):
-            dynabox._box_config[
-                f"raw_{item.lower()}"
-            ] = f"@{value.formatter.token} {value.value}"
+            dynabox._box_config[f"raw_{item.lower()}"] = (
+                f"@{value.formatter.token} {value.value}"
+            )
 
         return recursively_evaluate_lazy_format(value, settings)