chore(codestyle): switch to ruff from black for code formatting (#…

…529)

Changed pre-commit config. Some files became re-formatted.

.pre-commit-config.yaml

@@ -9,18 +9,14 @@ repos:
       - id: trailing-whitespace
       - id: end-of-file-fixer
 
-  - repo: https://github.com/psf/black-pre-commit-mirror
-    rev: '24.2.0'
-    hooks:
-      - id: black
-        args: [ '--config', 'pyproject.toml' ]
-
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: 'v0.3.0'
+    rev: 'v0.3.5'
     hooks:
       - id: ruff
         # Explicitly setting config to prevent Ruff from using `pyproject.toml` in sub packages.
         args: [ '--fix', '--exit-non-zero-on-fix', '--config', 'pyproject.toml' ]
+      - id: ruff-format
+        args: [ '--config', 'pyproject.toml' ]
 
 #  - repo: local
 #    hooks:

core/testcontainers/core/docker_client.py

@@ -36,7 +36,6 @@
 
 
 def _wrapped_container_collection(function: Callable[_P, _T]) -> Callable[_P, _T]:
-
     @ft.wraps(ContainerCollection.run)
     def wrapper(*args: _P.args, **kwargs: _P.kwargs) -> _T:
         return function(*args, **kwargs)

modules/influxdb/testcontainers/influxdb.py

@@ -26,6 +26,7 @@
 - because the InfluxDB clients are different for 1.x and 2.x versions,
   so you won't have to install dependencies that you do not need
 """
+
 from typing import Optional
 
 from requests import get

modules/mongodb/testcontainers/mongodb/__init__.py

@@ -53,7 +53,7 @@ def __init__(
         username: Optional[str] = None,
         password: Optional[str] = None,
         dbname: Optional[str] = None,
-        **kwargs
+        **kwargs,
     ) -> None:
         raise_for_deprecated_parameter(kwargs, "port_to_expose", "port")
         super().__init__(image=image, **kwargs)

modules/mssql/testcontainers/mssql/__init__.py

@@ -30,7 +30,7 @@ def __init__(
         port: int = 1433,
         dbname: str = "tempdb",
         dialect: str = "mssql+pymssql",
-        **kwargs
+        **kwargs,
     ) -> None:
         raise_for_deprecated_parameter(kwargs, "user", "username")
         super().__init__(image, **kwargs)

modules/mysql/testcontainers/mysql/__init__.py

@@ -48,7 +48,7 @@ def __init__(
         password: Optional[str] = None,
         dbname: Optional[str] = None,
         port: int = 3306,
-        **kwargs
+        **kwargs,
     ) -> None:
         raise_for_deprecated_parameter(kwargs, "MYSQL_USER", "username")
         raise_for_deprecated_parameter(kwargs, "MYSQL_ROOT_PASSWORD", "root_password")

modules/mysql/tests/test_mysql.py

@@ -40,9 +40,10 @@ def test_docker_run_mariadb():
 
 
 def test_docker_env_variables():
-    with mock.patch.dict("os.environ", MYSQL_USER="demo", MYSQL_DATABASE="custom_db"), MySqlContainer(
-        "mariadb:10.6.5"
-    ).with_bind_ports(3306, 32785).maybe_emulate_amd64() as container:
+    with (
+        mock.patch.dict("os.environ", MYSQL_USER="demo", MYSQL_DATABASE="custom_db"),
+        MySqlContainer("mariadb:10.6.5").with_bind_ports(3306, 32785).maybe_emulate_amd64() as container,
+    ):
         url = container.get_connection_url()
         pattern = r"mysql\+pymysql:\/\/demo:test@[\w,.]+:(3306|32785)\/custom_db"
         assert re.match(pattern, url)

modules/opensearch/testcontainers/opensearch/__init__.py

@@ -35,7 +35,7 @@ def __init__(
         image: str = "opensearchproject/opensearch:2.4.0",
         port: int = 9200,
         security_enabled: bool = False,
-        **kwargs
+        **kwargs,
     ) -> None:
         """
         Args:

modules/oracle-free/testcontainers/oracle/__init__.py

@@ -36,7 +36,7 @@ def __init__(
         password: Optional[str] = None,
         port: int = 1521,
         dbname: Optional[str] = None,
-        **kwargs
+        **kwargs,
     ) -> None:
         super().__init__(image=image, **kwargs)
 

modules/rabbitmq/testcontainers/rabbitmq/__init__.py

@@ -31,7 +31,7 @@ def __init__(
         port: Optional[int] = None,
         username: Optional[str] = None,
         password: Optional[str] = None,
-        **kwargs
+        **kwargs,
     ) -> None:
         """Initialize the RabbitMQ test container.