Merge branch 'release-v0.1.15'

.github/workflows/.tests-javascript.yml

@@ -0,0 +1,30 @@
+name: Javascript CI
+
+on:
+  push:
+    paths: ['rdltr_front/**']
+  pull_request:
+    paths: ['rdltr_front/**']
+
+env:
+  working-directory: rdltr_front
+
+jobs:
+  javascript:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Install yarn and dependencies
+        working-directory: ${{env.working-directory}}
+        run: |
+          npm install --global yarn
+          yarn install
+      - name: Lint
+        working-directory: ${{env.working-directory}}
+        run: yarn lint
+      - name: Type check
+        working-directory: ${{env.working-directory}}
+        run: yarn type-check
+      - name: Build
+        working-directory: ${{env.working-directory}}
+        run: yarn build

.github/workflows/.tests-python.yml

@@ -0,0 +1,74 @@
+name: Python CI
+
+on:
+  push:
+    paths-ignore: ['docs/**', 'docsrc/**', 'rdltr_front/**', '*.md']
+  pull_request:
+    paths-ignore: ['docs/**', 'docsrc/**', 'rdltr_front/**', '*.md']
+
+jobs:
+  python:
+    name: python ${{ matrix.python-version }}
+    runs-on: ubuntu-latest
+    container: python:${{ matrix.python-version }}
+    strategy:
+      matrix:
+        python-version:  [ "3.8", "3.9", "3.10", "3.11" , "3.12"]
+    env:
+      RDLTR_SETTINGS: 'rdltr.config.TestingConfig'
+    steps:
+      - uses: actions/checkout@v3
+      - name: Create and source virtual environment
+        run: | 
+          python3 -m venv .venv 
+          . .venv/bin/activate
+      - name: Install dependencies
+        run: python3 -m pip install -e .[test]
+      - name: Bandit
+        if: matrix.python-version == '3.11'
+        run: bandit -r rdltr -c pyproject.toml
+      - name: Lint (flake8, isort & black)
+        if: matrix.python-version == '3.11'
+        run: |
+          pytest --isort --black -m "isort or black" rdltr
+          flake8 rdltr
+      - name: Mypy
+        if: matrix.python-version == '3.11'
+        run: mypy rdltr
+      - name: Pytest
+        run: pytest rdltr/tests/tests --cov rdltr --cov-report term-missing
+
+  end2end:
+    name: e2e tests
+    runs-on: ubuntu-latest
+    needs: ["python"]
+    container: python:3.11
+    services:
+      selenium:
+        image: selenium/standalone-firefox
+    env:
+      RDLTR_HOST: '0.0.0.0'
+      RDLTR_SETTINGS: 'rdltr.config.TestingConfig'
+      RDLTR_DB_TEST_URL: 'sqlite:////tmp/rdltr_test.db'
+    steps:
+      - uses: actions/checkout@v3
+      - name: Update pip and install build
+        run: python3 -m pip install --upgrade pip build
+      - name: Create and source virtual environment
+        run: | 
+          python3 -m venv .venv 
+          . .venv/bin/activate
+      - name: Build rdltr package
+        run: python3 -m build
+      - name: Install rdltr package
+        run: python3 -m pip install dist/rdltr-$(cat VERSION).tar.gz
+      - name: Run migrations
+        run: rdltr_db
+      - name: Install pytest and selenium
+        run: python3 -m pip install pytest==7.4.0 pytest-selenium==4.0.1 selenium==4.9.0 pytest-html==3.2.0
+      - name: Start application and run tests with Selenium
+        run: |
+          setsid nohup rdltr >> nohup.out 2>&1 &
+          export RDLTR_HOST=$(hostname --ip-address)
+          sleep 5
+          pytest rdltr/tests/ui_tests --driver Remote --capability browserName firefox --selenium-host selenium --selenium-port 4444

CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## Version 0.1.15 (2024/01/07)
+
+No new features, only dependencies update
+
+### Misc
+
+* [#49](https://github.com/SamR1/rdltr/issues/49) - upgrade to Vue3
+
+
 ## Version 0.1.14 (2023/06/14)
 
 No new features, only dependencies update

Makefile

@@ -12,7 +12,11 @@ bandit:
 build-client:
 	cd rdltr_front && $(NPM) run build
 
-check-python: bandit lint-python type-check test
+check-all: check-front check-python
+
+check-front: lint-front type-check-front
+
+check-python: bandit lint-python type-check-python test
 
 clean:
 	rm -fr .pytest_cache
@@ -46,7 +50,7 @@ install: install-python install-front
 
 install-front:
 	# NPM_ARGS="--ignore-engines", if errors with Node latest version
-	cd rdltr_front && $(NPM) install --prod $(NPM_ARGS)
+	cd rdltr_front && $(NPM) install $(NPM_ARGS)
 
 install-python:
 	test -d $(VENV) || $(PYTHON_VERSION) -m venv $(VENV)
@@ -63,9 +67,6 @@ lint-python:
 	echo 'Running flake8...'
 	$(FLAKE8) $(FLASK_APP)
 
-lint-python-fix:
-	$(BLACK) $(FLASK_APP)
-
 migrate-db:
 	$(FLASK) db migrate
 
@@ -77,7 +78,7 @@ serve:
 	$(MAKE) P="serve-python serve-front" make-p
 
 serve-front:
-	cd rdltr_front && $(NPM) serve
+	cd rdltr_front && $(NPM) dev
 
 serve-python:
 	echo 'Running on http://$(HOST):$(PORT)'
@@ -89,7 +90,12 @@ test:
 test-ui:
 	$(PYTEST) $(FLASK_APP)/tests/ui_tests --driver firefox $(PYTEST_ARGS)
 
-type-check:
+type-check-all: type-check-python type-check-front
+
+type-check-front:
+	cd rdltr_front && $(NPM) type-check
+
+type-check-python:
 	echo 'Running mypy...'
 	$(MYPY) $(FLASK_APP)
 

README.md

@@ -2,8 +2,8 @@
 
 [![PyPI version](https://img.shields.io/pypi/v/rdltr.svg)](https://pypi.org/project/rdltr/)
 [![Python Version](https://img.shields.io/badge/python-3.8+-brightgreen.svg)](https://python.org)
-[![Flask Version](https://img.shields.io/badge/flask-2.3-brightgreen.svg)](http://flask.pocoo.org/)
-[![Vue Version](https://img.shields.io/badge/vue-2.7-brightgreen.svg)](https://vuejs.org/)  
+[![Flask Version](https://img.shields.io/badge/flask-3.0-brightgreen.svg)](http://flask.pocoo.org/)
+[![Vue Version](https://img.shields.io/badge/vue-3.4-brightgreen.svg)](https://vuejs.org/)  
 [![code style: black](https://img.shields.io/badge/code%20style-black-black)](https://github.com/psf/black) 
 [![type check: mypy](https://img.shields.io/badge/type%20check-mypy-blue)](http://mypy-lang.org/) 
 [![code style: prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg)](https://github.com/prettier/prettier) 

VERSION

@@ -1 +1 @@
-0.1.14
+0.1.15

docs/.buildinfo

@@ -1,4 +1,4 @@
 # Sphinx build info version 1
 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
-config: e5be6c2373d9dd8d40bb6e7e963bda6c
+config: fc843008c51d68bc4a677259caa19800
 tags: 645f666f9bcd5a90fca523b33c5a78b7

docs/_sources/changelog.md.txt

@@ -1,5 +1,14 @@
 # Changelog
 
+## Version 0.1.15 (2024/01/07)
+
+No new features, only dependencies update
+
+### Misc
+
+* [#49](https://github.com/SamR1/rdltr/issues/49) - upgrade to Vue3
+
+
 ## Version 0.1.14 (2023/06/14)
 
 No new features, only dependencies update

docs/_static/basic.css

@@ -237,6 +237,10 @@ a.headerlink {
     visibility: hidden;
 }
 
+a:visited {
+    color: #551A8B;
+}
+
 h1:hover > a.headerlink,
 h2:hover > a.headerlink,
 h3:hover > a.headerlink,
@@ -670,6 +674,16 @@ dd {
     margin-left: 30px;
 }
 
+.sig dd {
+    margin-top: 0px;
+    margin-bottom: 0px;
+}
+
+.sig dl {
+    margin-top: 0px;
+    margin-bottom: 0px;
+}
+
 dl > dd:last-child,
 dl > dd:last-child > :last-child {
     margin-bottom: 0;
@@ -738,6 +752,14 @@ abbr, acronym {
     cursor: help;
 }
 
+.translated {
+    background-color: rgba(207, 255, 207, 0.2)
+}
+
+.untranslated {
+    background-color: rgba(255, 207, 207, 0.2)
+}
+
 /* -- code displays --------------------------------------------------------- */
 
 pre {

docs/_static/documentation_options.js

@@ -1,6 +1,5 @@
-var DOCUMENTATION_OPTIONS = {
-    URL_ROOT: document.getElementById("documentation_options").getAttribute('data-url_root'),
-    VERSION: '0.1.14',
+const DOCUMENTATION_OPTIONS = {
+    VERSION: '0.1.15',
     LANGUAGE: 'en',
     COLLAPSE_INDEX: false,
     BUILDER: 'html',

docs/_static/pygments.css

@@ -17,6 +17,7 @@ span.linenos.special { color: #000000; background-color: #ffffc0; padding-left:
 .highlight .cs { color: #3D7B7B; font-style: italic } /* Comment.Special */
 .highlight .gd { color: #A00000 } /* Generic.Deleted */
 .highlight .ge { font-style: italic } /* Generic.Emph */
+.highlight .ges { font-weight: bold; font-style: italic } /* Generic.EmphStrong */
 .highlight .gr { color: #E40000 } /* Generic.Error */
 .highlight .gh { color: #000080; font-weight: bold } /* Generic.Heading */
 .highlight .gi { color: #008400 } /* Generic.Inserted */