upgrade to sodar core 0.13.0 (#159)

CHANGELOG.rst

@@ -17,7 +17,7 @@ General
 - Fix broken async small file serving (#147)
 - Fix broken ``django-revproxy`` dependency
 - Fix parallel testing errors with Docker (#152)
-- Updated to ``sodar-core`` version 0.11.1
+- Updated to ``sodar-core`` version 0.13.0
 
 Kioscadmin
 ----------

config/settings/base.py

@@ -52,6 +52,7 @@
 
 THIRD_PARTY_APPS = [
     "crispy_forms",  # Form layouts
+    "crispy_bootstrap4",
     "rules.apps.AutodiscoverRulesConfig",  # Django rules engine
     "djangoplugins",  # Django plugins
     "pagedown",  # For markdown
@@ -79,6 +80,8 @@
     # SODAR Cache backend app
     # NOTE: Only enable if used in your site
     # 'sodarcache.apps.SodarcacheConfig',
+    # Admin Alerts site app
+    "appalerts.apps.AppalertsConfig",
 ]
 
 if KIOSC_EMBEDDED_FILES:
@@ -202,11 +205,17 @@
                 # Site context processors
                 "projectroles.context_processors.urls_processor",
                 "projectroles.context_processors.site_app_processor",
+                "projectroles.context_processors.sidebar_processor",
             ],
         },
     }
 ]
 
+PROJECTROLES_TEMPLATE_INCLUDE_PATH = env.path(
+    "PROJECTROLES_TEMPLATE_INCLUDE_PATH",
+    os.path.join(APPS_DIR, "templates", "include"),
+)
+
 CRISPY_TEMPLATE_PACK = "bootstrap4"
 
 # STATIC FILE CONFIGURATION
@@ -572,7 +581,7 @@ def set_logging(debug):
 # PROJECTROLES_SECRET_LENGTH = 32
 # PROJECTROLES_HELP_HIGHLIGHT_DAYS = 7
 # PROJECTROLES_SEARCH_PAGINATION = 5
-# PROJECTROLES_HIDE_APP_LINKS = env.list('PROJECTROLES_HIDE_APP_LINKS', None, [])  # noqa
+# PROJECTROLES_HIDE_PROJECT_APPS = env.list('PROJECTROLES_HIDE_PROJECT_APPS', None, [])  # noqa
 # PROJECTROLES_DELEGATE_LIMIT = env.int('PROJECTROLES_DELEGATE_LIMIT', 1)
 # Support for viewing the site in "kiosk mode" (under work, experimental)
 # PROJECTROLES_KIOSK_MODE = env.bool('PROJECTROLES_KIOSK_MODE', False)

config/urls.py

@@ -45,7 +45,9 @@
     # User Profile URLs
     url(r"^user/", include("userprofile.urls")),
     # Admin Alerts URLs
-    url(r"^alerts/", include("adminalerts.urls")),
+    url(r"^adminalerts/", include("adminalerts.urls")),
+    # App Alerts URLs
+    url("^appalerts/", include("appalerts.urls")),
     # Site Info URLs
     url(r"^siteinfo/", include("siteinfo.urls")),
     # API Tokens URLs

containers/tests/test_views.py

@@ -1331,7 +1331,7 @@ def setUp(self):
         self.file_content = bytes("content".encode("utf-8"))
 
         # Init file
