Skip to content

Commit

Permalink
Replace previous tooling by ruff and pyright (#571)
Browse files Browse the repository at this point in the history
* Replace all previous tooling

* Add missing dependencies

* Do not run Test release automatically
  • Loading branch information
PabloLec authored Jan 25, 2025
1 parent 8a4f2be commit 2a02bf4
Show file tree
Hide file tree
Showing 8 changed files with 446 additions and 99 deletions.
26 changes: 0 additions & 26 deletions .flake8

This file was deleted.

3 changes: 0 additions & 3 deletions .github/workflows/test-pypi-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@ name: Test release on PyPI

on:
workflow_dispatch:
push:
branches:
- main

jobs:
test_pypi_release:
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ __pycache__
.mypy_cache
env/
venv/
.venv/
dist/
build/
dev.py
Expand Down
34 changes: 0 additions & 34 deletions .pre-commit-config.yaml

This file was deleted.

45 changes: 14 additions & 31 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -83,32 +83,13 @@ recoverpy = "recoverpy.__init__:main"

[dependency-groups]
dev = [
"pytest-asyncio<0.25.0,>=0.20.3",
"ruff<0.8.6,>=0.5.1",
"coverage<8.0.0,>=7.6.1",
"pytest<9.0.0,>=8.3.4",
"pylint<4.0.0,>=3.2.7",
"isort<6.0.0,>=5.13.2",
"black<25.0,>=24.8",
"flake8<8.0.0,>=7.1.1",
"pre-commit<4.0.0,>=3.5.0",
"flake8-bandit<5.0.0,>=4.1.1",
"flake8-bugbear<25.0.0,>=24.12.12",
"flake8-builtins<3.0.0,>=2.5.0",
"flake8-comprehensions<4.0.0,>=3.15.0",
"darglint<2.0.0,>=1.8.1",
"flake8-docstrings<2.0.0,>=1.7.0",
"flake8-isort<7.0.0,>=6.1.1",
"flake8-pytest-style<3.0.0,>=2.0.0",
"flake8-mutable<2.0.0,>=1.2.0",
"flake8-html<1.0.0,>=0.4.1",
"flake8-simplify<1.0.0,>=0.21.0",
"flake8-aaa<1.0.0,>=0.17.0",
"pytest-mock==3.14.0",
"pytest-cov<6.0.0,>=5.0.0",
"coverage-badge<2.0.0,>=1.1.2",
"mypy<2.0,>=1.14",
"types-PyYAML<7.0.0,>=6.0.12",
"isort>=5.13.2",
"pyright>=1.1.392.post0",
"pytest-asyncio>=0.24.0",
"pytest>=8.3.4",
"ruff>=0.9.3",
"pytest-mock>=3.14.0",
"pytest-cov>=5.0.0",
]

[build-system]
Expand All @@ -121,12 +102,14 @@ url = "https://test.pypi.org/simple/"
publish-url = "https://test.pypi.org/legacy/"
explicit = true

[tool.mypy]
python_version = 3.8
ignore_missing_imports = "true"
disallow_untyped_calls = "false"
[tool.pyright]
include = ["recoverpy"]
exclude = ["recoverpy/ui/widgets/directory_tree.py"]
typeCheckingMode = "strict"
reportUnknownArgumentType = "none"
reportUnknownMemberType = "none"

[tool.pytest.ini_options]
markers = [
"incremental",
]
]
5 changes: 4 additions & 1 deletion recoverpy/ui/screens/modal.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,10 @@ def on_button_pressed(self) -> None:


async def install_and_push_modal(
app: App[None], name: str, message: str, callback: Optional[Callable] = None # type: ignore
app: App[None],
name: str,
message: str,
callback: Optional[Callable[[], None]] = None,
) -> None:
modal = Modal(name, message=message, callback=callback)
app.install_screen(modal, name)
Expand Down
6 changes: 3 additions & 3 deletions tests/integration/helper.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ async def assert_with_timeout(check_func, expected, actual, timeout=10.0, interv
return
if asyncio.get_event_loop().time() > end_time:
func_src = inspect.getsource(check_func).strip()
assert (
False
), f"Timeout reached before condition in `{func_src}` became true. Expected: {expected}, Actual: {actual}"
assert False, (
f"Timeout reached before condition in `{func_src}` became true. Expected: {expected}, Actual: {actual}"
)
await asyncio.sleep(interval)


Expand Down
425 changes: 424 additions & 1 deletion uv.lock

Large diffs are not rendered by default.

0 comments on commit 2a02bf4

Please sign in to comment.