Merge branch 'build-pypi' into 'master'

Build pypi package and reformat. AlekSIS-Core#317

See merge request !31

.gitlab-ci.yml

-image: registry.edugit.org/teckids/team-sysadmin/docker-images/python-pimped:latest
-
-stages:
-      - test
-      - build
-
-variables:
-  GIT_SUBMODULE_STRATEGY: recursive
-  PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"
-  FF_NETWORK_PER_BUILD: "true"
-
-cache:
-  key:
-    files:
-      - poetry.lock
-      - pyproject.toml
-  paths:
-    - .cache/pip
-    - .tox
-
 include:
+    - project: "AlekSIS/official/AlekSIS"
+      file: /ci/general.yml
     - project: "AlekSIS/official/AlekSIS"
       file: /ci/test.yml
     - project: "AlekSIS/official/AlekSIS"
       file: /ci/build_dist.yml
+    - project: "AlekSIS/official/AlekSIS"
+      file: /ci/deploy_pypi.yml

aleksis/apps/ldap/util/ldap_sync.py

@@ -128,6 +128,7 @@ def apply_templates(value, patterns, templates, separator="|"):
 
     return value
 
+
 def get_ldap_value_for_field(model, field, attrs, dn, instance=None, allow_missing=False):
     """Get the value of a field in LDAP attributes.
 

pyproject.toml

@@ -24,11 +24,16 @@ 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"
 django-ldapdb = "^1.4.0"
 tqdm = "^4.44.1"
-AlekSIS = { git = "https://edugit.org/AlekSIS/official/AlekSIS", extras = ["ldap"] }
+aleksis-core = {version = "^2.0a3", extras = ["ldap"]}
 
 [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]