diff --git a/ibis/expr/types/core.py b/ibis/expr/types/core.py index 721f1374f3de..8f02ff933823 100644 --- a/ibis/expr/types/core.py +++ b/ibis/expr/types/core.py @@ -129,7 +129,8 @@ def visualize(self, format: str = 'svg') -> None: Notes ----- This method opens a web browser tab showing the image of the expression - graph created by the code in [ibis.expr.visualize][]. + graph created by the code in + [`ibis.expr.visualize`][ibis.expr.visualize]. Raises ------ diff --git a/poetry-overrides.nix b/poetry-overrides.nix index 1f8d53b03098..478a0b4650c8 100644 --- a/poetry-overrides.nix +++ b/poetry-overrides.nix @@ -66,15 +66,6 @@ self: super: setupPyBuildFlags = attrs.setupPyBuildFlags or [ ] ++ [ "--parallel" "$NIX_BUILD_CORES" ]; }); - mkdocstrings = super.mkdocstrings.overridePythonAttrs (attrs: { - patches = (attrs.patches or [ ]) ++ [ - (pkgs.fetchpatch { - url = "https://github.com/mkdocstrings/mkdocstrings/commit/b37722716b1e0ed6393ec71308dfb0f85e142f3b.patch"; - sha256 = "sha256-DD1SjEvs5HBlSRLrqP3jhF/yoeWkF7F3VXCD1gyt5Fc="; - }) - ]; - }); - watchdog = super.watchdog.overrideAttrs (attrs: lib.optionalAttrs (stdenv.isDarwin && lib.versionAtLeast attrs.version "2") { @@ -91,4 +82,19 @@ self: super: traitlets = super.traitlets.overridePythonAttrs (attrs: { nativeBuildInputs = attrs.nativeBuildInputs or [ ] ++ [ self.flit-core ]; }); + + griffe = super.griffe.overridePythonAttrs (attrs: { + nativeBuildInputs = attrs.nativeBuildInputs or [ ] ++ [ self.pdm-pep517 ]; + }); + + mkdocstrings-python = super.mkdocstrings-python.overridePythonAttrs (attrs: { + nativeBuildInputs = attrs.nativeBuildInputs or [ ] ++ [ self.pdm-pep517 ]; + }); + + mkdocstrings-python-legacy = + super.mkdocstrings-python-legacy.overridePythonAttrs (attrs: { + nativeBuildInputs = attrs.nativeBuildInputs or [ ] ++ [ + self.pdm-pep517 + ]; + }); } diff --git a/poetry.lock b/poetry.lock index 5958a50d6a52..f75f02c2db46 100644 --- a/poetry.lock +++ b/poetry.lock @@ -338,7 +338,7 @@ toml = ["tomli"] [[package]] name = "dask" -version = "2022.5.0" +version = "2022.5.2" description = "Parallel PyData with Task Scheduling" category = "main" optional = true @@ -356,10 +356,10 @@ toolz = ">=0.8.2" [package.extras] array = ["numpy (>=1.18)"] -complete = ["bokeh (>=2.4.2)", "distributed (==2022.05.0)", "jinja2", "numpy (>=1.18)", "pandas (>=1.0)"] +complete = ["bokeh (>=2.4.2)", "distributed (==2022.05.2)", "jinja2", "numpy (>=1.18)", "pandas (>=1.0)"] dataframe = ["numpy (>=1.18)", "pandas (>=1.0)"] diagnostics = ["bokeh (>=2.4.2)", "jinja2"] -distributed = ["distributed (==2022.05.0)"] +distributed = ["distributed (==2022.05.2)"] test = ["pytest", "pytest-rerunfailures", "pytest-xdist", "pre-commit"] [[package]] @@ -649,6 +649,17 @@ python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*" [package.extras] docs = ["sphinx"] +[[package]] +name = "griffe" +version = "0.19.3" +description = "Signatures for entire Python programs. Extract the structure, the frame, the skeleton of your project, to generate API documentation or find breaking changes in your API." +category = "dev" +optional = false +python-versions = ">=3.7" + +[package.extras] +async = ["aiofiles (>=0.7,<1.0)"] + [[package]] name = "idna" version = "3.3" @@ -1210,20 +1221,36 @@ tabulate = ">=0.8.7" [[package]] name = "mkdocstrings" -version = "0.17.0" +version = "0.19.0" description = "Automatic documentation from sources, for MkDocs." category = "dev" optional = false -python-versions = ">=3.6.2" +python-versions = ">=3.7" [package.dependencies] Jinja2 = ">=2.11.1" Markdown = ">=3.3" MarkupSafe = ">=1.1" mkdocs = ">=1.2" -mkdocs-autorefs = ">=0.1" +mkdocs-autorefs = ">=0.3.1" pymdown-extensions = ">=6.3" -pytkdocs = ">=0.14.0" + +[package.extras] +crystal = ["mkdocstrings-crystal (>=0.3.4)"] +python = ["mkdocstrings-python (>=0.5.2)"] +python-legacy = ["mkdocstrings-python-legacy (>=0.2.1)"] + +[[package]] +name = "mkdocstrings-python" +version = "0.7.0" +description = "A Python handler for mkdocstrings." +category = "dev" +optional = false +python-versions = ">=3.7" + +[package.dependencies] +griffe = ">=0.11.1" +mkdocstrings = ">=0.19" [[package]] name = "multipledispatch" @@ -2373,7 +2400,7 @@ visualization = ["graphviz"] [metadata] lock-version = "1.1" python-versions = ">=3.8,<3.11" -content-hash = "5ef0ba95f158a8fbdcb303d587d3421809a800f6ba40325b8063a636a370fbf3" +content-hash = "c8e160c7cc3b234ee26aa64606b3a02c60494026b64dff51983672eb507f887c" [metadata.files] absolufy-imports = [ @@ -2851,8 +2878,8 @@ coverage = [ {file = "coverage-6.4.tar.gz", hash = "sha256:727dafd7f67a6e1cad808dc884bd9c5a2f6ef1f8f6d2f22b37b96cb0080d4f49"}, ] dask = [ - {file = "dask-2022.5.0-py3-none-any.whl", hash = "sha256:1b168877673a3d12778e319a1a406bb33b5abe942d8b6fae70ed02cb6019868a"}, - {file = "dask-2022.5.0.tar.gz", hash = "sha256:0afd69dd0cd9f838fc0710eda1f3e3333d6603b37e93ded7fac4a51d77566a0f"}, + {file = "dask-2022.5.2-py3-none-any.whl", hash = "sha256:ecd0e8cd00802c2f684369f907e5ab9fbdc3ea0c0b4ebc1239da899f8d79cefb"}, + {file = "dask-2022.5.2.tar.gz", hash = "sha256:d57061ccf37194907e65d62816c0fa6c1adaf2dcbc5785c6754bbdd3073f8898"}, ] datafusion = [ {file = "datafusion-0.5.2-cp36-abi3-macosx_10_7_x86_64.whl", hash = "sha256:7bc19fbc01d42690b4698f1a8207b110a0e51bd8de2a5725fc86431b7c4ed8cd"}, @@ -3065,6 +3092,10 @@ greenlet = [ {file = "greenlet-1.1.2-cp39-cp39-win_amd64.whl", hash = "sha256:013d61294b6cd8fe3242932c1c5e36e5d1db2c8afb58606c5a67efce62c1f5fd"}, {file = "greenlet-1.1.2.tar.gz", hash = "sha256:e30f5ea4ae2346e62cedde8794a56858a67b878dd79f7df76a0767e356b1744a"}, ] +griffe = [ + {file = "griffe-0.19.3-py3-none-any.whl", hash = "sha256:348422f0e303ff3b76d6b35a96fa9c90dddcbe175506171fda78e8e5cf8c4246"}, + {file = "griffe-0.19.3.tar.gz", hash = "sha256:3a51e53bc58c45d38d6d7b4509b41b153b506de3df99767e6f891c75d91706a5"}, +] idna = [ {file = "idna-3.3-py3-none-any.whl", hash = "sha256:84d9dd047ffa80596e0f246e2eab0b391788b0503584e8945f2368256d2735ff"}, {file = "idna-3.3.tar.gz", hash = "sha256:9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d"}, @@ -3282,8 +3313,12 @@ mkdocs-table-reader-plugin = [ {file = "mkdocs_table_reader_plugin-1.0.0-py3-none-any.whl", hash = "sha256:ea5cc6d642bd80bde733f4418c3ce3a4bb9c9327247810d864502a6912cc2d87"}, ] mkdocstrings = [ - {file = "mkdocstrings-0.17.0-py3-none-any.whl", hash = "sha256:103fc1dd58cb23b7e0a6da5292435f01b29dc6fa0ba829132537f3f556f985de"}, - {file = "mkdocstrings-0.17.0.tar.gz", hash = "sha256:75b5cfa2039aeaf3a5f5cf0aa438507b0330ce76c8478da149d692daa7213a98"}, + {file = "mkdocstrings-0.19.0-py3-none-any.whl", hash = "sha256:3217d510d385c961f69385a670b2677e68e07b5fea4a504d86bf54c006c87c7d"}, + {file = "mkdocstrings-0.19.0.tar.gz", hash = "sha256:efa34a67bad11229d532d89f6836a8a215937548623b64f3698a1df62e01cc3e"}, +] +mkdocstrings-python = [ + {file = "mkdocstrings-python-0.7.0.tar.gz", hash = "sha256:e54c67890e8bb7dc4604360c8ef5dd214b23b6924de7706f461e3c998d4ea061"}, + {file = "mkdocstrings_python-0.7.0-py3-none-any.whl", hash = "sha256:6964bd92f106766e771ac6cd5bc02643a960602b4d921b95362e31d491e9a6db"}, ] multipledispatch = [ {file = "multipledispatch-0.6.0-py2-none-any.whl", hash = "sha256:407e6d8c5fa27075968ba07c4db3ef5f02bea4e871e959570eeb69ee39a6565b"}, diff --git a/pyproject.toml b/pyproject.toml index 091d3981c0fc..63db2e492967 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -84,7 +84,8 @@ mkdocs-literate-nav = ">=0.4.1,<1" mkdocs-macros-plugin = ">=0.6.3,<1" mkdocs-material = ">=8.2.1,<9" mkdocs-table-reader-plugin = ">=1.0.0,<2" -mkdocstrings = ">=0.17.0,<0.18.0" +mkdocstrings = ">=0.19.0,<0.20.0" +mkdocstrings-python = ">=0.5.2,<1" mypy = ">=0.942,<1" platformdirs = ">=2,<2.5.2" poetry-dynamic-versioning = ">=0.14.0,<1" diff --git a/requirements.txt b/requirements.txt index 6f0160439df9..e8a10fbd7c1d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ absolufy-imports==0.3.1; python_full_version >= "3.6.1" appnope==0.1.3; platform_system == "Darwin" and python_version >= "3.8" and sys_platform == "darwin" argcomplete==1.12.3; python_full_version >= "3.6.2" and python_full_version < "4.0.0" asttokens==2.0.5; python_version >= "3.8" -astunparse==1.6.3; python_version < "3.9" and python_version >= "3.7" and python_full_version >= "3.6.2" +astunparse==1.6.3; python_version < "3.9" and python_version >= "3.7" atomicwrites==1.4.0; python_version >= "3.7" and python_full_version < "3.0.0" and sys_platform == "win32" and (python_version >= "3.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.7") and (python_version >= "3.7" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" and python_version >= "3.7") or sys_platform == "win32" and python_version >= "3.7" and python_full_version >= "3.4.0" and (python_version >= "3.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.7") and (python_version >= "3.7" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" and python_version >= "3.7") atpublic==3.0.1; python_version >= "3.7" attrs==21.4.0; python_full_version >= "3.7.1" and python_version >= "3.7" and python_version < "4.0" @@ -27,7 +27,7 @@ colorama==0.4.4; platform_system == "Windows" and python_version >= "3.7" and py commitizen==2.26.0; python_full_version >= "3.6.2" and python_full_version < "4.0.0" commonmark==0.9.1; python_full_version >= "3.6.3" and python_full_version < "4.0.0" and (python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.4.0") coverage==6.4; python_version >= "3.7" -dask==2022.5.0; python_version >= "3.8" +dask==2022.5.2; python_version >= "3.8" datafusion==0.5.2; python_version >= "3.6" debugpy==1.6.0; python_version >= "3.7" decli==0.5.2; python_full_version >= "3.6.2" and python_full_version < "4.0.0" and python_version >= "3.6" @@ -52,6 +52,7 @@ gitpython==3.1.27; python_version >= "3.7" gprof2dot==2021.2.21 graphviz==0.20; python_version >= "3.7" greenlet==1.1.2; python_version >= "3" and (platform_machine == "aarch64" or platform_machine == "ppc64le" or platform_machine == "x86_64" or platform_machine == "amd64" or platform_machine == "AMD64" or platform_machine == "win32" or platform_machine == "WIN32") and (python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0") and python_full_version >= "3.6.1" and (python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version >= "3.6") +griffe==0.19.3; python_version >= "3.7" idna==3.3; python_version >= "3.5" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version >= "3.5" importlib-metadata==4.11.3; python_version < "3.10" and python_version >= "3.7" and python_full_version >= "3.7.1" or python_version < "3.10" importlib-resources==5.7.1; python_version >= "3.7" and python_version < "3.9" and python_full_version >= "3.7.1" @@ -73,7 +74,7 @@ locket==1.0.0; python_version >= "3.8" and python_full_version < "3.0.0" or pyth lz4==4.0.0; python_version >= "3.7" markdown-it-py==2.1.0; python_version >= "3.7" and python_version < "4.0" and python_full_version >= "3.7.1" markdown==3.3.7; python_full_version >= "3.7.1" and python_version < "4" and python_version >= "3.7" -markupsafe==2.1.1; python_version >= "3.7" and python_full_version >= "3.7.1" and python_full_version < "4.0.0" and python_version < "4" +markupsafe==2.1.1; python_full_version >= "3.7.1" and python_full_version < "4.0.0" and python_version >= "3.7" and python_version < "4" matplotlib-inline==0.1.3; python_version >= "3.8" mccabe==0.6.1; python_version >= "3.6" mdit-py-plugins==0.3.0; python_version >= "3.6" and python_version < "4.0" and python_full_version >= "3.7.1" @@ -81,7 +82,7 @@ mdurl==0.1.1; python_version >= "3.7" and python_version < "4.0" and python_full mergedeep==1.3.4; python_version >= "3.7" and python_version < "4.0" and python_full_version >= "3.7.1" mike==1.1.2 mistune==0.8.4; python_full_version >= "3.7.1" and python_version < "4" and python_version >= "3.7" -mkdocs-autorefs==0.4.1; python_version >= "3.7" and python_full_version >= "3.6.2" +mkdocs-autorefs==0.4.1; python_version >= "3.7" mkdocs-exclude==1.0.2 mkdocs-gen-files==0.3.4; python_version >= "3.7" and python_version < "4.0" mkdocs-git-revision-date-localized-plugin==1.0.1; python_version >= "3.6" @@ -92,7 +93,8 @@ mkdocs-material-extensions==1.0.3; python_full_version >= "3.7.1" and python_ver mkdocs-material==8.2.11; python_version >= "3.6" mkdocs-table-reader-plugin==1.0.0; python_version >= "3.6" mkdocs==1.3.0; python_version >= "3.6" -mkdocstrings==0.17.0; python_full_version >= "3.6.2" +mkdocstrings-python==0.7.0; python_version >= "3.7" +mkdocstrings==0.19.0; python_version >= "3.7" multipledispatch==0.6.0 munch==2.5.0; python_version >= "3.7" mypy-extensions==0.4.3; python_full_version >= "3.6.2" and python_version >= "3.6" @@ -161,7 +163,7 @@ regex==2022.4.24; python_version >= "3.6" requests==2.27.1; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.6.0") rich==12.4.1; python_full_version >= "3.6.3" and python_full_version < "4.0.0" and (python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.4.0") shapely==1.8.1.post1; python_version >= "3.6" -six==1.16.0; python_full_version >= "3.7.1" and python_version >= "3.8" and python_version < "3.9" and (python_version >= "3.7" and python_full_version < "3.0.0" or python_full_version >= "3.3.0" and python_version >= "3.7") and (python_version >= "3.8" and python_full_version < "3.0.0" or python_full_version >= "3.3.0" and python_version >= "3.8") +six==1.16.0; python_full_version >= "3.7.1" and python_version >= "3.8" and python_version < "3.9" smmap==5.0.0; python_version >= "3.7" snowballstemmer==2.2.0; python_version >= "3.6" soupsieve==2.3.2.post1; python_full_version >= "3.7.1" and python_version < "4" and python_version >= "3.7"