Merge branch 'master' into 241-allow-matching-primary-groups-on-arbitrary-field

aleksis/core/admin.py

-#noqa
+# noqa
 
 from django.contrib import admin
 

AlekSIS-App-Chronos @ 87ebea45

-Subproject commit d0c674577acb61054369f3086f0d0782c6b0a57f
+Subproject commit 87ebea4521c94af7de9852b3fcf164b997f7e085

AlekSIS-App-DashboardFeeds @ 6dfdb1a1

-Subproject commit a7bd17eea561f28f6693e1c0b5b58383f5a829ce
+Subproject commit 6dfdb1a156beafacc71a306584f7649e70e88da4

AlekSIS-App-Hjelp @ 10e93dee

-Subproject commit 9cbc0dc7d39ccc424c75011c803f29948daf93e1
+Subproject commit 10e93dee9f536cf7f7fe15e036a7e5a11e423ee3

AlekSIS-App-LDAP @ 3ed829b3

-Subproject commit de809e65e8bf107b761c4a984f14ef517a531f23
+Subproject commit 3ed829b3e20351c2a2e768bd8206828019db5b77

AlekSIS-App-Untis @ 970eb7d7

-Subproject commit a567021ee5e66657b3374a76865bab1ee9bdbc33
+Subproject commit 970eb7d762cf7a47a6087570d179280ea392d3bc

docs/conf.py

@@ -15,22 +15,22 @@
 import django
 import os
 import sys
-sys.path.insert(0, os.path.abspath('..'))
-os.environ['DJANGO_SETTINGS_MODULE'] = 'aleksis.core.settings'
-os.environ['LOCAL_SETTINGS_FILE'] = os.path.abspath(
-    os.path.join('..', 'local.cfg'))
+
+sys.path.insert(0, os.path.abspath(".."))
+os.environ["DJANGO_SETTINGS_MODULE"] = "aleksis.core.settings"
+os.environ["LOCAL_SETTINGS_FILE"] = os.path.abspath(os.path.join("..", "local.cfg"))
 django.setup()
 
 # -- Project information -----------------------------------------------------
 
-project = 'AlekSIS'
-copyright = '2019, 2020, AlekSIS team'
-author = 'AlekSIS team'
+project = "AlekSIS"
+copyright = "2019, 2020, AlekSIS team"
+author = "AlekSIS team"
 
 # The short X.Y version
-version = '2.0'
+version = "2.0"
 # The full version, including alpha/beta/rc tags
-release = '2.0a1'
+release = "2.0a1"
 
 
 # -- General configuration ---------------------------------------------------
@@ -43,24 +43,24 @@ release = '2.0a1'
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
 extensions = [
-    'sphinx.ext.autodoc',
-    'sphinxcontrib_django',
-    'sphinx_autodoc_typehints',
-    'sphinx.ext.intersphinx',
-    'sphinx.ext.viewcode',
+    "sphinx.ext.autodoc",
+    "sphinxcontrib_django",
+    "sphinx_autodoc_typehints",
+    "sphinx.ext.intersphinx",
+    "sphinx.ext.viewcode",
 ]
 
 # Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
+templates_path = ["_templates"]
 
 # The suffix(es) of source filenames.
 # You can specify multiple suffix as a list of string:
 #
 # source_suffix = ['.rst', '.md']
-source_suffix = '.rst'
+source_suffix = ".rst"
 
 # The master toctree document.
-master_doc = 'index'
+master_doc = "index"
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -72,7 +72,7 @@ language = None
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
 # This pattern also affects html_static_path and html_extra_path.
-exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store']
+exclude_patterns = ["_build", "Thumbs.db", ".DS_Store"]
 
 # The name of the Pygments (syntax highlighting) style to use.
 pygments_style = None
@@ -83,7 +83,7 @@ pygments_style = None
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
 #
-html_theme = 'alabaster'
+html_theme = "alabaster"
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
@@ -94,7 +94,7 @@ html_theme = 'alabaster'
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
+html_static_path = ["_static"]
 
 # Custom sidebar templates, must be a dictionary that maps document names
 # to template names.
@@ -110,7 +110,7 @@ html_static_path = ['_static']
 # -- Options for HTMLHelp output ---------------------------------------------
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = 'AlekSISdoc'
+htmlhelp_basename = "AlekSISdoc"
 
 
 # -- Options for LaTeX output ------------------------------------------------
@@ -119,15 +119,12 @@ latex_elements = {
     # The paper size ('letterpaper' or 'a4paper').
     #
     # 'papersize': 'letterpaper',
-
     # The font size ('10pt', '11pt' or '12pt').
     #
     # 'pointsize': '10pt',
-
     # Additional stuff for the LaTeX preamble.
     #
     # 'preamble': '',
-
     # Latex figure (float) alignment
     #
     # 'figure_align': 'htbp',
@@ -137,8 +134,7 @@ latex_elements = {
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
-    (master_doc, 'AlekSIS.tex', 'AlekSIS Documentation',
-     'AlekSIS team', 'manual'),
+    (master_doc, "AlekSIS.tex", "AlekSIS Documentation", "AlekSIS team", "manual"),
 ]
 
 
@@ -146,10 +142,7 @@ latex_documents = [
 
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
-man_pages = [
-    (master_doc, 'aleksis', 'AlekSIS Documentation',
-     [author], 1)
-]
+man_pages = [(master_doc, "aleksis", "AlekSIS Documentation", [author], 1)]
 
 
 # -- Options for Texinfo output ----------------------------------------------
@@ -158,9 +151,15 @@ man_pages = [
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-    (master_doc, 'AlekSIS', 'AlekSIS Documentation',
-     author, 'AlekSIS', 'One line description of project.',
-     'Miscellaneous'),
+    (
+        master_doc,
+        "AlekSIS",
+        "AlekSIS Documentation",
+        author,
+        "AlekSIS",
+        "One line description of project.",
+        "Miscellaneous",
+    ),
 ]
 
 
@@ -179,7 +178,7 @@ epub_title = project
 # epub_uid = ''
 
 # A list of files that should not be packed into the epub file.
-epub_exclude_files = ['search.html']
+epub_exclude_files = ["search.html"]
 
 
 # -- Extension configuration -------------------------------------------------
@@ -187,5 +186,7 @@ epub_exclude_files = ['search.html']
 # -- Options for intersphinx extension ---------------------------------------
 
 # Example configuration for intersphinx: refer to the Python standard library.
-intersphinx_mapping = {'https://docs.python.org/': None,
-                       'https://docs.djangoproject.com/en/stable': 'https://docs.djangoproject.com/en/stable/_objects'}
+intersphinx_mapping = {
+    "https://docs.python.org/": None,
+    "https://docs.djangoproject.com/en/stable": "https://docs.djangoproject.com/en/stable/_objects",
+}

manage.py

@@ -2,8 +2,8 @@
 import os
 import sys
 
-if __name__ == '__main__':
-    os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'aleksis.core.settings')
+if __name__ == "__main__":
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "aleksis.core.settings")
     try:
         from django.core.management import execute_from_command_line
     except ImportError as exc: