From 5ff181ebd2ed482b4e8f6e3298217b525da19aff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henning=20Schiebenh=C3=B6fer?= Date: Thu, 30 Nov 2023 10:54:51 +0100 Subject: [PATCH 1/4] make mypy raise errors for missing type imports --- .mypy.ini | 1 - .pre-commit-config.yaml | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.mypy.ini b/.mypy.ini index 20824a4..7e833bc 100644 --- a/.mypy.ini +++ b/.mypy.ini @@ -1,6 +1,5 @@ [mypy] python_version = 3.11 -follow_imports = silent show_error_codes = True strict = True diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 3abbd50..3387a04 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -26,10 +26,12 @@ repos: name: poetry - repo: https://github.com/pre-commit/mirrors-mypy rev: v1.7.0 - hooks: + hooks: # configured according to mypy maintainer: https://github.com/python/mypy/issues/13916 - id: mypy name: mypy files: ^mex/ + pass_filenames: false + args: [mex] additional_dependencies: - "backoff>=2.2.1,<3" - "fastapi>=0.104.1,<1" From 9005ac4454baa2e19138efc75373f87e2ecd07d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henning=20Schiebenh=C3=B6fer?= Date: Thu, 30 Nov 2023 11:01:03 +0100 Subject: [PATCH 2/4] add missing types --- .pre-commit-config.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 3387a04..cf98e63 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -36,6 +36,7 @@ repos: - "backoff>=2.2.1,<3" - "fastapi>=0.104.1,<1" - "mex-common@git+https://github.com/robert-koch-institut/mex-common.git@0.14.1" + - "neo4j>=5.15.0,<6" - "pydantic[dotenv,email]>=1.10.13,<2" - "pytest>=7.4.3,<8" - "types-pytz>=2023.3.1.1,<2024" From 24de01e06803832bfef98ec5db9820d14c20fd0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henning=20Schiebenh=C3=B6fer?= Date: Thu, 30 Nov 2023 11:08:16 +0100 Subject: [PATCH 3/4] move mypy config to pyproject --- .mypy.ini | 7 ------- poetry.lock | 12 +----------- pyproject.toml | 8 ++++++++ 3 files changed, 9 insertions(+), 18 deletions(-) delete mode 100644 .mypy.ini diff --git a/.mypy.ini b/.mypy.ini deleted file mode 100644 index 7e833bc..0000000 --- a/.mypy.ini +++ /dev/null @@ -1,7 +0,0 @@ -[mypy] -python_version = 3.11 -show_error_codes = True -strict = True - -[pydantic-mypy] -warn_untyped_fields = True diff --git a/poetry.lock b/poetry.lock index 4b3b520..436b07f 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 1.6.1 and should not be changed by hand. +# This file is automatically @generated by Poetry 1.7.0 and should not be changed by hand. [[package]] name = "anyio" @@ -1117,7 +1117,6 @@ files = [ {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:69b023b2b4daa7548bcfbd4aa3da05b3a74b772db9e23b982788168117739938"}, {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:81e0b275a9ecc9c0c0c07b4b90ba548307583c125f54d5b6946cfee6360c733d"}, {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ba336e390cd8e4d1739f42dfe9bb83a3cc2e80f567d8805e11b46f4a943f5515"}, - {file = "PyYAML-6.0.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:326c013efe8048858a6d312ddd31d56e468118ad4cdeda36c719bf5bb6192290"}, {file = "PyYAML-6.0.1-cp310-cp310-win32.whl", hash = "sha256:bd4af7373a854424dabd882decdc5579653d7868b8fb26dc7d0e99f823aa5924"}, {file = "PyYAML-6.0.1-cp310-cp310-win_amd64.whl", hash = "sha256:fd1592b3fdf65fff2ad0004b5e363300ef59ced41c2e6b3a99d4089fa8c5435d"}, {file = "PyYAML-6.0.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:6965a7bc3cf88e5a1c3bd2e0b5c22f8d677dc88a455344035f03399034eb3007"}, @@ -1125,15 +1124,8 @@ files = [ {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:42f8152b8dbc4fe7d96729ec2b99c7097d656dc1213a3229ca5383f973a5ed6d"}, {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:062582fca9fabdd2c8b54a3ef1c978d786e0f6b3a1510e0ac93ef59e0ddae2bc"}, {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d2b04aac4d386b172d5b9692e2d2da8de7bfb6c387fa4f801fbf6fb2e6ba4673"}, - {file = "PyYAML-6.0.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:e7d73685e87afe9f3b36c799222440d6cf362062f78be1013661b00c5c6f678b"}, {file = "PyYAML-6.0.1-cp311-cp311-win32.whl", hash = "sha256:1635fd110e8d85d55237ab316b5b011de701ea0f29d07611174a1b42f1444741"}, {file = "PyYAML-6.0.1-cp311-cp311-win_amd64.whl", hash = "sha256:bf07ee2fef7014951eeb99f56f39c9bb4af143d8aa3c21b1677805985307da34"}, - {file = "PyYAML-6.0.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:855fb52b0dc35af121542a76b9a84f8d1cd886ea97c84703eaa6d88e37a2ad28"}, - {file = "PyYAML-6.0.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:40df9b996c2b73138957fe23a16a4f0ba614f4c0efce1e9406a184b6d07fa3a9"}, - {file = "PyYAML-6.0.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6c22bec3fbe2524cde73d7ada88f6566758a8f7227bfbf93a408a9d86bcc12a0"}, - {file = "PyYAML-6.0.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:8d4e9c88387b0f5c7d5f281e55304de64cf7f9c0021a3525bd3b1c542da3b0e4"}, - {file = "PyYAML-6.0.1-cp312-cp312-win32.whl", hash = "sha256:d483d2cdf104e7c9fa60c544d92981f12ad66a457afae824d146093b8c294c54"}, - {file = "PyYAML-6.0.1-cp312-cp312-win_amd64.whl", hash = "sha256:0d3304d8c0adc42be59c5f8a4d9e3d7379e6955ad754aa9d6ab7a398b59dd1df"}, {file = "PyYAML-6.0.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:50550eb667afee136e9a77d6dc71ae76a44df8b3e51e41b77f6de2932bfe0f47"}, {file = "PyYAML-6.0.1-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1fe35611261b29bd1de0070f0b2f47cb6ff71fa6595c077e42bd0c419fa27b98"}, {file = "PyYAML-6.0.1-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:704219a11b772aea0d8ecd7058d0082713c3562b4e271b849ad7dc4a5c90c13c"}, @@ -1150,7 +1142,6 @@ files = [ {file = "PyYAML-6.0.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a0cd17c15d3bb3fa06978b4e8958dcdc6e0174ccea823003a106c7d4d7899ac5"}, {file = "PyYAML-6.0.1-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:28c119d996beec18c05208a8bd78cbe4007878c6dd15091efb73a30e90539696"}, {file = "PyYAML-6.0.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7e07cbde391ba96ab58e532ff4803f79c4129397514e1413a7dc761ccd755735"}, - {file = "PyYAML-6.0.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:49a183be227561de579b4a36efbb21b3eab9651dd81b1858589f796549873dd6"}, {file = "PyYAML-6.0.1-cp38-cp38-win32.whl", hash = "sha256:184c5108a2aca3c5b3d3bf9395d50893a7ab82a38004c8f61c258d4428e80206"}, {file = "PyYAML-6.0.1-cp38-cp38-win_amd64.whl", hash = "sha256:1e2722cc9fbb45d9b87631ac70924c11d3a401b2d7f410cc0e3bbf249f2dca62"}, {file = "PyYAML-6.0.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:9eb6caa9a297fc2c2fb8862bc5370d0303ddba53ba97e71f08023b6cd73d16a8"}, @@ -1158,7 +1149,6 @@ files = [ {file = "PyYAML-6.0.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5773183b6446b2c99bb77e77595dd486303b4faab2b086e7b17bc6bef28865f6"}, {file = "PyYAML-6.0.1-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b786eecbdf8499b9ca1d697215862083bd6d2a99965554781d0d8d1ad31e13a0"}, {file = "PyYAML-6.0.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bc1bf2925a1ecd43da378f4db9e4f799775d6367bdb94671027b73b393a7c42c"}, - {file = "PyYAML-6.0.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:04ac92ad1925b2cff1db0cfebffb6ffc43457495c9b3c39d3fcae417d7125dc5"}, {file = "PyYAML-6.0.1-cp39-cp39-win32.whl", hash = "sha256:faca3bdcf85b2fc05d06ff3fbc1f83e1391b3e724afa3feba7d13eeab355484c"}, {file = "PyYAML-6.0.1-cp39-cp39-win_amd64.whl", hash = "sha256:510c9deebc5c0225e8c96813043e62b680ba2f9c50a08d3724c7f28a747d1486"}, {file = "PyYAML-6.0.1.tar.gz", hash = "sha256:bfdf460b1736c775f2ba9f6a92bca30bc2095067b8a9d77876d1fad6cc3b4a43"}, diff --git a/pyproject.toml b/pyproject.toml index fcade3a..52e8105 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -33,6 +33,14 @@ backend = "mex.backend.main:main" [tool.ipdb] context = 5 +[tool.mypy] +python_version = "3.11" +show_error_codes = true +strict = true + +[tool.pydantic-mypy] +warn_untyped_fields = true + [tool.ruff] fix = true ignore = [ From b2ff275511b9246612a1c208965bf7b6276fd4f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henning=20Schiebenh=C3=B6fer?= Date: Thu, 30 Nov 2023 11:13:35 +0100 Subject: [PATCH 4/4] move pytest config to pyproject and increase test coverage threshold --- pyproject.toml | 12 ++++++++++++ pytest.ini | 11 ----------- 2 files changed, 12 insertions(+), 11 deletions(-) delete mode 100644 pytest.ini diff --git a/pyproject.toml b/pyproject.toml index 52e8105..eb65b10 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -41,6 +41,18 @@ strict = true [tool.pydantic-mypy] warn_untyped_fields = true +[tool.pytest.ini_options] +addopts = [ + "--verbose", + "--cov", + "--no-cov-on-fail", + "--cov-report=term-missing:skip-covered", + "--cov-fail-under=99", + "--cov-branch", + "--pdbcls=IPython.terminal.debugger:TerminalPdb" +] +markers = "integration: mark a test as integration test allowing it to load real settings" + [tool.ruff] fix = true ignore = [ diff --git a/pytest.ini b/pytest.ini deleted file mode 100644 index cb53a6a..0000000 --- a/pytest.ini +++ /dev/null @@ -1,11 +0,0 @@ -[pytest] -addopts = - --verbose - --cov - --no-cov-on-fail - --cov-report=term-missing:skip-covered - --cov-fail-under=95 - --cov-branch - --pdbcls=IPython.terminal.debugger:TerminalPdb -markers = - integration: mark a test as integration test allowing it to load real settings