Skip to content

Commit

Permalink
Make config test options not unknown types (#252)
Browse files Browse the repository at this point in the history
* Make config test options not unknown types
* Run pyright as part of tests
  • Loading branch information
palfrey authored Oct 10, 2024
1 parent 45ac3bb commit 99128b5
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 6 deletions.
6 changes: 4 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,10 @@ jobs:
pip install -r requirements.txt
pip install "Django~=${{ matrix.django-version }}.0" .
- name: Run mypy
- name: Run type checking
run: |
python -m mypy dj_database_url
python -m pyright dj_database_url
- name: Run Tests
run: |
Expand All @@ -52,8 +53,9 @@ jobs:
- uses: codecov/codecov-action@v3

- name: Check mypy types installation
- name: Check types installation
run: |
pip install .
cd tests
python -m mypy .
python -m pyright .
6 changes: 3 additions & 3 deletions dj_database_url/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
# Register database schemes in URLs.
for key in SCHEMES.keys():
urlparse.uses_netloc.append(key)
del key
del key # pyright: ignore[reportPossiblyUnboundVariable]


# From https://docs.djangoproject.com/en/4.0/ref/settings/#databases
Expand Down Expand Up @@ -70,7 +70,7 @@ def config(
conn_health_checks: bool = False,
disable_server_side_cursors: bool = False,
ssl_require: bool = False,
test_options: Optional[Dict] = None,
test_options: Optional[Dict[str, Any]] = None,
) -> DBConfig:
"""Returns configured DATABASE dictionary from DATABASE_URL."""
s = os.environ.get(env, default)
Expand Down Expand Up @@ -101,7 +101,7 @@ def parse(
conn_health_checks: bool = False,
disable_server_side_cursors: bool = False,
ssl_require: bool = False,
test_options: Optional[dict] = None,
test_options: Optional[Dict[str, Any]] = None,
) -> DBConfig:
"""Parses a database URL."""
if url == "sqlite://:memory:":
Expand Down
3 changes: 3 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,6 @@ show_error_codes=true
disallow_untyped_defs=true
disallow_untyped_calls=true
warn_redundant_casts=true

[tool.pyright]
typeCheckingMode = "strict"
1 change: 1 addition & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
coverage
mypy
pyright
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from pathlib import Path

from setuptools import setup
from setuptools import setup # pyright: ignore[reportUnknownVariableType]

readme = Path("README.rst").read_text()

Expand Down
2 changes: 2 additions & 0 deletions tests/test_dj_database_url.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# pyright: reportTypedDictNotRequiredAccess=false

import os
import unittest
from unittest import mock
Expand Down

0 comments on commit 99128b5

Please sign in to comment.