Skip to content
Snippets Groups Projects
Verified Commit 7390a53f authored by Jonathan Weth's avatar Jonathan Weth :keyboard:
Browse files

Merge branch 'master' into 66-add-support-for-multiple-excuse-types

parents 056f8fca e096d125
No related branches found
No related tags found
1 merge request!64Resolve "Add support for multiple excuse types"
Pipeline #3020 passed
...@@ -68,11 +68,11 @@ extras = ["phonenumbers"] ...@@ -68,11 +68,11 @@ extras = ["phonenumbers"]
version = ">=3.0,<4.0" version = ">=3.0,<4.0"
[package.dependencies.django-two-factor-auth] [package.dependencies.django-two-factor-auth]
extras = ["sms", "yubikey", "call", "phonenumbers"] extras = ["sms", "phonenumbers", "call", "yubikey"]
version = ">=1.11.0,<2.0.0" version = ">=1.11.0,<2.0.0"
[package.dependencies.dynaconf] [package.dependencies.dynaconf]
extras = ["yaml", "ini", "toml"] extras = ["yaml", "toml", "ini"]
version = ">=2.0,<3.0" version = ">=2.0,<3.0"
[package.extras] [package.extras]
...@@ -1112,14 +1112,12 @@ category = "dev" ...@@ -1112,14 +1112,12 @@ category = "dev"
description = "A Python utility / library to sort Python imports." description = "A Python utility / library to sort Python imports."
name = "isort" name = "isort"
optional = false optional = false
python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" python-versions = ">=3.6,<4.0"
version = "4.3.21" version = "5.0.3"
[package.extras] [package.extras]
pipfile = ["pipreqs", "requirementslib"] pipfile_deprecated_finder = ["pipreqs", "requirementslib", "tomlkit (>=0.5.3)"]
pyproject = ["toml"] requirements_deprecated_finder = ["pipreqs", "pip-api"]
requirements = ["pipreqs", "pip-api"]
xdg_home = ["appdirs (>=1.4.0)"]
[[package]] [[package]]
category = "dev" category = "dev"
...@@ -1949,7 +1947,7 @@ docs = ["sphinx", "jaraco.packaging (>=3.2)", "rst.linker (>=1.9)"] ...@@ -1949,7 +1947,7 @@ docs = ["sphinx", "jaraco.packaging (>=3.2)", "rst.linker (>=1.9)"]
testing = ["jaraco.itertools", "func-timeout"] testing = ["jaraco.itertools", "func-timeout"]
[metadata] [metadata]
content-hash = "14697a0280b9caecec47c1bb76bc7c2a18fa04b715560b3d5699cf2efdce67f5" content-hash = "c948e61801e83c7105de786b85616a1b61957e6950cd649039bd67f87193559c"
python-versions = "^3.7" python-versions = "^3.7"
[metadata.files] [metadata.files]
...@@ -2319,8 +2317,8 @@ importlib-metadata = [ ...@@ -2319,8 +2317,8 @@ importlib-metadata = [
{file = "importlib_metadata-1.7.0.tar.gz", hash = "sha256:90bb658cdbbf6d1735b6341ce708fc7024a3e14e99ffdc5783edea9f9b077f83"}, {file = "importlib_metadata-1.7.0.tar.gz", hash = "sha256:90bb658cdbbf6d1735b6341ce708fc7024a3e14e99ffdc5783edea9f9b077f83"},
] ]
isort = [ isort = [
{file = "isort-4.3.21-py2.py3-none-any.whl", hash = "sha256:6e811fcb295968434526407adb8796944f1988c5b65e8139058f2014cbe100fd"}, {file = "isort-5.0.3-py3-none-any.whl", hash = "sha256:3fbfad425b0a08a2969c5e1821d88785c210a08656c029c28931a1620f2d0f12"},
{file = "isort-4.3.21.tar.gz", hash = "sha256:54da7e92468955c4fceacd0c86bd0ec997b0e1ee80d97f67c35a78b719dccab1"}, {file = "isort-5.0.3.tar.gz", hash = "sha256:4c48d4cd773a6226baaaa176839e6f7ff82ef7c7842f6c54374fe2b14df4024b"},
] ]
jinja2 = [ jinja2 = [
{file = "Jinja2-2.11.2-py2.py3-none-any.whl", hash = "sha256:f0a4641d3cf955324a89c04f3d94663aa4d638abe8f733ecd3582848e1c37035"}, {file = "Jinja2-2.11.2-py2.py3-none-any.whl", hash = "sha256:f0a4641d3cf955324a89c04f3d94663aa4d638abe8f733ecd3582848e1c37035"},
......
...@@ -44,7 +44,7 @@ flake8-docstrings = "^1.5.0" ...@@ -44,7 +44,7 @@ flake8-docstrings = "^1.5.0"
flake8-rst-docstrings = "^0.0.13" flake8-rst-docstrings = "^0.0.13"
black = "^19.10b0" black = "^19.10b0"
flake8-black = "^0.2.0" flake8-black = "^0.2.0"
isort = "^4.3.21" isort = "^5.0.0"
flake8-isort = "^3.0.0" flake8-isort = "^3.0.0"
pytest-cov = "^2.8.1" pytest-cov = "^2.8.1"
pytest-sugar = "^0.9.2" pytest-sugar = "^0.9.2"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment