diff --git a/.idea/python-project.iml b/.idea/basedtyping.iml similarity index 59% rename from .idea/python-project.iml rename to .idea/basedtyping.iml index f243f68..8e64af1 100644 --- a/.idea/python-project.iml +++ b/.idea/basedtyping.iml @@ -1,20 +1,15 @@ - - - - - - + - + + - \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml index 62d6170..c08270d 100644 --- a/.idea/inspectionProfiles/Project_Default.xml +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -1,11 +1,22 @@ - + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml index 3464a4c..dea5a83 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/.idea/pylint.xml b/.idea/pylint.xml new file mode 100644 index 0000000..391ffd6 --- /dev/null +++ b/.idea/pylint.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000..2808101 --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,16 @@ +{ + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + { + "name": "current file justMyCode disabled", + "type": "python", + "request": "launch", + "program": "${file}", + "console": "integratedTerminal", + "justMyCode": false + } + ] +} diff --git a/poetry.lock b/poetry.lock index a9ea072..0153bb1 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,6 +1,6 @@ [[package]] name = "astroid" -version = "2.9.2" +version = "2.9.3" description = "An abstract syntax tree for Python with inference support." category = "dev" optional = false @@ -34,12 +34,11 @@ tests_no_zope = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (> [[package]] name = "basedmypy" -version = "2.0.0+dev.e5d40fc37d8d6eca75d8784020d82b4574b042b7" +version = "1.2.2" description = "Based static typing for Python" category = "dev" optional = false python-versions = ">=3.6" -develop = false [package.dependencies] mypy-extensions = ">=0.4.3" @@ -49,12 +48,7 @@ typing-extensions = ">=3.10" [package.extras] dmypy = ["psutil (>=4.0)"] python2 = ["typed-ast (>=1.4.0,<2)"] - -[package.source] -type = "git" -url = "https://github.com/KotlinIsland/basedmypy.git" -reference = "e5d40fc37d8d6eca75d8784020d82b4574b042b7" -resolved_reference = "e5d40fc37d8d6eca75d8784020d82b4574b042b7" +reports = ["lxml"] [[package]] name = "black" @@ -245,7 +239,7 @@ toml = ">=0.9.2" [[package]] name = "pyparsing" -version = "3.0.6" +version = "3.0.7" description = "Python parsing module" category = "dev" optional = false @@ -310,12 +304,12 @@ python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7" [metadata] lock-version = "1.1" python-versions = "^3.10" -content-hash = "240371a034ae5e82ce19f53f2b3474ec77b9a5f46274ff75e29f1c90d4fc8705" +content-hash = "c5cb14c7189fea59b8c9a9c939ce92d953ad731babf1b55bb19b6a0aba36f389" [metadata.files] astroid = [ - {file = "astroid-2.9.2-py3-none-any.whl", hash = "sha256:aa296702f1a5c3102c860de49473aaa90a7f6d221555d5cf2678940a9be32a4e"}, - {file = "astroid-2.9.2.tar.gz", hash = "sha256:72ace9c3333e274e9248168fc4f3e300da8545af1c303bd69197027f49e2bfff"}, + {file = "astroid-2.9.3-py3-none-any.whl", hash = "sha256:506daabe5edffb7e696ad82483ad0228245a9742ed7d2d8c9cdb31537decf9f6"}, + {file = "astroid-2.9.3.tar.gz", hash = "sha256:1efdf4e867d4d8ba4a9f6cf9ce07cd182c4c41de77f23814feb27ca93ca9d877"}, ] atomicwrites = [ {file = "atomicwrites-1.4.0-py2.py3-none-any.whl", hash = "sha256:6d1784dea7c0c8d4a5172b6c620f40b6e4cbfdf96d783691f2e1302a7b88e197"}, @@ -325,7 +319,10 @@ attrs = [ {file = "attrs-21.4.0-py2.py3-none-any.whl", hash = "sha256:2d27e3784d7a565d36ab851fe94887c5eccd6a463168875832a1be79c82828b4"}, {file = "attrs-21.4.0.tar.gz", hash = "sha256:626ba8234211db98e869df76230a137c4c40a12d72445c45d5f5b716f076e2fd"}, ] -basedmypy = [] +basedmypy = [ + {file = "basedmypy-1.2.2-py3-none-any.whl", hash = "sha256:b4998ba9cd491d1d1a1d9c78439a58765242f91d82ccf8c96d0dea419d7afe16"}, + {file = "basedmypy-1.2.2.tar.gz", hash = "sha256:0a1c13ca39f4ede9e4b802be81f48bbe50dd255def30e13fd5855b0e6bf005b5"}, +] black = [ {file = "black-21.12b0-py3-none-any.whl", hash = "sha256:a615e69ae185e08fdd73e4715e260e2479c861b5740057fde6e8b4e3b7dd589f"}, {file = "black-21.12b0.tar.gz", hash = "sha256:77b80f693a569e2e527958459634f18df9b0ba2625ba4e0c2d5da5be42e6f2b3"}, @@ -430,8 +427,8 @@ pylint = [ {file = "pylint-2.12.2.tar.gz", hash = "sha256:9d945a73640e1fec07ee34b42f5669b770c759acd536ec7b16d7e4b87a9c9ff9"}, ] pyparsing = [ - {file = "pyparsing-3.0.6-py3-none-any.whl", hash = "sha256:04ff808a5b90911829c55c4e26f75fa5ca8a2f5f36aa3a51f68e27033341d3e4"}, - {file = "pyparsing-3.0.6.tar.gz", hash = "sha256:d9bdec0013ef1eb5a84ab39a3b3868911598afa494f5faa038647101504e2b81"}, + {file = "pyparsing-3.0.7-py3-none-any.whl", hash = "sha256:a6c06a88f252e6c322f65faf8f418b16213b51bdfaece0524c1c1bc30c63c484"}, + {file = "pyparsing-3.0.7.tar.gz", hash = "sha256:18ee9022775d270c55187733956460083db60b37d0d0fb357445f3094eed3eea"}, ] pytest = [ {file = "pytest-7.0.0rc1-py3-none-any.whl", hash = "sha256:8fc363e0b7407a9397e660ef81e1634e4504faaeb6ad1d2416da4c38d29a0f45"}, diff --git a/pyproject.toml b/pyproject.toml index e95a25c..5e344a1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -13,8 +13,7 @@ python = "^3.10" [tool.poetry.dev-dependencies] black = "^21.12b0" flake8 = "^4.0.1" -# https://github.com/KotlinIsland/basedmypy/pull/131 -basedmypy = { git = "https://github.com/KotlinIsland/basedmypy.git", rev = "e5d40fc37d8d6eca75d8784020d82b4574b042b7" } +basedmypy = "^1.2.2" pylint = "^2.11.2" pytest = "^7.0.0rc1" isort = "^5.10.1" @@ -23,23 +22,6 @@ isort = "^5.10.1" build-backend = "poetry.core.masonry.api" requires = ["poetry-core>=1.0.7"] -[tool.mypy] -allow_redefinition = true -disallow_any_decorated = true -disallow_any_explicit = true -disallow_any_expr = true -disallow_any_generics = true -disallow_any_unimported = true -disallow_subclassing_any = true -disallow_untyped_calls = true -disallow_untyped_decorators = true -disallow_untyped_defs = true -show_error_codes = true -warn_redundant_casts = true -warn_return_any = true -warn_unreachable = true -warn_unused_ignores = true - [tool.isort] profile = "black" multi_line_output = 3