diff --git a/containers/views_api.py b/containers/views_api.py index 3b85cff..9981065 100644 --- a/containers/views_api.py +++ b/containers/views_api.py @@ -35,7 +35,6 @@ class ContainerListAPIView( SODARAPIGenericProjectMixin, ListAPIView, ): - serializer_class = ContainerSerializer permission_required = "containers.view_container" @@ -47,7 +46,6 @@ class ContainerDetailAPIView( SODARAPIGenericProjectMixin, RetrieveAPIView, ): - serializer_class = ContainerSerializer lookup_url_kwarg = "container" lookup_field = "sodar_uuid" @@ -58,7 +56,6 @@ class ContainerCreateAPIView( SODARAPIGenericProjectMixin, CreateAPIView, ): - serializer_class = ContainerSerializer permission_required = "containers.create_container" @@ -87,7 +84,6 @@ class ContainerDeleteAPIView( SODARAPIGenericProjectMixin, DestroyAPIView, ): - serializer_class = ContainerSerializer lookup_url_kwarg = "container" lookup_field = "sodar_uuid" @@ -160,7 +156,6 @@ class ContainerStartAPIView( SODARAPIGenericProjectMixin, APIView, ): - serializer_class = ContainerSerializer lookup_url_kwarg = "container" lookup_field = "sodar_uuid" @@ -206,7 +201,6 @@ class ContainerStopAPIView( SODARAPIGenericProjectMixin, APIView, ): - serializer_class = ContainerSerializer lookup_url_kwarg = "container" lookup_field = "sodar_uuid" diff --git a/kiosc/users/admin.py b/kiosc/users/admin.py index def99b5..1f19361 100644 --- a/kiosc/users/admin.py +++ b/kiosc/users/admin.py @@ -11,7 +11,6 @@ class Meta(UserChangeForm.Meta): class MyUserCreationForm(UserCreationForm): - error_message = UserCreationForm.error_messages.update( {"duplicate_username": "This username has already been taken."} ) diff --git a/requirements/base.txt b/requirements/base.txt index c55e4a9..ec49897 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -1,14 +1,14 @@ # Wheel wheel>=0.40.0, <0.41 -# setuptools +# Setuptools setuptools>=67.6.0, <67.7 # Packaging packaging>=23.0, <24.0 # Django -django>=3.2.19, <3.3 +django>=3.2.24, <3.3 # Configuration django-environ>=0.10.0, <0.11 @@ -37,9 +37,9 @@ django-iconify==0.1.1 # NOTE: v0.3 crashes, see issue # Online documentation via django-docs docutils==0.18.1 # NOTE: sphinx-rtd-theme 1.2 requires <0.19 -Sphinx==6.1.3 +Sphinx==6.2.1 # NOTE: sphinx-rtd-theme v1.2.2 forces <7 django-docs==0.3.3 -sphinx-rtd-theme==1.2.0 +sphinx-rtd-theme==1.2.2 # Versioning versioneer==0.28 @@ -49,7 +49,7 @@ versioneer==0.28 ###################### # Django-plugins (with Django v3.0+ support) --e git+https://github.com/mikkonie/django-plugins.git@42e86e7904e5c09f1da32173862b26843eda5dd8#egg=django-plugins +django-plugins-bihealth==0.4.0 # Rules for permissions rules>=3.3, <3.4 @@ -58,7 +58,7 @@ rules>=3.3, <3.4 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 +drf-keyed-list-bihealth==0.1.1 # Token authentication django-rest-knox>=4.2.0, <4.3 @@ -72,6 +72,9 @@ mistune>=2.0.5, <2.1 # Database file storage for filesfolders django-db-file-storage==0.5.5 +# Celery dependency +redis>=4.4.4 + # Backround Jobs requirements celery>=5.2.7, <5.3 @@ -83,7 +86,7 @@ django-autocomplete-light==3.9.4 django-saml2-auth-ai>=2.1.6, <2.2 # SODAR Core -django-sodar-core==0.13.0 +django-sodar-core==0.13.4 # Docker docker>=6.1.0, <7.0 @@ -102,3 +105,9 @@ service_identity==18.1.0 # Websockets websockets==10.1 + +# Django redis +django-redis==5.2.0 + +# Requests fails with 2.32.0 +requests==2.31.0 diff --git a/requirements/ldap.txt b/requirements/ldap.txt index 8a5c08d..8960c63 100644 --- a/requirements/ldap.txt +++ b/requirements/ldap.txt @@ -1,5 +1,5 @@ # Optional LDAP dependencies go here -r base.txt -django-auth-ldap==4.1.0 -python-ldap==3.4.2 +django-auth-ldap>=4.6.0, <4.7 +python-ldap>=3.4.4, <3.5 diff --git a/requirements/local.txt b/requirements/local.txt index 5cfdbff..252fd81 100644 --- a/requirements/local.txt +++ b/requirements/local.txt @@ -1,10 +1,10 @@ # Local development dependencies go here -r base.txt -django-extensions==3.2.0 -Werkzeug==2.2.2 +django-extensions==3.2.1 +Werkzeug>=3.0.1, <3.1 -django-debug-toolbar>=3.6.0, <3.7 +django-debug-toolbar>=3.8.1, <3.9 # improved REPL -ipdb==0.13.9, <0.14 +ipdb>=0.13.13, <0.14 diff --git a/requirements/production.txt b/requirements/production.txt index 003b0d8..07cafd0 100644 --- a/requirements/production.txt +++ b/requirements/production.txt @@ -6,10 +6,7 @@ # Whitenoise for static files whitenoise==6.2.0 -django-redis==5.2.0 -redis>=4.4.4 - # WSGI Handler -gevent==1.4.0 +gevent==24.2.1 daphne==2.5.0 uvicorn==0.17.1 diff --git a/requirements/test.txt b/requirements/test.txt index 8fb13ad..c05f332 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -1,33 +1,30 @@ # Test dependencies go here. -r base.txt -flake8==5.0.4 -django-test-plus==2.2.0 +flake8==6.0.0 +django-test-plus==2.2.1 factory-boy==3.2.1 -coverage==6.4.4 -django-coverage-plugin==2.0.3 +coverage==6.5.0 +django-coverage-plugin==3.0.0 # pytest pytest-django==4.5.2 -pytest-sugar==0.9.5 +pytest-sugar==0.9.6 # Selenium for UI testing -selenium==4.4.3 +selenium==4.8.2 # Tblib for tracebacks tblib==1.7.0 # BeautifulSoup for HTML testing -beautifulsoup4==4.11.1 +beautifulsoup4==4.11.2 + +# Black for formatting +black==23.1.0 # Coverage through Codacy codacy-coverage==1.3.11 -# Black for formatting -black==22.6.0 - # Mock library for urllib3 urllib3-mock==0.3.3 - -django-redis==5.2.0 -redis==4.4.4 \ No newline at end of file