Update dependencies, fix tests based on latest docstring-to-markdown

pappasam · Feb 26, 2024 · 7f44b2a · 7f44b2a
1 parent 62f0c46
commit 7f44b2a
Show file tree

Hide file tree

Showing 6 changed files with 254 additions and 245 deletions.
diff --git a/mypy.ini b/mypy.ini
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,7 +1,16 @@
 [build-system]
-requires = ["poetry-core>=1.7.1"]
+requires = ["poetry-core>=1.8.0"]
 build-backend = "poetry.core.masonry.api"
 
+[tool.mypy]
+python_version = "3.8"
+strict = true
+enable_error_code = "ignore-without-code,redundant-expr,truthy-bool"
+
+[[tool.mypy.overrides]]
+module = "jedi.*"
+ignore_missing_imports = true
+
 [tool.poetry]
 name = "jedi-language-server"
 version = "0.41.2"
@@ -40,7 +49,7 @@ docstring-to-markdown = "0.*"
 lsprotocol = ">=2022.0.0a9"
 typing-extensions = {version = "^4.5.0", python = "<3.10"}
 
-[tool.poetry.dev-dependencies]
+[tool.poetry.group.dev.dependencies]
 PyHamcrest = "*"
 mypy = "*"
 nox = "*"
@@ -81,8 +90,8 @@ ignore = [
   "E501" # line-too-long
 ]
 
-[tool.ruff.per-file-ignores]
+[tool.ruff.lint.per-file-ignores]
 "tests/test_data/*" = ["ALL"]
 
-[tool.ruff.pydocstyle]
+[tool.ruff.lint.pydocstyle]
 convention = "pep257"
diff --git a/tests/lsp_tests/test_completion.py b/tests/lsp_tests/test_completion.py
@@ -59,7 +59,7 @@ def test_lsp_completion() -> None:
             "detail": "def my_function()",
             "documentation": {
                 "kind": "markdown",
-                "value": "```text\nSimple test function.\n```",
+                "value": "Simple test function.",
             },
             "sortText": "v0",
             "filterText": "my_function",
@@ -100,7 +100,7 @@ def test_eager_lsp_completion() -> None:
                     "detail": "def my_function()",
                     "documentation": {
                         "kind": "markdown",
-                        "value": "```text\nSimple test function.\n```",
+                        "value": "Simple test function.",
                     },
                     "sortText": "v0",
                     "filterText": "my_function",
@@ -145,7 +145,7 @@ def test_lsp_completion_class_method() -> None:
                     "detail": "def some_method(x)",
                     "documentation": {
                         "kind": "markdown",
-                        "value": "```text\nGreat method.\n```",
+                        "value": "Great method.",
                     },
                     "sortText": "v0",
                     "filterText": "some_method",
@@ -185,7 +185,7 @@ def test_lsp_completion_class_noargs() -> None:
                     "detail": "class MyClass()",
                     "documentation": {
                         "kind": "markdown",
-                        "value": "```text\nSimple class.\n```",
+                        "value": "Simple class.",
                     },
                     "sortText": "v0",
                     "filterText": "MyClass",

diff --git a/tests/lsp_tests/test_hover.py b/tests/lsp_tests/test_hover.py
@@ -27,7 +27,7 @@ def test_hover_on_module():
         expected = {
             "contents": {
                 "kind": "markdown",
-                "value": "```python\nmodule somemodule\n```\n---\n```text\nModule doc string for testing.\n```",
+                "value": "```python\nmodule somemodule\n```\n---\nModule doc string for testing.",
             },
             "range": {
                 "start": {"line": 2, "character": 7},
@@ -55,7 +55,7 @@ def test_hover_on_function():
         expected = {
             "contents": {
                 "kind": "markdown",
-                "value": "```python\ndef do_something()\n```\n---\n```text\nFunction doc string for testing.\n```\n**Full name:** `somemodule.do_something`",
+                "value": "```python\ndef do_something()\n```\n---\nFunction doc string for testing.\n**Full name:** `somemodule.do_something`",
             },
             "range": {
                 "start": {"line": 4, "character": 11},
@@ -83,7 +83,7 @@ def test_hover_on_class():
         expected = {
             "contents": {
                 "kind": "markdown",
-                "value": "```python\nclass SomeClass()\n```\n---\n```text\nClass doc string for testing.\n```\n**Full name:** `somemodule.SomeClass`",
+                "value": "```python\nclass SomeClass()\n```\n---\nClass doc string for testing.\n**Full name:** `somemodule.SomeClass`",
             },
             "range": {
                 "start": {"line": 6, "character": 15},
@@ -111,7 +111,7 @@ def test_hover_on_method():
         expected = {
             "contents": {
                 "kind": "markdown",
-                "value": "```python\ndef some_method()\n```\n---\n```text\nMethod doc string for testing.\n```\n**Full name:** `somemodule.SomeClass.some_method`",
+                "value": "```python\ndef some_method()\n```\n---\nMethod doc string for testing.\n**Full name:** `somemodule.SomeClass.some_method`",
             },
             "range": {
                 "start": {"line": 8, "character": 2},

diff --git a/tests/lsp_tests/test_signature.py b/tests/lsp_tests/test_signature.py
@@ -41,7 +41,7 @@ def test_signature_help(trigger_char, column, active_param):
                     ),
                     "documentation": {
                         "kind": "markdown",
-                        "value": "```text\nThis is a test function.\n```",
+                        "value": "This is a test function.",
                     },
                     "parameters": [
                         {"label": "arg1: str"},