Merge branch 'dev' into master

.gitignore

@@ -1,108 +1,109 @@
-# Byte-compiled / optimized / DLL files
+# Byte-compiled / optimized / DLL files
-__pycache__/
+__pycache__/
-*.py[cod]
+*.py[cod]
-*$py.class
+*$py.class
-
+.vscode
-# C extensions
+
-*.so
+# C extensions
-
+*.so
-# Distribution / packaging
+
-.Python
+# Distribution / packaging
-build/
+.Python
-develop-eggs/
+build/
-dist/
+develop-eggs/
-downloads/
+dist/
-eggs/
+downloads/
-.eggs/
+eggs/
-lib/
+.eggs/
-lib64/
+lib/
-parts/
+lib64/
-sdist/
+parts/
-var/
+sdist/
-wheels/
+var/
-*.egg-info/
+wheels/
-.installed.cfg
+*.egg-info/
-*.egg
+.installed.cfg
-MANIFEST
+*.egg
-
+MANIFEST
-# PyInstaller
+
-#  Usually these files are written by a python script from a template
+# PyInstaller
-#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+#  Usually these files are written by a python script from a template
-*.manifest
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
-*.spec
+*.manifest
-
+*.spec
-# Installer logs
+
-pip-log.txt
+# Installer logs
-pip-delete-this-directory.txt
+pip-log.txt
-
+pip-delete-this-directory.txt
-# Unit test / coverage reports
+
-htmlcov/
+# Unit test / coverage reports
-.tox/
+htmlcov/
-.coverage
+.tox/
-.coverage.*
+.coverage
-.cache
+.coverage.*
-nosetests.xml
+.cache
-coverage.xml
+nosetests.xml
-*.cover
+coverage.xml
-.hypothesis/
+*.cover
-.pytest_cache/
+.hypothesis/
-
+.pytest_cache/
-# Translations
+
-*.mo
+# Translations
-*.pot
+*.mo
-
+*.pot
-# Django stuff:
+
-*.log
+# Django stuff:
-local_settings.py
+*.log
-db.sqlite3
+local_settings.py
-
+db.sqlite3
-# Flask stuff:
+
-instance/
+# Flask stuff:
-.webassets-cache
+instance/
-
+.webassets-cache
-# Scrapy stuff:
+
-.scrapy
+# Scrapy stuff:
-
+.scrapy
-# Sphinx documentation
+
-docs/_build/
+# Sphinx documentation
-
+docs/_build/
-# PyBuilder
+
-target/
+# PyBuilder
-
+target/
-# Jupyter Notebook
+
-.ipynb_checkpoints
+# Jupyter Notebook
-
+.ipynb_checkpoints
-# pyenv
+
-.python-version
+# pyenv
-
+.python-version
-# celery beat schedule file
+
-celerybeat-schedule
+# celery beat schedule file
-
+celerybeat-schedule
-# SageMath parsed files
+
-*.sage.py
+# SageMath parsed files
-
+*.sage.py
-# Environments
+
-.env
+# Environments
-.venv
+.env
-env/
+.venv
-venv/
+env/
-ENV/
+venv/
-env.bak/
+ENV/
-venv.bak/
+env.bak/
-
+venv.bak/
-# Spyder project settings
+
-.spyderproject
+# Spyder project settings
-.spyproject
+.spyderproject
-
+.spyproject
-# Rope project settings
+
-.ropeproject
+# Rope project settings
-
+.ropeproject
-# mkdocs documentation
+
-/site
+# mkdocs documentation
-
+/site
-# mypy
+
-.mypy_cache/
+# mypy
-
+.mypy_cache/
-# vscode
+
-.vscode/
+# vscode
-JupyterLab.bat
+.vscode/
+JupyterLab.bat