Merge branch 'box-loc-db' into 'master'
Add multiple choice checkbox location to database See merge request !5
No related branches found
No related tags found
Showing
- .gitlab-ci.yml 6 additions, 0 deletions.gitlab-ci.yml
- README.md 20 additions, 0 deletionsREADME.md
- data/course.sqlite 0 additions, 0 deletionsdata/course.sqlite
- migrations/alembic.ini 45 additions, 0 deletionsmigrations/alembic.ini
- migrations/env.py 87 additions, 0 deletionsmigrations/env.py
- migrations/script.py.mako 23 additions, 0 deletionsmigrations/script.py.mako
- migrations/versions/4204f4a83863_pony_to_sqlalchemy.py 250 additions, 0 deletionsmigrations/versions/4204f4a83863_pony_to_sqlalchemy.py
- migrations/versions/f97aa3c73453_.py 34 additions, 0 deletionsmigrations/versions/f97aa3c73453_.py
- package.json 5 additions, 2 deletionspackage.json
- requirements.txt 6 additions, 1 deletionrequirements.txt
- tests/test_database.py 28 additions, 16 deletionstests/test_database.py
- tests/test_scans.py 20 additions, 14 deletionstests/test_scans.py
- zesje/__init__.py 6 additions, 26 deletionszesje/__init__.py
- zesje/api/__init__.py 3 additions, 8 deletionszesje/api/__init__.py
- zesje/api/emails.py 26 additions, 13 deletionszesje/api/emails.py
- zesje/api/exams.py 34 additions, 37 deletionszesje/api/exams.py
- zesje/api/export.py 4 additions, 5 deletionszesje/api/export.py
- zesje/api/feedback.py 34 additions, 27 deletionszesje/api/feedback.py
- zesje/api/graders.py 4 additions, 6 deletionszesje/api/graders.py
- zesje/api/images.py 18 additions, 10 deletionszesje/api/images.py
data/course.sqlite
0 → 100644
File added
migrations/alembic.ini
0 → 100644
migrations/env.py
0 → 100644
migrations/script.py.mako
0 → 100644
migrations/versions/f97aa3c73453_.py
0 → 100644
... | @@ -3,7 +3,7 @@ | ... | @@ -3,7 +3,7 @@ |
"main": "index.js", | "main": "index.js", | ||
"license": "AGPL-3.0", | "license": "AGPL-3.0", | ||
"scripts": { | "scripts": { | ||
"dev": "concurrently --kill-others --names \"WEBPACK,PYTHON\" --prefix-colors \"bgBlue.bold,bgGreen.bold\" \"webpack-dev-server --hot --inline --progress --config webpack.dev.js\" \"ZESJE_SETTINGS=$(pwd)/zesje.dev.cfg python3 zesje\"", | "dev": "concurrently --kill-others --names \"WEBPACK,PYTHON,CELERY\" --prefix-colors \"bgBlue.bold,bgGreen.bold,bgRed.bold\" \"webpack-dev-server --hot --inline --progress --config webpack.dev.js\" \"ZESJE_SETTINGS=$(pwd)/zesje.dev.cfg python3 zesje\" \"ZESJE_SETTINGS=$(pwd)/zesje.dev.cfg celery -A zesje.celery worker\"", | ||
"build": "webpack --config webpack.prod.js", | "build": "webpack --config webpack.prod.js", | ||
"ci": "yarn lint; yarn test", | "ci": "yarn lint; yarn test", | ||
"lint": "yarn lint:js; yarn lint:py", | "lint": "yarn lint:js; yarn lint:py", | ||
... | @@ -13,7 +13,10 @@ | ... | @@ -13,7 +13,10 @@ |
"lint:py": "flake8", | "lint:py": "flake8", | ||
"test:py": "python3 -m pytest -v -W error::RuntimeWarning", | "test:py": "python3 -m pytest -v -W error::RuntimeWarning", | ||
"start": "ZESJE_SETTINGS=$(pwd)/zesje.dev.cfg python3 zesje", | "start": "ZESJE_SETTINGS=$(pwd)/zesje.dev.cfg python3 zesje", | ||
"analyze": "webpack --config webpack.prod.js --profile --json > stats.json; webpack-bundle-analyzer stats.json zesje/static" | "analyze": "webpack --config webpack.prod.js --profile --json > stats.json; webpack-bundle-analyzer stats.json zesje/static", | ||
"migrate:dev": "ZESJE_SETTINGS=$(pwd)/zesje.dev.cfg FLASK_APP=zesje/__init__.py flask db upgrade", | |||
"migrate": "FLASK_APP=zesje/__init__.py flask db upgrade", | |||
"prepare-migration": "ZESJE_SETTINGS=$(pwd)/zesje.dev.cfg FLASK_APP=zesje/__init__.py flask db migrate" | |||
}, | }, | ||
"standard": { | "standard": { | ||
"parser": "babel-eslint", | "parser": "babel-eslint", | ||
... | ... |
# Core components | # Core components | ||
flask | flask | ||
flask_restful | flask_restful | ||
pony | flask_sqlalchemy | ||
sqlalchemy | |||
Flask-Migrate | |||
alembic | |||
pyyaml | pyyaml | ||
celery | |||
redis | |||
# General utilities | # General utilities | ||
numpy | numpy | ||
... | ... |
Please register or sign in to comment