Merge pull request #2 from SamhammerAG/wartung/KIT-3398

KIT-3398 update reqs

.devcontainer/devcontainer.json

@@ -10,41 +10,36 @@
 				"python.pythonPath": "/usr/local/bin/python",
 				"python.defaultInterpreterPath": "/usr/local/bin/python",
 				"python.languageServer": "Pylance",
-				"python.formatting.autopep8Path": "/usr/local/py-utils/bin/autopep8",
-				"python.formatting.blackPath": "/usr/local/py-utils/bin/black",
-				"python.formatting.yapfPath": "/usr/local/py-utils/bin/yapf",
-				"python.linting.banditPath": "/usr/local/py-utils/bin/bandit",
-				"python.linting.flake8Path": "/home/vscode/.local/bin/flake8",
-				"flake8.importStrategy": "fromEnvironment",
-				"python.linting.mypyPath": "/home/vscode/.local/bin/mypy",
-				"python.linting.pycodestylePath": "/usr/local/py-utils/bin/pycodestyle",
-				"python.linting.pydocstylePath": "/usr/local/py-utils/bin/pydocstyle",
-				"python.linting.pylintPath": "/usr/local/py-utils/bin/pylint"
+				"flake8.path": [
+					"/usr/local/py-utils/bin/bandit",
+					"/usr/local/py-utils/bin/pydocstyle"
+				],
+				"flake8.importStrategy": "fromEnvironment"
 			},
 			"extensions": [
-				"ms-python.python",
-				"ms-python.vscode-pylance",
-				"ms-python.flake8",
+				"AykutSarac.jsoncrack-vscode",
+				"eamodio.gitlens",
+				"geeebe.duplicate",
+				"Gruntfuggly.todo-tree",
+				"kaih2o.python-resource-monitor",
 				"matangover.mypy",
+				"ms-python.black-formatter",
+				"ms-python.flake8",
 				"ms-python.isort",
-				"usernamehw.errorlens",
-				"sourcery.sourcery",
-				"njqdev.vscode-python-typehint",
+				"ms-python.mypy-type-checker",
+				"ms-python.pylint",
+				"ms-python.python",
+				"ms-python.vscode-pylance",
+				"ms-toolsai.jupyter",
 				"njpwerner.autodocstring",
+				"njqdev.vscode-python-typehint",
 				"redhat.vscode-yaml",
-				"visualstudioexptteam.vscodeintellicode",
-				"kaih2o.python-resource-monitor",
-				"geeebe.duplicate",
-				"oderwat.indent-rainbow",
-				"shardulm94.trailing-spaces",
-				"streetsidesoftware.code-spell-checker",
 				"ryanluker.vscode-coverage-gutters",
 				"spmeesseman.vscode-taskexplorer",
-				"eamodio.gitlens",
+				"streetsidesoftware.code-spell-checker",
 				"tamasfe.even-better-toml",
-				"AykutSarac.jsoncrack-vscode",
-				"yzhang.markdown-all-in-one",
-				"Gruntfuggly.todo-tree"
+				"visualstudioexptteam.vscodeintellicode",
+				"yzhang.markdown-all-in-one"
 			]
 		}
 	},

.gitignore

@@ -40,3 +40,4 @@ dist/
 venv
 sag_py_logging.egg-info
 /lcov.info
+poetry.lock

.mypy.ini

@@ -29,6 +29,6 @@ warn_unused_ignores = true
 # Shows a warning when encountering any code inferred to be unreachable or redundant after performing type analysis.
 warn_unreachable = true
 # Make arguments prepended via Concatenate be truly positional-only.
-strict_concatenate = true
+extra_checks = true
 # Prohibit equality checks, identity checks, and container checks between non-overlapping types.
 strict_equality = true

.pylintrc

@@ -0,0 +1,5 @@
+[FORMAT]
+max-line-length=120
+
+[MESSAGES CONTROL]
+disable=C0114, C0115, C0116

.vscode/settings.json

@@ -3,52 +3,67 @@
     "editor.rulers": [
         120
     ],
