Merge branch 'develop' into feature/pylint

# Conflicts:
#	main/tests.py
#	main/views.py
#	main/zendesk_admin.py
#	requirements/common.txt
This commit is contained in:
Andrew Smirnov
2021-05-13 20:45:06 +03:00
10 changed files with 429 additions and 68 deletions

View File

@@ -7,7 +7,6 @@ zenpy~=2.0.24
django_registration==3.1.1
djangorestframework==3.12.2
# Documentation
Sphinx==3.4.3
sphinx-rtd-theme==0.5.1
@@ -15,6 +14,11 @@ sphinx-autodoc-typehints==1.11.1
pyenchant==3.2.0
sphinxcontrib-spelling==7.1.0
m2r == 0.2.1
# Code style
pylint == 2.8.2
pylint-django == 2.4.4
autopep8 == 1.5.6
# Misc
python-dotenv==0.17.1