Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Feb 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions mypy.ini

This file was deleted.

458 changes: 232 additions & 226 deletions poetry.lock

Large diffs are not rendered by default.

17 changes: 13 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -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"
Expand Down Expand Up @@ -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 = "*"
Expand Down Expand Up @@ -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"
8 changes: 4 additions & 4 deletions tests/lsp_tests/test_completion.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
8 changes: 4 additions & 4 deletions tests/lsp_tests/test_hover.py
Original file line number Diff line number Diff line change
Expand Up @@ -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},
Expand Down Expand Up @@ -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},
Expand Down Expand Up @@ -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},
Expand Down Expand Up @@ -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},
Expand Down
2 changes: 1 addition & 1 deletion tests/lsp_tests/test_signature.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"},
Expand Down
Loading