Small updates (#22)

* Applied source layout

* Added lint configuration

* Fixed IDEA pylint configuration

* Adjusted path

* Adjusted path for pytest

* Upgraded dependencies

Author: MrMatAP

.github/workflows/build.yml

@@ -9,7 +9,7 @@ name: Build
 env:
   MAJOR: 0
   MINOR: 0
-  PYTHON_VERSION: 3.11.0
+  PYTHON_VERSION: 3.10.1
 
 #
 # Establish when the workflow is run
@@ -44,7 +44,7 @@ jobs:
     - name: Calculate Build Context
       run: |
         MRMAT_VERSION="${MAJOR}.${MINOR}.${GITHUB_RUN_NUMBER}"
-        if [ "$GITHUB_EVENT_NAME" == 'pull_request_target' -a "$GITHUB_BASE_REF" == 'main' ]; then
+        if [ "$GITHUB_EVENT_NAME" == 'pull_request_target' && GITHUB_BASE_REF == 'main']; then
           MRMAT_IS_RELEASE=true
           echo "::warning ::Building release ${MRMAT_VERSION}"
           echo "MRMAT_IS_RELEASE=true" >> $GITHUB_ENV
@@ -69,10 +69,12 @@ jobs:
 
     - name: Build
       run: |
+        export PYTHONUSERBASE=${HOME}/.local
+        pip install --user wheel
         pip install --user -r requirements.txt
-        pylint ${GITHUB_WORKSPACE}/src/python/mrmat_python_api_flask
-        PYTHONPATH=${GITHUB_WORKSPACE}/src/python python -m pytest
-        python -m build --wheel -n  
+        ${PYTHONUSERBASE}/bin/pylint ${GITHUB_WORKSPACE}/src/python/mrmat_python_api_flask
+        PYTHONPATH=${GITHUB_WORKSPACE}/src/python python -m pytest --cov=mrmat_python_api_flask
+        PYTHONPATH=${GITHUB_WORKSPACE} python -m build --wheel -n
 
     - name: Upload test results
       uses: actions/upload-artifact@v2

mrmat_python_api_flask/apis/healthz/model.py

@@ -5,27 +5,24 @@
 
 # Build/Test requirements
 
-setuptools>=42.0.0
-build>=0.9.0             # MIT
-wheel>=0.36.0            # MIT
-pylint~=2.15.5           # MIT
-pytest~=7.2.0            # GPL-2.0-or-later
-pytest-cov~=4.0.0        # MIT
-pyjwt~=2.6.0             # MIT
-python-keycloak~=2.6.0   # MIT
+build~=0.8.0             # MIT
+wheel~=0.37.1            # MIT
+pylint~=2.14.5           # GPL-2.0-or-later
+pytest~=7.1.2            # MIT
+pytest-cov~=3.0.0        # MIT
+pyjwt~=2.4.0             # MIT
+python-keycloak~=2.1.1  # MIT
 
 # Runtime requirements
 
-rich~=12.6.0                    # MIT
-Flask~=2.2.2                    # BSD 3-Clause
-Flask-SQLAlchemy~=3.0.2         # BSD 3-Clause
-Flask-Migrate~=4.0.0            # MIT
-flask-smorest~=0.40.0           # MIT
+rich~=12.5.1                    # MIT
+Flask~=2.1.3                    # BSD 3-Clause
+Flask-SQLAlchemy~=2.5.1         # BSD 3-Clause
+Flask-Migrate~=3.1.0            # MIT
+flask-smorest~=0.38.1           # MIT
 Flask-Marshmallow~=0.14.0       # MIT
-marshmallow-sqlalchemy~=0.28.1  # MIT
-psycopg2-binary~=2.9.5          # LGPL with exceptions
+marshmallow-sqlalchemy~=0.27.0  # MIT
+psycopg2-binary~=2.9.3          # LGPL with exceptions
 Flask-OIDC~=1.4.0               # MIT
-
-# Do we need these?
-#requests_oauthlib~=1.3.1        # ISC
+requests_oauthlib~=1.3.1        # ISC
 itsdangerous<=2.0.1             # BSD 3-Clause      Must affix so JSONWebSignatureSerializer is known

requirements.txt

@@ -0,0 +1,46 @@
+[metadata]
+name = mrmat-python-api-flask
+version = attr: ci.version
+author = Mathieu Imfeld
+author_email = [email protected]
+maintainer = Mathieu Imfeld
+maintainer_email = [email protected]
+long_description = file: README.md
+license = MIT
+url = https://github.com/MrMatOrg/mrmat-python-api-flask
+classifiers =
+    Development Status :: 3 - Alpha
+    License :: OSI Approved :: MIT
+    Programming Language :: Python :: 3.9
+
+[options]
+package_dir =
+    =src/python
+packages = find:
+include_package_data = True
+install_requires =
+    rich~=11.2.0
+    Flask~=2.0.3
+    Flask-SQLAlchemy~=2.5.1
+    Flask-Migrate~=3.1.0
+    flask-smorest~=0.37.0
+    Flask-Marshmallow~=0.14.0
+    marshmallow-sqlalchemy~=0.27.0
+    psycopg2-binary~=2.9.3
+    Flask-OIDC~=1.4.0
+    requests_oauthlib~=1.3.1
+    itsdangerous<=2.0.1
+
+[options.entry_points]
+console_scripts =
+    mrmat-python-api-flask = mrmat_python_api_flask.cui:main
+    mrmat-python-api-flask-client = mrmat_python_api_flask.client:main
+
+[options.packages.find]
+where=src/python
+exclude =
+    ci
+
+[options.package_data]
+mrmat_python_api_flask.migrations =
+    *