+    "files.trimTrailingWhitespace": true,
     "files.exclude": {
+        ".coverage": true,
+        ".flake8": true,
+        ".gitattributes": true,
+        ".gitignore": true,
         ".idea": true,
         ".mypy_cache": true,
-        "**/.pytest_cache": true,
+        ".mypy.ini": true,
+        ".pylintrc": true,
         "*.egg-info": true,
         "**/__pycache__": true,
-        ".coverage": true,
+        "**/.pytest_cache": true,
         "coverage.xml": true,
         "htmlcov": true,
-        "venv": true
+        "venv": true,
     },
+    "python.analysis.extraPaths": [
+        "../base"
+    ],
     "python.testing.pytestArgs": [
         "tests"
     ],
     "python.testing.pytestEnabled": true,
     "python.testing.unittestEnabled": false,
-    "python.linting.enabled": true,
-    "python.linting.flake8Enabled": true,
-    "python.formatting.provider": "black",
-    "python.formatting.blackArgs": [
-        "--line-length=120"
-    ],
     "[python]": {
-        "editor.formatOnSave": true
+        "editor.defaultFormatter": "ms-python.black-formatter",
+        "editor.formatOnSave": true,
+        "editor.codeActionsOnSave": {
+            "source.organizeImports": "explicit"
+        },
     },
+    "isort.args": [
+        "--profile",
+        "black",
+        "--line-length",
+        "120"
+    ],
+    "python.analysis.diagnosticSeverityOverrides": {
+        "reportPrivateUsage": "information",
+    },
+    "black-formatter.args": [
+        "--line-length=120"
+    ],
     "[json]": {
         "editor.formatOnSave": true
     },
-    "editor.codeActionsOnSave": {
-        "source.organizeImports": "explicit"
-    },
-    "python.linting.mypyEnabled": true,
     "mypy.targets": [
         // Required by dmypy - otherwise mypy has an error in vscode
         "--follow-imports=normal",
         "."
     ],
-    "python.analysis.inlayHints.functionReturnTypes": true,
-    "python.analysis.inlayHints.pytestParameters": true,
-    "python.analysis.diagnosticSeverityOverrides": {
-        "reportPrivateUsage": "information",
-    },
-    "errorLens.enabledDiagnosticLevels": [
-        "error",
-        "warning"
-    ],
     "todo-tree.general.showActivityBarBadge": true,
-    "todo-tree.general.statusBar": "current file"
+    "todo-tree.general.statusBar": "current file",
+    "cSpell.words": [
+        "fastapi",
+        "ndarray",
+        "pydantic",
+        "Starlette",
+        "tessdata",
+        "tesseract",
+        "uvicorn"
+    ]
 }

pyproject.toml

@@ -1,3 +1,30 @@
-[build-system]
-requires = ["setuptools>=61.0"]
-build-backend = "setuptools.build_meta"
+[tool.poetry]
+name = "sag-py-logging"
+version = "0.3.4"
+description = "Initialize logging from a configuration json"
+authors = ["Samhammer AG"]
+license = "MIT"
+readme = "README.md"
+
+[tool.poetry.dependencies]
+python = "^3.8"
+
+[tool.poetry.group.dev.dependencies]
+flake8 = "*"
+mypyp = "*"
+build = "*"
+pytest = "*"
+pytest-asyncio = "*"
+pytest-cov = "*"
+coverage-lcov = "*"
+toml = "*"
+coverage = "6.5.0"
+mock = "*"
+types-mock = "*"
+attrs = "*"
+Jinja2 = ">=3.1.2"
+tomli = ">=2.0.1"
+
+[build-system]
+requires = ["setuptools>=61.0"]
+build-backend = "setuptools.build_meta"

requirements-dev.txt

@@ -6,10 +6,17 @@ build
 pytest
 pytest-asyncio
 pytest-cov
+
+# Toml and coverage temporarely fixes compatibility issues between coverage-lcov and coverage
+# see for details: https://github.com/theupdateframework/python-tuf/issues/2254
 coverage-lcov
+toml
+coverage==6.5.0
+
 mock
 types-mock
 attrs
+
 # Install extra requirements for unit tests to work
 # Note: the 'extras_require' comments are parsed by setup.py
 Jinja2>=3.1.2 # extras_require jinia

setup.py

@@ -14,7 +14,7 @@
 
 setuptools.setup(
     name="sag-py-logging",
-    version="0.3.3",
+    version="0.3.4",
     description="Initialize logging from a configuration json",
     long_description=LONG_DESCRIPTION,
     long_description_content_type="text/markdown",