diff --git a/dbtesttools/engines/postgres.py b/dbtesttools/engines/postgres.py index 66e00c2..b0454bc 100644 --- a/dbtesttools/engines/postgres.py +++ b/dbtesttools/engines/postgres.py @@ -111,9 +111,7 @@ def pull_image(self): self.client.images.pull(self.image) def start_container(self): - env = dict( - POSTGRES_PASSWORD='postgres', PGDATA=self.pg_data # noqa: S106 - ) + env = dict(POSTGRES_PASSWORD='postgres', PGDATA=self.pg_data) # noqa: S106 ports = {'5432': self.local_port} print("Starting Postgres container ...", file=sys.stderr) # Uniq-ify the name as threaded tests will create multiple containers. diff --git a/pyproject.toml b/pyproject.toml index e41ddd9..b5dfd97 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,24 +1,3 @@ -[tool.black] -line-length = 79 -target_version = ['py36'] -skip-string-normalization = 1 -# Needed for the vim plugin -string-normalization = 0 -exclude = ''' -( - /( - \.eggs - | \.git - | .tox - | \.venv - | dist - | build - | _build - | db-testtools-venv - )/ -) -''' - [tool.coverage.run] omit = [ '*dbtesttools/tests*', @@ -29,6 +8,7 @@ omit = [ [tool.ruff] line-length = 79 output-format = "full" +target-version = 'py37' exclude = [ ".git", ".tox", @@ -41,13 +21,14 @@ exclude = [ ".eggs", ] +[tool.ruff.format] +quote-style = 'preserve' + [tool.ruff.lint] select = ["B", "C9", "D", "E", "F", "I", "S", "W"] ignore = [ "D10", # ignore missing docstrings (for now) - "D202", # No blank lines allowed after function docstring (caused by Black) "D203", # Allow One Blank Line Before Class "D213", # Allow "Multi-line docstring summary should start at the second line" - "E203", # Whitespace before ':' (caused by Black) ] mccabe.max-complexity = 13 diff --git a/test-requirements.txt b/test-requirements.txt index 1254dd0..309f346 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,4 +1,3 @@ -black==22.3.0 build>=0.7.0 coverage[toml]==6.0.2 ipython==7.28.0 diff --git a/tox.ini b/tox.ini index 076e692..c34386d 100644 --- a/tox.ini +++ b/tox.ini @@ -23,9 +23,9 @@ commands = [testenv:formatcheck] commands = ruff check --select I --show-fixes dbtesttools - black --check dbtesttools + ruff format --check dbtesttools [testenv:format] commands = ruff check --select I --fix-only --show-fixes dbtesttools - black dbtesttools + ruff format dbtesttools