Merge branch 'build-pypi' into 'master'

Build pypi package and reformat. Advances AlekSIS-Core#317

See merge request !36

.gitlab-ci.yml

@@ -5,3 +5,5 @@ include:
       file: /ci/test.yml
     - project: "AlekSIS/official/AlekSIS"
       file: /ci/build_dist.yml
+    - project: "AlekSIS/official/AlekSIS"
+      file: /ci/deploy_pypi.yml

aleksis/apps/untis/management/commands/untis_import_mysql_all.py

 from django.core.management.base import BaseCommand
 
-from ...tasks import untis_import_mysql_all_terms, untis_import_mysql_current_term
+from ...tasks import untis_import_mysql_all_terms
 
 
 class Command(BaseCommand):

aleksis/apps/untis/util/mysql/importers/terms.py

@@ -34,7 +34,6 @@ def get_terms_for_date(for_date: Optional[date] = None) -> QuerySet:
 
 def get_future_terms_for_date(for_date: Optional[date] = None) -> QuerySet:
     """Get all furture terms (after the current term)."""
-
     if not for_date:
         for_date = timezone.now().date()
 

pyproject.toml

@@ -23,13 +23,18 @@ classifiers = [
     "Typing :: Typed",
 ]
 
+[[tool.poetry.source]]
+name = "gitlab"
+url = "https://edugit.org/api/v4/projects/461/packages/pypi/simple"
+secondary = true
+
 [tool.poetry.dependencies]
 python = "^3.7"
-AlekSIS = { git = "https://edugit.org/AlekSIS/official/AlekSIS" }
-AlekSIS-App-Chronos = { git = "https://edugit.org/AlekSIS/official/AlekSIS-App-Chronos" }
 mysqlclient = "^2.0.0"
 tqdm = "^4.44.1"
 defusedxml = "^0.6.0"
+aleksis-core = {version = "^2.0a3.dev0+20201114132749.88d92354", allow-prereleases = true}
+aleksis-app-chronos = "^2.0a3.dev0+20201114181205.58815f85"
 
 [tool.poetry.dev-dependencies]
 sphinx = "^3.0"

tox.ini

@@ -22,9 +22,9 @@ setenv =
 
 [testenv:lint]
 commands =
-    - poetry run black --check --diff aleksis/ --exclude "migrations"
-    - poetry run isort -c --diff --stdout -rc -s migrations aleksis/
-    - poetry run flake8 {posargs} --exclude-from-doctest migrations aleksis/
+    - poetry run black --check --diff aleksis/
+    - poetry run isort -c --diff --stdout aleksis/
+    poetry run flake8 {posargs} aleksis/
 
 [testenv:security]
 commands =
@@ -40,7 +40,7 @@ commands = poetry run make -C docs/ html {posargs}
 
 [testenv:reformat]
 commands =
-    poetry run isort -rc aleksis/
+    poetry run isort aleksis/
     poetry run black aleksis/
 
 [flake8]
@@ -52,10 +52,10 @@ ignore = BLK100,E203,E231,W503,D100,D101,D102,D103,D104,D105,D106,D107,RST215,RS
 line_length = 100
 multi_line_output = 3
 include_trailing_comma = 1
-use_parantheses = 1
 default_section = THIRDPARTY
 known_first_party = aleksis
 known_django = django
+skip = migrations
 sections = FUTURE,STDLIB,DJANGO,THIRDPARTY,FIRSTPARTY,LOCALFOLDER
 
 [mypy]