[Test] - All test passed

.do/deploy.template.yaml

@@ -16,8 +16,5 @@ spec:
     - key: LMS_PSWD
       value: "admin123+"
       type: SECRET
-    - key: DATABASE_URL
-      scope: RUN_TIME
-      value: ${example-db.DATABASE_URL}
   databases:
   - name: example-db

.dockerignore

@@ -7,7 +7,6 @@
 .idea
 .do
 
-
 # Documentacion
 mkdocs.yml
 docs
@@ -30,5 +29,5 @@ requirements-databases.txt
 .mypy.ini
 .gitpod.yml
 .gitpod.sh
-
-app.json
+app.json
+sonar-project.properties

.github/workflows/python-package.yml

@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.7, 3.8, 3.9, "3.10"]
+        python-version: [3.7, 3.8, 3.9, "3.10", "3.11"]
 
     steps:
     - uses: actions/checkout@v2
@@ -27,17 +27,26 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        python -m pip install flake8 pytest
+        python -m pip install bandit flake8 pytest
         python -m pip install -r development.txt
     - name: Lint project
       run: |
         rm -rf build
-        flake8 now_lms
+        flake8 --ignore=E712 now_lms
         python -m build
         python -m twine check dist/*
-        pylint now_lms
+        python -m bandit -r now_lms
+        python -m flake8 now_lms
+        python -m pylint now_lms
     - name: Test with pytest
       run: |
         pytest  -v --exitfirst --cov=now_lms
+    - name: Check python  types
+      run: |
+        python -m pip install mypy
+        python -m mypy --install-types --non-interactive now_lms
+    - name: OCI Image
+      run: |
+        docker buildx build .
     - name: Codecov
       uses: codecov/codecov-action@v1

.gitpod.sh

@@ -4,9 +4,11 @@ sudo apt install -y sqlite
 git config pull.rebase true
 python -m pip install --upgrade pip
 python -m pip install --upgrade pip
-python -m pip install -r development.txt
+python -m pip install --upgrade -r development.txt
 python -m pip install -e .
 python setup.py develop
 mypy now_lms --install-types --non-interactive 
 python -m pip install hupper
-/home/gitpod/.pyenv/versions/3.8.12/bin/hupper -m waitress --port=8080 now_lms:app
+python -m flask setup
+/home/gitpod/.pyenv/versions/3.8.12/bin/hupper -m waitress --port=8080 now_lms:app
+git push heroku mastergit remote add heroku https://git.heroku.com/app.git

.pylintrc

@@ -74,85 +74,14 @@ confidence=
 # --enable=similarities". If you want to run only the classes checker, but have
 # no Warning level messages displayed, use "--disable=all --enable=classes
 # --disable=W".
-disable=print-statement,
-        parameter-unpacking,
-        unpacking-in-except,
-        old-raise-syntax,
-        backtick,
-        long-suffix,
-        old-ne-operator,
-        old-octal-literal,
-        import-star-module-level,
-        non-ascii-bytes-literal,
-        raw-checker-failed,
+disable=raw-checker-failed,
         bad-inline-option,
         locally-disabled,
         file-ignored,
         suppressed-message,
         useless-suppression,
         deprecated-pragma,
         use-symbolic-message-instead,
-        apply-builtin,
-        basestring-builtin,
-        buffer-builtin,
-        cmp-builtin,
-        coerce-builtin,
-        execfile-builtin,
-        file-builtin,
-        long-builtin,
-        raw_input-builtin,
-        reduce-builtin,
-        standarderror-builtin,
-        unicode-builtin,
-        xrange-builtin,
-        coerce-method,
-        delslice-method,
-        getslice-method,
-        setslice-method,
-        no-absolute-import,
-        old-division,
-        dict-iter-method,
-        dict-view-method,
-        next-method-called,
-        metaclass-assignment,
-        indexing-exception,
-        raising-string,
-        reload-builtin,
-        oct-method,
-        hex-method,
-        nonzero-method,
-        cmp-method,
-        input-builtin,
-        round-builtin,
-        intern-builtin,
-        unichr-builtin,
-        map-builtin-not-iterating,
-        zip-builtin-not-iterating,
-        range-builtin-not-iterating,
-        filter-builtin-not-iterating,
-        using-cmp-argument,
-        eq-without-hash,
-        div-method,
-        idiv-method,
-        rdiv-method,
-        exception-message-attribute,
-        invalid-str-codec,
-        sys-max-int,
-        bad-python3-import,
-        deprecated-string-function,
-        deprecated-str-translate-call,
-        deprecated-itertools-function,
-        deprecated-types-field,
-        next-method-defined,
-        dict-items-not-iterating,
-        dict-keys-not-iterating,
-        dict-values-not-iterating,
-        deprecated-operator-function,
-        deprecated-urllib-function,
-        xreadlines-attribute,
-        deprecated-sys-function,
-        exception-escape,
-        comprehension-escape,
         # Por la naturaleza del proyecto no todos los import estan al inicio para evitar 
         # importaciones circulares
         import-outside-toplevel,

Dockerfile

@@ -1,20 +1,17 @@
-FROM registry.access.redhat.com/ubi8/ubi-minimal AS js
-RUN rpm --import https://dl.yarnpkg.com/rpm/pubkey.gpg \
-    && curl -sL https://dl.yarnpkg.com/rpm/yarn.repo -o /etc/yum.repos.d/yarn.repo \
-    && microdnf -y install yarn
-COPY package.json .
-COPY yarn.lock .
-RUN yarn
+FROM registry.access.redhat.com/ubi9/ubi-minimal AS js
+RUN microdnf install -y nodejs npm
+COPY ./now_lms/static/package.json package.json 
+RUN npm install
 
-FROM registry.access.redhat.com/ubi8/ubi-minimal
+FROM registry.access.redhat.com/ubi9/ubi-minimal
 
 ENV LANG C.UTF-8
 ENV LC_ALL C.UTF-8
 ENV PYTHONDONTWRITEBYTECODE 1
 ENV PYTHONUNBUFFERED = 1
 ENV FLASK_ENV "production"
 
-RUN microdnf install -y --nodocs --best --refresh python39 python39-pip python39-cryptography \
+RUN microdnf install -y --nodocs --best --refresh python39 python3-pip python3-cryptography \
     && microdnf clean all
 
 # Install dependencies in a layer

README.md

@@ -4,8 +4,11 @@
 ![PyPI - License](https://img.shields.io/pypi/l/now_lms?color=brightgreen&logo=apache&logoColor=white)
 ![PyPI](https://img.shields.io/pypi/v/now_lms?color=brightgreen&label=version&logo=python&logoColor=white)
 ![PyPI - Wheel](https://img.shields.io/pypi/wheel/now_lms?logo=python&logoColor=white)
+[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
+[![linting: pylint](https://img.shields.io/badge/linting-pylint-yellow)](https://github.com/PyCQA/pylint)
 [![codecov](https://codecov.io/gh/bmosoluciones/now-lms/branch/main/graph/badge.svg?token=SFVXF6Y3R3)](https://codecov.io/gh/bmosoluciones/now-lms)
 [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=bmosoluciones_now-lms&metric=alert_status)](https://sonarcloud.io/dashboard?id=bmosoluciones_now-lms)
+[![Join the chat at https://gitter.im/now-lms/community](https://badges.gitter.im/now-lms/community.svg)](https://gitter.im/now-lms/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 Simple to {install, use, configure, mantain} learning management system.
 
@@ -30,32 +33,37 @@ python -m pip install now_lms
 python -m now_lms
 ```
 
-Visit http://127.0.0.1:8080/ in your browser, defaul user and password are `lms-admin`, note that the default server is olny bind to the localhost.
+Visit http://127.0.0.1:8080/ in your browser, defaul user and password are `lms-admin`, note that the default server is only bind to the localhost.
 
 ### Other deployment options
 
 There are available templates to deploy Now - LMS to these services:
 
 [![Deploy to DO](https://img.shields.io/badge/DO-Deploy%20to%20DO-blue "Deploy as Digital Ocean App")](https://cloud.digitalocean.com/apps/new?repo=https://github.com/bmosoluciones/now-lms/tree/main)
-[![Deploy to Heroku](https://img.shields.io/badge/Heroku-Deploy%20to%20Heroku-blueviolet "Deploy to Heroku")](https://heroku.com/deploy?template=https://github.com/bmosoluciones/now-lms/tree/main)
+[![Deploy to Heroku](https://img.shields.io/badge/Heroku-Deploy%20to%20Heroku-blueviolet "Deploy to Heroku")](https://heroku.com/deploy?template=https://github.com/bmosoluciones/now-lms/tree/heroku)
 
 
 ### OCI Image
-[![Docker Repository on Quay](https://quay.io/repository/bmosoluciones/now-lms/status "Docker Repository on Quay")](https://quay.io/repository/bmosoluciones/now-lms) [![Join the chat at https://gitter.im/now-lms/community](https://badges.gitter.im/now-lms/community.svg)](https://gitter.im/now-lms/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+
+[![Docker Repository on Quay](https://quay.io/repository/bmosoluciones/now_lms/status "Docker Repository on Quay")](https://quay.io/repository/bmosoluciones/now_lms)
 
 There is also a OCI image disponible if you prefer to user containers, in this example we use [podman](https://podman.io/):
 
 ```
+# <---------------------------------------------> #
 # Install the podman command line tool.
-# Fedora, CentOS ...
+# DNF family (CentOS, Rocky, Alma):
 sudo dnf -y install podman
 
-# Debian, Ubuntu ...
+# APT family (Debian, Ubuntu):
 sudo apt install -y podman
 
-# OpenSUSE
+# OpenSUSE:
 sudo zypper in podman
 
+
+# <---------------------------------------------> #
+# Run the software.
 # Create a new pod:
 podman pod create --name now-lms -p 80:80 -p 443:443
 
@@ -77,4 +85,42 @@ podman run --pod now-lms --name now-lms-server --rm -v $PWD/nginx.conf:/etc/ngin
 
 ```
 
-NOW-LMS also will work with MySQL or MariaDB just change the image of the database container and set the correct connect string.
+NOW-LMS also will work with MySQL or MariaDB just change the image of the database container and set the correct connect string. SQLite also will work if you will serve a few users.
+
+## Contributing
+
+### Getting the source code
+
+```
+git clone https://github.com/bmosoluciones/now-lms.git
+```
+### Create a python virtual env
+
+```
+python3 -m venv venv
+# Linux:
+source venv/bin/activate
+# Windows
+venv\Scripts\activate.bat
+```
+### Install python deps
+
+```
+python3 - m pip install -r development.txt
+```
+
+### Install Boostrap
+
+```
+ cd now_lms/static/
+ npm install
+```
+
+### Start a development server
+
+```
+hupper -m waitress --port=8080 now_lms:app
+```
+Please note that we use waitress as WSGI server because gunicorn do not work on Windows, hupper will live reload the WSGI server as you save changes in the source code so you will be able to work with your changes as you work, please note that changes to the jinja templates will not trigger the server reload, only changes to python files.
+
+Default user and password are ```lms-admin```, default url to work with th server will be ```http://127.0.0.1:8080/```.

app.json

@@ -6,7 +6,7 @@
     "logo": "https://github.com/bmosoluciones/now-lms/raw/main/now_lms/static/icons/logo/logo_small.png",
     "keywords": ["lms", "python"],
     "scripts": {
-        "postdeploy": "python -m flask setup"
+        "postdeploy": "python -m pip install psycopg2-binary && python -m flask setup"
       },
       "env": {
         "LMS_KEY": {

development.txt

@@ -1,6 +1,9 @@
 # Base
 -r requirements.txt
 
+# Servidor de desarrollo
+hupper
+
 # Crear tarball y wheel
 build
 twine
@@ -25,3 +28,7 @@ mkdocs-material
 
 # Verificación de tipos
 mypy
+
+#Live realoader
+hupper
+# hupper -m now_lms