diff --git a/.gitignore b/.gitignore index ea50233..373c09c 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ instance/ .admin_credentials *__pycache__/ .pytest_cache/ +.coverage diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ccd1a2a..e425d11 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,6 +11,7 @@ Atheneum:Tests: - python3 -m pipenv --version - cd server - pipenv install --dev --system - - PYTHONPATH=$(pwd) pytest + - PYTHONPATH=$(pwd) coverage --source=atheneum -m pytest + - coverage report tags: - docker diff --git a/server/Pipfile b/server/Pipfile index 35e14d5..2905646 100644 --- a/server/Pipfile +++ b/server/Pipfile @@ -14,6 +14,7 @@ click = "*" [dev-packages] python-dotenv = "*" pytest = "*" +coverage = "*" [requires] python_version = "3.6" diff --git a/server/Pipfile.lock b/server/Pipfile.lock index 2690696..e829ee3 100644 --- a/server/Pipfile.lock +++ b/server/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "1216a9077e9ccca2fea0ea5770f3fe3bfbbe6f6341d88b1aa754f21ee4a54792" + "sha256": "cc944d3cf9e7cc9969cfe57012f1b5408993f39acfacb67902b6072e276013e2" }, "pipfile-spec": 6, "requires": { @@ -216,6 +216,48 @@ ], "version": "==18.1.0" }, + "coverage": { + "hashes": [ + "sha256:03481e81d558d30d230bc12999e3edffe392d244349a90f4ef9b88425fac74ba", + "sha256:0b136648de27201056c1869a6c0d4e23f464750fd9a9ba9750b8336a244429ed", + "sha256:104ab3934abaf5be871a583541e8829d6c19ce7bde2923b2751e0d3ca44db60a", + "sha256:15b111b6a0f46ee1a485414a52a7ad1d703bdf984e9ed3c288a4414d3871dcbd", + "sha256:198626739a79b09fa0a2f06e083ffd12eb55449b5f8bfdbeed1df4910b2ca640", + "sha256:1c383d2ef13ade2acc636556fd544dba6e14fa30755f26812f54300e401f98f2", + "sha256:28b2191e7283f4f3568962e373b47ef7f0392993bb6660d079c62bd50fe9d162", + "sha256:2eb564bbf7816a9d68dd3369a510be3327f1c618d2357fa6b1216994c2e3d508", + "sha256:337ded681dd2ef9ca04ef5d93cfc87e52e09db2594c296b4a0a3662cb1b41249", + "sha256:3a2184c6d797a125dca8367878d3b9a178b6fdd05fdc2d35d758c3006a1cd694", + "sha256:3c79a6f7b95751cdebcd9037e4d06f8d5a9b60e4ed0cd231342aa8ad7124882a", + "sha256:3d72c20bd105022d29b14a7d628462ebdc61de2f303322c0212a054352f3b287", + "sha256:3eb42bf89a6be7deb64116dd1cc4b08171734d721e7a7e57ad64cc4ef29ed2f1", + "sha256:4635a184d0bbe537aa185a34193898eee409332a8ccb27eea36f262566585000", + "sha256:56e448f051a201c5ebbaa86a5efd0ca90d327204d8b059ab25ad0f35fbfd79f1", + "sha256:5a13ea7911ff5e1796b6d5e4fbbf6952381a611209b736d48e675c2756f3f74e", + "sha256:69bf008a06b76619d3c3f3b1983f5145c75a305a0fea513aca094cae5c40a8f5", + "sha256:6bc583dc18d5979dc0f6cec26a8603129de0304d5ae1f17e57a12834e7235062", + "sha256:701cd6093d63e6b8ad7009d8a92425428bc4d6e7ab8d75efbb665c806c1d79ba", + "sha256:7608a3dd5d73cb06c531b8925e0ef8d3de31fed2544a7de6c63960a1e73ea4bc", + "sha256:76ecd006d1d8f739430ec50cc872889af1f9c1b6b8f48e29941814b09b0fd3cc", + "sha256:7aa36d2b844a3e4a4b356708d79fd2c260281a7390d678a10b91ca595ddc9e99", + "sha256:7d3f553904b0c5c016d1dad058a7554c7ac4c91a789fca496e7d8347ad040653", + "sha256:7e1fe19bd6dce69d9fd159d8e4a80a8f52101380d5d3a4d374b6d3eae0e5de9c", + "sha256:8c3cb8c35ec4d9506979b4cf90ee9918bc2e49f84189d9bf5c36c0c1119c6558", + "sha256:9d6dd10d49e01571bf6e147d3b505141ffc093a06756c60b053a859cb2128b1f", + "sha256:9e112fcbe0148a6fa4f0a02e8d58e94470fc6cb82a5481618fea901699bf34c4", + "sha256:ac4fef68da01116a5c117eba4dd46f2e06847a497de5ed1d64bb99a5fda1ef91", + "sha256:b8815995e050764c8610dbc82641807d196927c3dbed207f0a079833ffcf588d", + "sha256:be6cfcd8053d13f5f5eeb284aa8a814220c3da1b0078fa859011c7fffd86dab9", + "sha256:c1bb572fab8208c400adaf06a8133ac0712179a334c09224fb11393e920abcdd", + "sha256:de4418dadaa1c01d497e539210cb6baa015965526ff5afc078c57ca69160108d", + "sha256:e05cb4d9aad6233d67e0541caa7e511fa4047ed7750ec2510d466e806e0255d6", + "sha256:e4d96c07229f58cb686120f168276e434660e4358cc9cf3b0464210b04913e77", + "sha256:f3f501f345f24383c0000395b26b726e46758b71393267aeae0bd36f8b3ade80", + "sha256:f8a923a85cb099422ad5a2e345fe877bbc89a8a8b23235824a93488150e45f6e" + ], + "index": "pypi", + "version": "==4.5.1" + }, "more-itertools": { "hashes": [ "sha256:2b6b9893337bfd9166bee6a62c2b0c9fe7735dcf85948b387ec8cba30e85d8e8", diff --git a/server/atheneum/__init__.py b/server/atheneum/__init__.py index 48e6e57..29895b4 100644 --- a/server/atheneum/__init__.py +++ b/server/atheneum/__init__.py @@ -36,7 +36,8 @@ def create_app(test_config=None): app.config.from_mapping( SECRET_KEY='dev', SQLALCHEMY_DATABASE_URI='sqlite:///{}/atheneum.db' - .format(data_directory) + .format(data_directory), + SQLALCHEMY_TRACK_MODIFICATIONS=False ) if test_config is None: @@ -56,7 +57,6 @@ def create_app(test_config=None): app.json_encoder = utility.CustomJSONEncoder - app.logger.debug('Initializing Application') db.init_app(app) app.logger.debug('Registering Database Models') diff --git a/server/atheneum/default_settings.py b/server/atheneum/default_settings.py index 62276b8..15a1584 100644 --- a/server/atheneum/default_settings.py +++ b/server/atheneum/default_settings.py @@ -1,4 +1,4 @@ DEBUG = False SECRET_KEY = b'\xb4\x89\x0f\x0f\xe5\x88\x97\xfe\x8d<\x0b@d\xe9\xa5\x87%' \ b'\xc6\xf0@l1\xe3\x90g\xfaA.?u=s' # CHANGE ME IN REAL CONFIG -SQLALCHEMY_TRACK_MODIFICATIONS=False +SQLALCHEMY_TRACK_MODIFICATIONS = False diff --git a/server/test_settings.py b/server/test_settings.py index 62276b8..3ca8736 100644 --- a/server/test_settings.py +++ b/server/test_settings.py @@ -1,4 +1,3 @@ DEBUG = False SECRET_KEY = b'\xb4\x89\x0f\x0f\xe5\x88\x97\xfe\x8d<\x0b@d\xe9\xa5\x87%' \ b'\xc6\xf0@l1\xe3\x90g\xfaA.?u=s' # CHANGE ME IN REAL CONFIG -SQLALCHEMY_TRACK_MODIFICATIONS=False