add quiz app, upgrade uswgi

diff --git a/app/settings.py b/app/settings.py
index 83038fe4630d624743ae16f690a31b8413d8faf3..f26fd88b5c9bec0c204b0ae76e402533820e882a 100644 (file)
--- a/app/settings.py
+++ b/app/settings.py
@@ -335,6 +335,10 @@ INSTALLED_APPS = (
     'rest_framework',
     'rest_framework.authtoken',
     'storages',
+    'quiz',
+    'multichoice',
+    'true_false',
+    'essay',
 )
 
 

diff --git a/env/dev.yml b/env/dev.yml
index 7da2ef45ced105cebeb5e1435306ab3d889c6006..971a86cb8cae8c8ffec383b092ee044960fbe3bb 100644 (file)
--- a/env/dev.yml
+++ b/env/dev.yml
@@ -25,6 +25,9 @@ services:
         - 'env/debug.env'
       ports:
         - "9000:8000"
+      volumes:
+        - ./pyproject.toml:/srv/pyproject.toml
+        - ./poetry.lock:/srv/poetry.lock
 
   channels:
     build:

diff --git a/poetry.lock b/poetry.lock
index aef9463c3e6454f7aed24b5591bc820889df635c..880add7cf101adb830506bf853308a530ea3eadb 100644 (file)
--- a/poetry.lock
+++ b/poetry.lock
@@ -1,4 +1,4 @@
-# This file is automatically @generated by Poetry 1.8.3 and should not be changed by hand.
+# This file is automatically @generated by Poetry 1.8.2 and should not be changed by hand.
 
 [[package]]
 name = "aioredis"
@@ -713,6 +713,20 @@ files = [
 Django = ">=1.0"
 six = "*"
 
+[[package]]
+name = "django-model-utils"
+version = "5.0.0"
+description = "Django model mixins and utilities"
+optional = false
+python-versions = ">=3.8"
+files = [
+    {file = "django_model_utils-5.0.0-py3-none-any.whl", hash = "sha256:fec78e6c323d565a221f7c4edc703f4567d7bb1caeafe1acd16a80c5ff82056b"},
+    {file = "django_model_utils-5.0.0.tar.gz", hash = "sha256:041cdd6230d2fbf6cd943e1969318bce762272077f4ecd333ab2263924b4e5eb"},
+]
+
+[package.dependencies]
+Django = ">=3.2"
+
 [[package]]
 name = "django-nvd3"
 version = "0.9.7"
@@ -739,6 +753,26 @@ files = [
 [package.dependencies]
 Django = "*"
 
+[[package]]
+name = "django-quiz-app"
+version = "0.5.1"
+description = "A configurable quiz app for Django."
+optional = false
+python-versions = "*"
+files = []
+develop = false
+
+[package.dependencies]
+Django = ">=1.5.1"
+django-model-utils = ">=2.0.3"
+Pillow = ">=2.5.0"
+
+[package.source]
+type = "git"
+url = "https://github.com/pilot-systems/Django-Quiz.git"
+reference = "HEAD"
+resolved_reference = "414ffcec05588d41652cdd1799706abccad9b8b7"
+
 [[package]]
 name = "django-recaptcha"
 version = "2.0.6"
@@ -2315,12 +2349,12 @@ test = ["aiohttp (>=3.10.5)", "flake8 (>=5.0,<6.0)", "mypy (>=0.800)", "psutil",
 
 [[package]]
 name = "uwsgi"
-version = "2.0.25.1"
+version = "2.0.30"
 description = "The uWSGI server"
 optional = false
 python-versions = "*"
 files = [
-    {file = "uwsgi-2.0.25.1.tar.gz", hash = "sha256:d653d2d804c194c8cbe2585fa56efa2650313ae75c686a9d7931374d4dfbfc6e"},
+    {file = "uwsgi-2.0.30.tar.gz", hash = "sha256:c12aa652124f062ac216077da59f6d247bd7ef938234445881552e58afb1eb5f"},
 ]
 
 [[package]]
@@ -2645,4 +2679,4 @@ testing = ["coverage[toml]", "zope.event", "zope.testing"]
 [metadata]
 lock-version = "2.0"
 python-versions = "^3.10"
-content-hash = "6bc6cbf6fbe9ed773cacf9451ece9f8e29997e5426ad0dddb40529ea90a7bf3c"
+content-hash = "75063f62ed7197ea62b66b4106181196aeeeeb8c0513c3e3ae15173e4d52d6f5"

diff --git a/pyproject.toml b/pyproject.toml
index a4e6143ff76ff44316624a673698d85a7a7ca26a..2b7e59433927ed95570be1a24946e53f93420ee1 100644 (file)
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -36,13 +36,14 @@ xlrd = "2.0.1"
 xlwt = "1.3.0"
 psycopg2 = "2.8.6"
 redis = "3.5.3"
-uwsgi = "2.0.25.1"
+uwsgi = "2.0.30"
 uvicorn = {version = "0.18.1", extras = ["standard"]}
 httpx = "0.23.3"
 django-storages = {extras = ["s3"], version = "^1.14.2"}
 boto3 = "^1.34.89"
 ipython = "^8.23.0"
 reportlab = "^4.2.0"
+django-quiz-app = {git = "https://github.com/pilot-systems/Django-Quiz.git"}
 
 
 [build-system]