Skip to content

Commit

Permalink
+ mypy
Browse files Browse the repository at this point in the history
  • Loading branch information
BrittleFoot committed Jun 5, 2024
1 parent db1f823 commit 17b278e
Show file tree
Hide file tree
Showing 9 changed files with 150 additions and 112 deletions.
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
deps:
pip-compile requirements.in
pip-compile dev-requirements.in
pip-sync requirements.txt dev-requirements.txt
pip-compile requirements-dev.in
pip-sync requirements.txt requirements-dev.txt

lint:
ruff src $(ARGS)
ruff lint src

fix:
ruff src --fix
ruff format src && ruff lint src --fix

test:
pytest src $(ARGS)
Expand Down
8 changes: 0 additions & 8 deletions dev-requirements.in

This file was deleted.

67 changes: 0 additions & 67 deletions dev-requirements.txt

This file was deleted.

13 changes: 13 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,16 @@ line-length = 90
[tool.pytest.ini_options]
DJANGO_SETTINGS_MODULE = "app.settings"
pythonpath = "src"


[tool.mypy]
python_version = "3.12"
plugins = [
"mypy_django_plugin.main",
"mypy_drf_plugin.main"
]
mypy_path = "src"
ignore_missing_imports = true

[tool.django-stubs]
django_settings_module = "app.settings"
12 changes: 12 additions & 0 deletions requirements-dev.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
ruff

pytest
pytest-cov
pytest-django
mixer

mypy
django-stubs[compatible-mypy]
djangorestframework-stubs[compatible-mypy]

ipython
116 changes: 116 additions & 0 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,116 @@
#
# This file is autogenerated by pip-compile with Python 3.12
# by the following command:
#
# pip-compile requirements-dev.in
#
asgiref==3.8.1
# via
# django
# django-stubs
asttokens==2.4.1
# via stack-data
certifi==2024.6.2
# via requests
charset-normalizer==3.3.2
# via requests
coverage[toml]==7.5.3
# via pytest-cov
decorator==5.1.1
# via ipython
django==5.0.6
# via
# django-stubs
# django-stubs-ext
django-stubs[compatible-mypy]==5.0.2
# via
# -r requirements-dev.in
# djangorestframework-stubs
django-stubs-ext==5.0.2
# via django-stubs
djangorestframework-stubs[compatible-mypy]==3.15.0
# via -r requirements-dev.in
executing==2.0.1
# via stack-data
faker==12.0.1
# via mixer
idna==3.7
# via requests
iniconfig==2.0.0
# via pytest
ipython==8.25.0
# via -r requirements-dev.in
jedi==0.19.1
# via ipython
matplotlib-inline==0.1.7
# via ipython
mixer==7.2.2
# via -r requirements-dev.in
mypy==1.10.0
# via
# -r requirements-dev.in
# django-stubs
# djangorestframework-stubs
mypy-extensions==1.0.0
# via mypy
packaging==24.0
# via pytest
parso==0.8.4
# via jedi
pexpect==4.9.0
# via ipython
pluggy==1.5.0
# via pytest
prompt-toolkit==3.0.46
# via ipython
ptyprocess==0.7.0
# via pexpect
pure-eval==0.2.2
# via stack-data
pygments==2.18.0
# via ipython
pytest==8.2.2
# via
# -r requirements-dev.in
# pytest-cov
# pytest-django
pytest-cov==5.0.0
# via -r requirements-dev.in
pytest-django==4.8.0
# via -r requirements-dev.in
python-dateutil==2.9.0.post0
# via faker
requests==2.32.3
# via djangorestframework-stubs
ruff==0.4.7
# via -r requirements-dev.in
six==1.16.0
# via
# asttokens
# python-dateutil
sqlparse==0.5.0
# via django
stack-data==0.6.3
# via ipython
traitlets==5.14.3
# via
# ipython
# matplotlib-inline
types-pyyaml==6.0.12.20240311
# via
# django-stubs
# djangorestframework-stubs
types-requests==2.32.0.20240602
# via djangorestframework-stubs
typing-extensions==4.12.1
# via
# django-stubs
# django-stubs-ext
# djangorestframework-stubs
# mypy
urllib3==2.2.1
# via
# requests
# types-requests
wcwidth==0.2.13
# via prompt-toolkit
2 changes: 1 addition & 1 deletion requirements.in
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ djangorestframework
django-environ
django-behaviors
django-cors-headers
django-oauth-toolkit

psycopg2-binary
uritemplate
pyyaml
whitenoise
httpx
35 changes: 4 additions & 31 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,57 +4,30 @@
#
# pip-compile requirements.in
#
asgiref==3.7.2
asgiref==3.8.1
# via
# django
# django-cors-headers
certifi==2024.2.2
# via requests
cffi==1.16.0
# via cryptography
charset-normalizer==3.3.2
# via requests
cryptography==42.0.4
# via jwcrypto
django==5.0.2
django==5.0.6
# via
# -r requirements.in
# django-cors-headers
# django-oauth-toolkit
# djangorestframework
django-behaviors==0.5.1
# via -r requirements.in
django-cors-headers==4.3.1
# via -r requirements.in
django-environ==0.11.2
# via -r requirements.in
django-oauth-toolkit==2.3.0
djangorestframework==3.15.1
# via -r requirements.in
djangorestframework==3.14.0
# via -r requirements.in
idna==3.6
# via requests
jwcrypto==1.5.4
# via django-oauth-toolkit
oauthlib==3.2.2
# via django-oauth-toolkit
psycopg2-binary==2.9.9
# via -r requirements.in
pycparser==2.21
# via cffi
pytz==2024.1
# via djangorestframework
pyyaml==6.0.1
# via -r requirements.in
requests==2.31.0
# via django-oauth-toolkit
sqlparse==0.4.4
sqlparse==0.5.0
# via django
typing-extensions==4.9.0
# via jwcrypto
uritemplate==4.1.1
# via -r requirements.in
urllib3==2.2.1
# via requests
whitenoise==6.6.0
# via -r requirements.in
1 change: 0 additions & 1 deletion src/app/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
"rest_framework",
"whitenoise",
"corsheaders",
"oauth2_provider",
]

INSTALLED_APPS = INTERNAL_APPS + THIRD_PARTY_APPS
Expand Down

0 comments on commit 17b278e

Please sign in to comment.