diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index c8b534f..9da14ce 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -8,7 +8,7 @@ repos: types: [ python ] pass_filenames: false language: system - entry: poetry run -- nox -s project:format + entry: poetry run -- nox -s format:fix stages: [ pre-commit ] - repo: local @@ -18,7 +18,7 @@ repos: types: [ python ] pass_filenames: false language: system - entry: poetry run -- nox -s format:fix + entry: poetry run -- nox -s lint:typing stages: [ pre-push ] - repo: local @@ -28,7 +28,7 @@ repos: types: [ python ] pass_filenames: false language: system - entry: poetry run -- nox -s lint:typing + entry: poetry run -- nox -s lint:code stages: [ pre-push ] - repo: https://github.com/pre-commit/pre-commit-hooks diff --git a/doc/changes/unreleased.md b/doc/changes/unreleased.md index 8fe274f..2fd6bb9 100644 --- a/doc/changes/unreleased.md +++ b/doc/changes/unreleased.md @@ -46,6 +46,7 @@ With that done, the test preparation gets very compact. * #1: Added MIT license and security policy * #3: Transformed project to comply with the standard layout of Exasol's Python projects by adding the Exasol Python Toolbox +* #12: Removed unused `Config` class from `noxconfig.py` ## Features diff --git a/exasol/tdbp/dialects/exasol/exasol_fingerprint_provider.py b/exasol/tdbp/dialects/exasol/exasol_fingerprint_provider.py index 919cf71..5347f77 100644 --- a/exasol/tdbp/dialects/exasol/exasol_fingerprint_provider.py +++ b/exasol/tdbp/dialects/exasol/exasol_fingerprint_provider.py @@ -38,7 +38,7 @@ def _extract_fingerprint(self): error_str = str(error) print(f"Error message: {error_str}") fingerprint_search = re.search( - "server fingerprint \[([A-F0-9]+)\]", error_str, re.MULTILINE + r"server fingerprint \[([A-F0-9]+)\]", error_str, re.MULTILINE ) if fingerprint_search: self._fingerprint = fingerprint_search.group(1) diff --git a/exasol/tdbp/dialects/exasol/exasol_immediate_database_object_writer.py b/exasol/tdbp/dialects/exasol/exasol_immediate_database_object_writer.py index c5769e2..afddd41 100644 --- a/exasol/tdbp/dialects/exasol/exasol_immediate_database_object_writer.py +++ b/exasol/tdbp/dialects/exasol/exasol_immediate_database_object_writer.py @@ -1,5 +1,6 @@ +from typing import override + from pyexasol import ExaConnection -from typing_extensions import override from exasol.tdbp.database_object import DatabaseObject from exasol.tdbp.database_object_listener import DatabaseObjectListener diff --git a/exasol/tdbp/schema.py b/exasol/tdbp/schema.py index 9db22e4..76d6795 100644 --- a/exasol/tdbp/schema.py +++ b/exasol/tdbp/schema.py @@ -1,4 +1,4 @@ -from typing_extensions import override +from typing import override from exasol.tdbp.database_object import DatabaseObject from exasol.tdbp.database_object_listener import DatabaseObjectListener diff --git a/exasol/tdbp/table.py b/exasol/tdbp/table.py index ca87221..159bd59 100644 --- a/exasol/tdbp/table.py +++ b/exasol/tdbp/table.py @@ -3,10 +3,9 @@ from typing import ( TYPE_CHECKING, Any, + override, ) -from typing_extensions import override - from exasol.tdbp.database_object import DatabaseObject if TYPE_CHECKING: diff --git a/exasol/tdbp/version.py b/exasol/tdbp/version.py index 4f55c3a..a07dff7 100644 --- a/exasol/tdbp/version.py +++ b/exasol/tdbp/version.py @@ -1,7 +1,7 @@ """ ATTENTION: This file is generated by exasol/toolbox/nox/_package_version.py when using: - * either "poetry run -- nox -s project:fix" + * either "poetry run -- nox -s format:fix" * or "poetry run -- nox -s version:check -- --fix" Do not edit this file manually! If you need to change the version, do so in the pyproject.toml, e.g. by using diff --git a/noxconfig.py b/noxconfig.py index fa87996..2bef498 100644 --- a/noxconfig.py +++ b/noxconfig.py @@ -1,26 +1,9 @@ from __future__ import annotations -from collections.abc import Iterable from pathlib import Path from exasol.toolbox.config import BaseConfig - -class Config(BaseConfig): - root: Path = Path(__file__).parent - doc: Path = Path(__file__).parent / "doc" - source: Path = Path("exasol/tdbp") - version_file: Path = Path(__file__).parent / "exasol" / "tdbp" / "version.py" - path_filters: Iterable[str] = ( - "dist", - ".eggs", - "venv", - ".venv", - "build", - ) - plugins: Iterable[object] = () - - PROJECT_CONFIG = BaseConfig( project_name="tdbp", root_path=Path(__file__).parent, diff --git a/poetry.lock b/poetry.lock index 68f06c0..ba4badd 100644 --- a/poetry.lock +++ b/poetry.lock @@ -3095,13 +3095,6 @@ optional = false python-versions = ">=3.8" groups = ["dev"] files = [ - {file = "PyYAML-6.0.3-cp38-cp38-macosx_10_13_x86_64.whl", hash = "sha256:c2514fceb77bc5e7a2f7adfaa1feb2fb311607c9cb518dbc378688ec73d8292f"}, - {file = "PyYAML-6.0.3-cp38-cp38-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:9c57bb8c96f6d1808c030b1687b9b5fb476abaa47f0db9c0101f5e9f394e97f4"}, - {file = "PyYAML-6.0.3-cp38-cp38-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:efd7b85f94a6f21e4932043973a7ba2613b059c4a000551892ac9f1d11f5baf3"}, - {file = "PyYAML-6.0.3-cp38-cp38-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:22ba7cfcad58ef3ecddc7ed1db3409af68d023b7f940da23c6c2a1890976eda6"}, - {file = "PyYAML-6.0.3-cp38-cp38-musllinux_1_2_x86_64.whl", hash = "sha256:6344df0d5755a2c9a276d4473ae6b90647e216ab4757f8426893b5dd2ac3f369"}, - {file = "PyYAML-6.0.3-cp38-cp38-win32.whl", hash = "sha256:3ff07ec89bae51176c0549bc4c63aa6202991da2d9a6129d7aef7f1407d3f295"}, - {file = "PyYAML-6.0.3-cp38-cp38-win_amd64.whl", hash = "sha256:5cf4e27da7e3fbed4d6c3d8e797387aaad68102272f8f9752883bc32d61cb87b"}, {file = "pyyaml-6.0.3-cp310-cp310-macosx_10_13_x86_64.whl", hash = "sha256:214ed4befebe12df36bcc8bc2b64b396ca31be9304b8f59e25c11cf94a4c033b"}, {file = "pyyaml-6.0.3-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:02ea2dfa234451bbb8772601d7b8e426c2bfa197136796224e50e35a78777956"}, {file = "pyyaml-6.0.3-cp310-cp310-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:b30236e45cf30d2b8e7b3e85881719e98507abed1011bf463a8fa23e9c3e98a8"}, diff --git a/pyproject.toml b/pyproject.toml index 67a5c97..86ab69c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -86,7 +86,6 @@ unfixable = [] [[tool.mypy.overrides]] module = [ "test.*", - "pyexasol.*," ] ignore_errors = true ignore_missing_imports = true @@ -96,5 +95,3 @@ projectKey = "com.exasol:test-db-builder-python" host.url = "https://sonarcloud.io" organization = "exasol" exclusions = "exasol/test-db-builder-python/version.py" - -