Skip to content
Snippets Groups Projects
Commit 0568a5fc authored by permcu's avatar permcu
Browse files

Fix pyproject.toml

Commit fa4df9e5 had unresolved merge
conflicts. They are merged now. This also adds a newline the
aleksolotl missed.
parent 061eafa8
No related branches found
No related tags found
1 merge request!1261Manage holidays
Pipeline #137523 failed
......@@ -54,6 +54,7 @@ priority = "primary"
name = "gitlab"
url = "https://edugit.org/api/v4/projects/461/packages/pypi/simple"
priority = "supplemental"
[tool.poetry.dependencies]
python = "^3.9"
Django = "^4.1"
......@@ -128,14 +129,11 @@ graphene-django = ">=3.0.0, <=3.1.2"
selenium = "^4.4.3"
django-vite = "^2.0.2"
graphene-django-cud = "^0.10.0"
<<<<<<< HEAD
django-ical = "^1.8.3"
django-recurrence = "^1.11.1"
recurring-ical-events = "^2.0.2"
django-timezone-field = "^5.0"
=======
uwsgi = "^2.0.21"
>>>>>>> master
[tool.poetry.extras]
ldap = ["django-auth-ldap"]
......@@ -191,9 +189,5 @@ line-length = 100
exclude = "/migrations/"
[build-system]
<<<<<<< HEAD
requires = ["poetry-core"]
=======
requires = ["poetry-core>=1.0.0"]
>>>>>>> master
build-backend = "poetry.core.masonry.api"
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