-        self.file = self._make_file(
+        self.file = self.make_file(
             name="file.txt",
             file_name="file.txt",
             file_content=self.file_content,

containertemplates/forms.py

@@ -68,9 +68,9 @@ def __init__(self, *args, **kwargs):
         queryset_project = ContainerTemplateProject.objects.all()
 
         if not user.is_superuser:
-            queryset_project = queryset_project.filter(
-                project__roles__user=user
-            )
+            queryset_project = [
+                p for p in queryset_project if p.project.has_role(user)
+            ]
 
         choices_project = [
             (f"project:{obj.id}", f"[Project-wide] {obj.get_display_name()}")

containertemplates/tests/helpers.py

@@ -100,7 +100,7 @@ def create_fake_uuid(self):
 
     def assign_user_to_project(self, username, project):
         """Assign user to project."""
-        self._make_assignment(
+        self.make_assignment(
             project,
             getattr(self, f"user_{username}"),
             getattr(self, f"role_{username}"),

requirements/base.txt

@@ -1,44 +1,48 @@
 # Wheel
-wheel==0.37.1
+wheel>=0.40.0, <0.41
 
 # setuptools
-setuptools==65.3.0
+setuptools>=67.6.0, <67.7
+
+# Packaging
+packaging>=23.0, <24.0
 
 # Django
-django>=3.2.16, <3.3
+django>=3.2.19, <3.3
 
 # Configuration
-django-environ==0.9.0
+django-environ>=0.10.0, <0.11
 
 # Forms
-django-crispy-forms==1.14.0
+django-crispy-forms>=2.0, <2.1
+crispy-bootstrap4==2022.1
 
 # Models
-django-model-utils==4.2.0
+django-model-utils>=4.3.1, <4.4
 
 # Password storage
-argon2-cffi==21.3.0
+argon2-cffi>=21.3.0, <21.4
 
 # Python-PostgreSQL Database Adapter
-psycopg2-binary==2.9.3
+psycopg2-binary>=2.9.5, <2.10
 
 # Unicode slugification
-awesome-slugify==1.6.5
+awesome-slugify>=1.6.5, <1.7
 
 # Time zones support
-pytz>=2022.2.1
+pytz>=2022.7.1
 
 # SVG icon support
-django-iconify==0.1.1
+django-iconify==0.1.1  # NOTE: v0.3 crashes, see issue
 
-# Online documentation via django-docs.
-docutils==0.17.1
-Sphinx==5.1.1
-django-docs==0.3.1
-sphinx-rtd-theme==1.0.0
+# Online documentation via django-docs
+docutils==0.18.1  # NOTE: sphinx-rtd-theme 1.2 requires <0.19
+Sphinx==6.1.3
+django-docs==0.3.3
+sphinx-rtd-theme==1.2.0
 
 # Versioning
-versioneer==0.23
+versioneer==0.28
 
 ######################
 # Project app imports
@@ -48,38 +52,38 @@ versioneer==0.23
 -e git+https://github.com/mikkonie/django-plugins.git@42e86e7904e5c09f1da32173862b26843eda5dd8#egg=django-plugins
 
 # Rules for permissions
-rules==3.3
+rules>=3.3, <3.4
 
 # REST framework
-djangorestframework==3.13.1
+djangorestframework>=3.14.0, <3.15
 
 # Keyed list addon for DRF
 -e git+https://github.com/mikkonie/drf-keyed-list.git@b03607b866c5706b0e1ea46a7eeaab6527030734#egg=drf-keyed-list
 
 # Token authentication
-django-rest-knox==4.2.0
+django-rest-knox>=4.2.0, <4.3
 
 # Markdown field support
 markdown==3.4.1
-django-markupfield==2.0.1
-django-pagedown==2.2.1
-mistune==2.0.4
+django-markupfield>=2.0.1, <2.1
+django-pagedown>=2.2.1, <2.3
+mistune>=2.0.5, <2.1
 
 # Database file storage for filesfolders
 django-db-file-storage==0.5.5
 
 # Backround Jobs requirements
-celery==5.2.7
+celery>=5.2.7, <5.3
 
 # Django autocomplete light (DAL)
+# NOTE: 3.9.5 causes crash with Whitenoise (see issue #1224)
 django-autocomplete-light==3.9.4
 
 # SAML2 support for SSO
-django-saml2-auth-ai==2.1.6
+django-saml2-auth-ai>=2.1.6, <2.2
 
 # SODAR Core
-django-sodar-core==0.11.1
-# -e git+https://github.com/bihealth/sodar_core.git@36ed4605977ce2a7c27c6341238f4c1910953dea#egg=django-sodar-core
+django-sodar-core==0.13.0
 
 # Docker
 docker==5.0.0

requirements/production.txt

@@ -7,7 +7,7 @@
 whitenoise==6.2.0
 
 django-redis==5.2.0
-redis==4.3.4
+redis>=4.4.4
 
 # WSGI Handler
 gevent==1.4.0

requirements/test.txt

@@ -30,4 +30,4 @@ black==22.6.0
 urllib3-mock==0.3.3
 
 django-redis==5.2.0
-redis==4.3.4
+redis==4.4.4