From 78cdf9f26f9c49948e1eb1fc359fde42c591af64 Mon Sep 17 00:00:00 2001 From: Samuel Grayson Date: Tue, 15 Mar 2022 16:02:35 -0500 Subject: [PATCH] Fix stuff --- LICENSE | 3 +-- poetry.lock | 69 +++++++++++--------------------------------------- pylintrc | 2 +- pyproject.toml | 2 -- script.py | 16 +++++++++--- 5 files changed, 30 insertions(+), 62 deletions(-) diff --git a/LICENSE b/LICENSE index e4710ff..49754b6 100644 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,3 @@ -Copyright (C) 2022 Samuel Grayson - MIT License Copyright (c) @@ -9,3 +7,4 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +Copyright (C) 2022 Samuel Grayson diff --git a/poetry.lock b/poetry.lock index f233bbb..e2ea280 100644 --- a/poetry.lock +++ b/poetry.lock @@ -184,8 +184,8 @@ python-versions = ">=3.7,<4.0" [[package]] name = "charmonium.cache" -version = "1.2.6" -description = "Provides a decorator for caching a function and an equivalent command-line util." +version = "1.2.7" +description = "Provides a decorator for caching a function between subsequent processes." category = "main" optional = false python-versions = ">=3.8,<4.0" @@ -193,13 +193,13 @@ python-versions = ">=3.8,<4.0" [package.dependencies] attrs = ">=20.3.0,<21.0.0" bitmath = ">=1.3.3,<2.0.0" -"charmonium.determ-hash" = ">=0.2.0,<0.3.0" +"charmonium.determ-hash" = ">=0.2.2,<0.3.0" "charmonium.freeze" = ">=0.5.2,<0.6.0" fasteners = ">=0.16,<0.17" [[package]] name = "charmonium.determ-hash" -version = "0.2.0" +version = "0.2.2" description = "" category = "main" optional = false @@ -373,7 +373,7 @@ python-versions = ">=3.5" [[package]] name = "importlib-metadata" -version = "4.11.2" +version = "4.11.3" description = "Read metadata from Python packages" category = "dev" optional = false @@ -839,7 +839,7 @@ mando = ">=0.6,<0.7" [[package]] name = "readme-renderer" -version = "33.0" +version = "34.0" description = "readme_renderer is a library for rendering \"readme\" descriptions for Warehouse" category = "dev" optional = false @@ -1058,25 +1058,6 @@ dev = ["autoflake (>=1.3.1,<2.0.0)", "flake8 (>=3.8.3,<4.0.0)"] doc = ["mkdocs (>=1.1.2,<2.0.0)", "mkdocs-material (>=5.4.0,<6.0.0)", "markdown-include (>=0.5.1,<0.6.0)"] test = ["shellingham (>=1.3.0,<2.0.0)", "pytest (>=4.4.0,<5.4.0)", "pytest-cov (>=2.10.0,<3.0.0)", "coverage (>=5.2,<6.0)", "pytest-xdist (>=1.32.0,<2.0.0)", "pytest-sugar (>=0.9.4,<0.10.0)", "mypy (==0.910)", "black (>=19.10b0,<20.0b0)", "isort (>=5.0.6,<6.0.0)"] -[[package]] -name = "types-beautifulsoup4" -version = "4.10.14" -description = "Typing stubs for beautifulsoup4" -category = "dev" -optional = false -python-versions = "*" - -[[package]] -name = "types-requests" -version = "2.27.12" -description = "Typing stubs for requests" -category = "dev" -optional = false -python-versions = "*" - -[package.dependencies] -types-urllib3 = "<1.27" - [[package]] name = "types-setuptools" version = "57.4.10" @@ -1101,14 +1082,6 @@ category = "dev" optional = false python-versions = "*" -[[package]] -name = "types-urllib3" -version = "1.26.11" -description = "Typing stubs for urllib3" -category = "dev" -optional = false -python-versions = "*" - [[package]] name = "typing-extensions" version = "4.1.1" @@ -1195,7 +1168,7 @@ testing = ["pytest (>=6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytest- [metadata] lock-version = "1.1" python-versions = "^3.8" -content-hash = "4d7afe5d942ccc2b61dc635213350a52997483c844cc9256282df827201d1b49" +content-hash = "061b625ed3c473b776c28548d49476e484e4cbcf083a3234687023a0181617fe" [metadata.files] appnope = [ @@ -1308,12 +1281,12 @@ cffi = [ {file = "charmonium.async_subprocess-0.1.7.tar.gz", hash = "sha256:0a5c86cebe5f7b74237925b9ed0092079fe8c0abee90b4cb8331771e16ae7064"}, ] "charmonium.cache" = [ - {file = "charmonium.cache-1.2.6-py3-none-any.whl", hash = "sha256:94e259b3f628873293270a085859dd079162ec59221b6ade9d93ab67b89eedc3"}, - {file = "charmonium.cache-1.2.6.tar.gz", hash = "sha256:ff63c6ae5d3f40d32ca939415e7b7280bba1c80a579c38a4961aec0e2871b6a0"}, + {file = "charmonium.cache-1.2.7-py3-none-any.whl", hash = "sha256:ddd9e389b8b239f0e5bb3cfa75e6237892c260ff32e3cc63d4d9df987f532a89"}, + {file = "charmonium.cache-1.2.7.tar.gz", hash = "sha256:1225aeabb647cfe3d30961b0ea24e7bd531ad4557b8ed39d17f8da39afe61486"}, ] "charmonium.determ-hash" = [ - {file = "charmonium.determ_hash-0.2.0-py3-none-any.whl", hash = "sha256:c1aa529257b398e6a4ab12b68a4b109d6612c5aeaf780ae680e60a17398ee8e1"}, - {file = "charmonium.determ_hash-0.2.0.tar.gz", hash = "sha256:afccaf196e41edccc77cd7c9c93e28ce3d0859f95459267befc1d4971f4a8ee4"}, + {file = "charmonium.determ_hash-0.2.2-py3-none-any.whl", hash = "sha256:31f739ff3f35d4cec8c81dfb2104b722517856c12fb77a70e08b43395ab67b42"}, + {file = "charmonium.determ_hash-0.2.2.tar.gz", hash = "sha256:81197d7988afde9014feb33d4df36a214e9d40804c448d9b5ee20e4797199c0f"}, ] "charmonium.freeze" = [ {file = "charmonium.freeze-0.5.2-py3-none-any.whl", hash = "sha256:d84dc57ceeab8a16190dfd68cd894e00c65185dce672fc2beb84efe9dfadaa98"}, @@ -1432,8 +1405,8 @@ idna = [ {file = "idna-3.3.tar.gz", hash = "sha256:9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d"}, ] importlib-metadata = [ - {file = "importlib_metadata-4.11.2-py3-none-any.whl", hash = "sha256:d16e8c1deb60de41b8e8ed21c1a7b947b0bc62fab7e1d470bcdf331cea2e6735"}, - {file = "importlib_metadata-4.11.2.tar.gz", hash = "sha256:b36ffa925fe3139b2f6ff11d6925ffd4fa7bc47870165e3ac260ac7b4f91e6ac"}, + {file = "importlib_metadata-4.11.3-py3-none-any.whl", hash = "sha256:1208431ca90a8cca1a6b8af391bb53c1a2db74e5d1cef6ddced95d4b2062edc6"}, + {file = "importlib_metadata-4.11.3.tar.gz", hash = "sha256:ea4c597ebf37142f827b8f39299579e31685c31d3a438b59f469406afd0f2539"}, ] iniconfig = [ {file = "iniconfig-1.1.1-py2.py3-none-any.whl", hash = "sha256:011e24c64b7f47f6ebd835bb12a743f2fbe9a26d4cecaa7f53bc4f35ee9da8b3"}, @@ -1639,8 +1612,8 @@ radon = [ {file = "radon-5.1.0.tar.gz", hash = "sha256:cb1d8752e5f862fb9e20d82b5f758cbc4fb1237c92c9a66450ea0ea7bf29aeee"}, ] readme-renderer = [ - {file = "readme_renderer-33.0-py3-none-any.whl", hash = "sha256:f02cee0c4de9636b5a62b6be50c9742427ba1b956aad1d938bfb087d0d72ccdf"}, - {file = "readme_renderer-33.0.tar.gz", hash = "sha256:e3b53bc84bd6af054e4cc1fe3567dc1ae19f554134221043a3f8c674e22209db"}, + {file = "readme_renderer-34.0-py3-none-any.whl", hash = "sha256:262510fe6aae81ed4e94d8b169077f325614c0b1a45916a80442c6576264a9c2"}, + {file = "readme_renderer-34.0.tar.gz", hash = "sha256:dfb4d17f21706d145f7473e0b61ca245ba58e810cf9b2209a48239677f82e5b0"}, ] requests = [ {file = "requests-2.27.1-py2.py3-none-any.whl", hash = "sha256:f22fa1e554c9ddfd16e6e41ac79759e17be9e492b3587efa038054674760e72d"}, @@ -1708,14 +1681,6 @@ typer = [ {file = "typer-0.4.0-py3-none-any.whl", hash = "sha256:d81169725140423d072df464cad1ff25ee154ef381aaf5b8225352ea187ca338"}, {file = "typer-0.4.0.tar.gz", hash = "sha256:63c3aeab0549750ffe40da79a1b524f60e08a2cbc3126c520ebf2eeaf507f5dd"}, ] -types-beautifulsoup4 = [ - {file = "types-beautifulsoup4-4.10.14.tar.gz", hash = "sha256:d0efb2a5cae6b28040a5a263acf902b2561265daaa8e193952825e5bd7c20784"}, - {file = "types_beautifulsoup4-4.10.14-py3-none-any.whl", hash = "sha256:00987b9f1d06524a59afa6b34378c3bb5e01144c5cfe7b9a2a34eac2545d0482"}, -] -types-requests = [ - {file = "types-requests-2.27.12.tar.gz", hash = "sha256:fd1382fa2e28eac848faedb0332840204f06f0cb517008e3c7b8282ca53e56d2"}, - {file = "types_requests-2.27.12-py3-none-any.whl", hash = "sha256:120c949953b618e334bbe78de38e65aa261e1f48df021a05f0be833a848e4ba7"}, -] types-setuptools = [ {file = "types-setuptools-57.4.10.tar.gz", hash = "sha256:9a13513679c640f6616e2d9ab50d431c99ca8ae9848a97243f887c80fd5cf294"}, {file = "types_setuptools-57.4.10-py3-none-any.whl", hash = "sha256:ddc98da82c12e1208012d65276641a132d3aadc78ecfff68fd3e17d85933a3c1"}, @@ -1728,10 +1693,6 @@ types-toml = [ {file = "types-toml-0.10.4.tar.gz", hash = "sha256:9340e7c1587715581bb13905b3af30b79fe68afaccfca377665d5e63b694129a"}, {file = "types_toml-0.10.4-py3-none-any.whl", hash = "sha256:4a9ffd47bbcec49c6fde6351a889b2c1bd3c0ef309fa0eed60dc28e58c8b9ea6"}, ] -types-urllib3 = [ - {file = "types-urllib3-1.26.11.tar.gz", hash = "sha256:24d64e441168851eb05f1d022de18ae31558f5649c8f1117e384c2e85e31315b"}, - {file = "types_urllib3-1.26.11-py3-none-any.whl", hash = "sha256:bd0abc01e9fb963e4fddd561a56d21cc371b988d1245662195c90379077139cd"}, -] typing-extensions = [ {file = "typing_extensions-4.1.1-py3-none-any.whl", hash = "sha256:21c85e0fe4b9a155d0799430b0ad741cdce7e359660ccbd8b530613e8df88ce2"}, {file = "typing_extensions-4.1.1.tar.gz", hash = "sha256:1a9462dcc3347a79b1f1c0271fbe79e844580bb598bafa1ed208b94da3cdcd42"}, diff --git a/pylintrc b/pylintrc index 6029b14..86cae17 100644 --- a/pylintrc +++ b/pylintrc @@ -305,7 +305,7 @@ good-names=i, k, n, m, - ex, + exc, Run, _ diff --git a/pyproject.toml b/pyproject.toml index 977256a..6023cbe 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -106,8 +106,6 @@ types-setuptools = "^57.4.10" types-toml = "^0.10.4" types-termcolor = "^1.1.3" # rest -types-beautifulsoup4 = "^4.10.14" -types-requests = "^2.27.12" tqdm-stubs = "^0.1.2" [tool.poetry.dependencies] diff --git a/script.py b/script.py index d09e2fd..74c4485 100755 --- a/script.py +++ b/script.py @@ -26,7 +26,7 @@ cast, ) -# import autoimport +#import autoimport import isort import setuptools import toml @@ -337,8 +337,18 @@ def inner() -> Iterable[List[str]]: @app.command() -def publish(version_part: VersionPart, verify: bool = True, bump: bool = True) -> None: - asyncio.run(all_tests_inner(True) if verify else docs_inner()) +def publish( + version_part: VersionPart, + verify: bool = True, + docs: bool = True, + bump: bool = True, +) -> None: + if verify: + asyncio.run(all_tests_inner(True)) + elif docs: + # verify => all_tests_inner => docs already. + # This is only need for the case where (not verify and docs). + asyncio.run(docs_inner()) if bump: subprocess.run( [