Merge branch 'feature/COMP-170_improve_dependencies' into 'develop'

Feature/comp 170 improve dependencies part 1

See merge request !17

compendium_v2/app.py

@@ -8,4 +8,4 @@ environment.setup_logging()
 app = compendium_v2.create_app()
 
 if __name__ == '__main__':
-    app.run(host='::', port='5000')
+    app.run(host='::', port=5000)

mypy.ini

@@ -2,4 +2,3 @@
 python_version = 3.8
 disallow_untyped_defs = False
 ignore_missing_imports = False
-exclude = ['env/']
\ No newline at end of file

requirements.txt

-alembic
-click
-jsonschema
-flask
-flask-cors
-psycopg2-binary
-cryptography
-SQLAlchemy
-openpyxl
-pytest
-pytest-mock
-python-dotenv
+alembic~=1.10
+click~=8.1
+jsonschema~=4.17
+flask~=2.2
+flask-cors~=3.0
+openpyxl~=3.1
+psycopg2-binary~=2.9
+SQLAlchemy~=2.0
 
-sphinx
-sphinx-rtd-theme
-sphinxcontrib-httpdomain
-tox
+pytest~=7.2
+pytest-mock~=3.10
+sphinx~=6.1
+sphinx-rtd-theme~=1.2
+sphinxcontrib-httpdomain~=1.8
+tox~=4.4
 
-mypy
-types-docutils
-types-jsonschema
-types-Flask-Cors
-types-openpyxl
-types-setuptools
+mypy~=1.2
+types-docutils~=0.19
+types-jsonschema~=4.17
+types-Flask-Cors~=3.0
+types-openpyxl~=3.1
+types-setuptools~=67.6

setup.py

@@ -7,18 +7,17 @@ setup(
     author_email='swd@geant.org',
     description='Flask and React project for displaying '
                 'Compendium related reports and survey',
-    url='https://gitlab.geant.net/live-projects/compendium-v2',
+    url='https://gitlab.geant.org/geant-swd/compendium-v2',
     packages=find_packages(),
     install_requires=[
-        'jsonschema',
-        'flask',
-        'flask-cors',
-        'SQLAlchemy',
-        'alembic',
-        'psycopg2-binary',
-        'cryptography',
-        'openpyxl',
-        'click'
+        'alembic~=1.10',
+        'click~=8.1',
+        'jsonschema~=4.17',
+        'flask~=2.2',
+        'flask-cors~=3.0',
+        'openpyxl~=3.1',
+        'psycopg2-binary~=2.9',
+        'SQLAlchemy~=2.0',
     ],
     include_package_data=True,
 

tox.ini

@@ -18,7 +18,6 @@ commands =
     coverage html
     coverage report --fail-under 80
     flake8
-    # Disable mypy in tox until build server supports python 3.9
-    # mypy compendium_v2/**/*.py test/*.py
+    mypy {toxinidir}/compendium_v2/ {toxinidir}/test/
     sphinx-build -M html docs/source docs/build
 

webapp/.eslintrc.json

@@ -9,6 +9,7 @@
       "react-hooks"
     ],
     "extends": [
+      "eslint:recommended",
       "plugin:react/recommended",
       "plugin:@typescript-eslint/recommended"
     ],