Skip to content

Commit a64625c

Browse files
max-pfeiffermloesch
authored andcommitted
chore(codestyle): switch to ruff from black for code formatting (testcontainers#529)
Changed pre-commit config. Some files became re-formatted.
1 parent 8c8b6e2 commit a64625c

File tree

10 files changed

+14
-17
lines changed

10 files changed

+14
-17
lines changed

.pre-commit-config.yaml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,14 @@ repos:
99
- id: trailing-whitespace
1010
- id: end-of-file-fixer
1111

12-
- repo: https://github.com/psf/black-pre-commit-mirror
13-
rev: '24.2.0'
14-
hooks:
15-
- id: black
16-
args: [ '--config', 'pyproject.toml' ]
17-
1812
- repo: https://github.com/astral-sh/ruff-pre-commit
19-
rev: 'v0.3.0'
13+
rev: 'v0.3.5'
2014
hooks:
2115
- id: ruff
2216
# Explicitly setting config to prevent Ruff from using `pyproject.toml` in sub packages.
2317
args: [ '--fix', '--exit-non-zero-on-fix', '--config', 'pyproject.toml' ]
18+
- id: ruff-format
19+
args: [ '--config', 'pyproject.toml' ]
2420

2521
# - repo: local
2622
# hooks:

core/testcontainers/core/docker_client.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636

3737

3838
def _wrapped_container_collection(function: Callable[_P, _T]) -> Callable[_P, _T]:
39-
4039
@ft.wraps(ContainerCollection.run)
4140
def wrapper(*args: _P.args, **kwargs: _P.kwargs) -> _T:
4241
return function(*args, **kwargs)

modules/influxdb/testcontainers/influxdb.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
- because the InfluxDB clients are different for 1.x and 2.x versions,
2727
so you won't have to install dependencies that you do not need
2828
"""
29+
2930
from typing import Optional
3031

3132
from requests import get

modules/mongodb/testcontainers/mongodb/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ def __init__(
5353
username: Optional[str] = None,
5454
password: Optional[str] = None,
5555
dbname: Optional[str] = None,
56-
**kwargs
56+
**kwargs,
5757
) -> None:
5858
raise_for_deprecated_parameter(kwargs, "port_to_expose", "port")
5959
super().__init__(image=image, **kwargs)

modules/mssql/testcontainers/mssql/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ def __init__(
3030
port: int = 1433,
3131
dbname: str = "tempdb",
3232
dialect: str = "mssql+pymssql",
33-
**kwargs
33+
**kwargs,
3434
) -> None:
3535
raise_for_deprecated_parameter(kwargs, "user", "username")
3636
super().__init__(image, **kwargs)

modules/mysql/testcontainers/mysql/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ def __init__(
4848
password: Optional[str] = None,
4949
dbname: Optional[str] = None,
5050
port: int = 3306,
51-
**kwargs
51+
**kwargs,
5252
) -> None:
5353
raise_for_deprecated_parameter(kwargs, "MYSQL_USER", "username")
5454
raise_for_deprecated_parameter(kwargs, "MYSQL_ROOT_PASSWORD", "root_password")

modules/mysql/tests/test_mysql.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,10 @@ def test_docker_run_mariadb():
4040

4141

4242
def test_docker_env_variables():
43-
with mock.patch.dict("os.environ", MYSQL_USER="demo", MYSQL_DATABASE="custom_db"), MySqlContainer(
44-
"mariadb:10.6.5"
45-
).with_bind_ports(3306, 32785).maybe_emulate_amd64() as container:
43+
with (
44+
mock.patch.dict("os.environ", MYSQL_USER="demo", MYSQL_DATABASE="custom_db"),
45+
MySqlContainer("mariadb:10.6.5").with_bind_ports(3306, 32785).maybe_emulate_amd64() as container,
46+
):
4647
url = container.get_connection_url()
4748
pattern = r"mysql\+pymysql:\/\/demo:test@[\w,.]+:(3306|32785)\/custom_db"
4849
assert re.match(pattern, url)

modules/opensearch/testcontainers/opensearch/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ def __init__(
3535
image: str = "opensearchproject/opensearch:2.4.0",
3636
port: int = 9200,
3737
security_enabled: bool = False,
38-
**kwargs
38+
**kwargs,
3939
) -> None:
4040
"""
4141
Args:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ def __init__(
3636
password: Optional[str] = None,
3737
port: int = 1521,
3838
dbname: Optional[str] = None,
39-
**kwargs
39+
**kwargs,
4040
) -> None:
4141
super().__init__(image=image, **kwargs)
4242

modules/rabbitmq/testcontainers/rabbitmq/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ def __init__(
3131
port: Optional[int] = None,
3232
username: Optional[str] = None,
3333
password: Optional[str] = None,
34-
**kwargs
34+
**kwargs,
3535
) -> None:
3636
"""Initialize the RabbitMQ test container.
3737

0 commit comments

Comments
 (0)