Merge branch 'develop' into feature/pylint

# Conflicts:
#	main/apiauth.py
#	main/tests.py
#	requirements/common.txt
#	requirements/dev.txt
This commit is contained in:
Andrew Smirnov
2021-05-20 19:58:30 +03:00
15 changed files with 280 additions and 167 deletions

View File

@@ -1,11 +1,10 @@
# Contains requirements common to all environments
# Engine
Django==3.1.6
Pillow==8.1.0
Django==3.2.3
zenpy~=2.0.24
django_registration==3.1.1
djangorestframework==3.12.2
django_registration==3.1.2
djangorestframework==3.12.4
# Misc
python-dotenv==0.17.1

View File

@@ -2,13 +2,16 @@
-r common.txt
# Documentation
Sphinx==3.4.3
sphinx-rtd-theme==0.5.1
sphinx-autodoc-typehints==1.11.1
Sphinx==3.5.4
sphinx-rtd-theme==0.5.2
sphinx-autodoc-typehints==1.12.0
pyenchant==3.2.0
sphinxcontrib-spelling==7.1.0
sphinxcontrib-spelling==7.2.1
m2r == 0.2.1
# Tests
coverage==5.5
# Code style
pylint == 2.8.2
pylint-django == 2.4.4

View File

@@ -1,5 +1,5 @@
# Production specific dependencies
-r common.txt
daphne==3.0.1
daphne==3.0.2
Twisted[tls,http2]==21.2.0