Skip to content
This repository was archived by the owner on May 4, 2024. It is now read-only.

Commit 5afda0e

Browse files
SamR1SamR1
committed
Merge branch 'release-v0.1.15'
2 parents 4d4aade + e568059 commit 5afda0e

File tree

130 files changed

+5394
-10653
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

130 files changed

+5394
-10653
lines changed

‎.github/workflows/.tests-javascript.yml

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
name: Javascript CI
2+
3+
on:
4+
push:
5+
paths: ['rdltr_front/**']
6+
pull_request:
7+
paths: ['rdltr_front/**']
8+
9+
env:
10+
working-directory: rdltr_front
11+
12+
jobs:
13+
javascript:
14+
runs-on: ubuntu-latest
15+
steps:
16+
- uses: actions/checkout@v3
17+
- name: Install yarn and dependencies
18+
working-directory: ${{env.working-directory}}
19+
run: |
20+
npm install --global yarn
21+
yarn install
22+
- name: Lint
23+
working-directory: ${{env.working-directory}}
24+
run: yarn lint
25+
- name: Type check
26+
working-directory: ${{env.working-directory}}
27+
run: yarn type-check
28+
- name: Build
29+
working-directory: ${{env.working-directory}}
30+
run: yarn build

‎.github/workflows/.tests-python.yml

+74
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
name: Python CI
2+
3+
on:
4+
push:
5+
paths-ignore: ['docs/**', 'docsrc/**', 'rdltr_front/**', '*.md']
6+
pull_request:
7+
paths-ignore: ['docs/**', 'docsrc/**', 'rdltr_front/**', '*.md']
8+
9+
jobs:
10+
python:
11+
name: python ${{ matrix.python-version }}
12+
runs-on: ubuntu-latest
13+
container: python:${{ matrix.python-version }}
14+
strategy:
15+
matrix:
16+
python-version: [ "3.8", "3.9", "3.10", "3.11" , "3.12"]
17+
env:
18+
RDLTR_SETTINGS: 'rdltr.config.TestingConfig'
19+
steps:
20+
- uses: actions/checkout@v3
21+
- name: Create and source virtual environment
22+
run: |
23+
python3 -m venv .venv
24+
. .venv/bin/activate
25+
- name: Install dependencies
26+
run: python3 -m pip install -e .[test]
27+
- name: Bandit
28+
if: matrix.python-version == '3.11'
29+
run: bandit -r rdltr -c pyproject.toml
30+
- name: Lint (flake8, isort & black)
31+
if: matrix.python-version == '3.11'
32+
run: |
33+
pytest --isort --black -m "isort or black" rdltr
34+
flake8 rdltr
35+
- name: Mypy
36+
if: matrix.python-version == '3.11'
37+
run: mypy rdltr
38+
- name: Pytest
39+
run: pytest rdltr/tests/tests --cov rdltr --cov-report term-missing
40+
41+
end2end:
42+
name: e2e tests
43+
runs-on: ubuntu-latest
44+
needs: ["python"]
45+
container: python:3.11
46+
services:
47+
selenium:
48+
image: selenium/standalone-firefox
49+
env:
50+
RDLTR_HOST: '0.0.0.0'
51+
RDLTR_SETTINGS: 'rdltr.config.TestingConfig'
52+
RDLTR_DB_TEST_URL: 'sqlite:////tmp/rdltr_test.db'
53+
steps:
54+
- uses: actions/checkout@v3
55+
- name: Update pip and install build
56+
run: python3 -m pip install --upgrade pip build
57+
- name: Create and source virtual environment
58+
run: |
59+
python3 -m venv .venv
60+
. .venv/bin/activate
61+
- name: Build rdltr package
62+
run: python3 -m build
63+
- name: Install rdltr package
64+
run: python3 -m pip install dist/rdltr-$(cat VERSION).tar.gz
65+
- name: Run migrations
66+
run: rdltr_db
67+
- name: Install pytest and selenium
68+
run: python3 -m pip install pytest==7.4.0 pytest-selenium==4.0.1 selenium==4.9.0 pytest-html==3.2.0
69+
- name: Start application and run tests with Selenium
70+
run: |
71+
setsid nohup rdltr >> nohup.out 2>&1 &
72+
export RDLTR_HOST=$(hostname --ip-address)
73+
sleep 5
74+
pytest rdltr/tests/ui_tests --driver Remote --capability browserName firefox --selenium-host selenium --selenium-port 4444

‎.gitlab-ci.yml

-65
This file was deleted.

‎CHANGELOG.md

+9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
# Changelog
22

3+
## Version 0.1.15 (2024/01/07)
4+
5+
No new features, only dependencies update
6+
7+
### Misc
8+
9+
* [#49](https://github.com/SamR1/rdltr/issues/49) - upgrade to Vue3
10+
11+
312
## Version 0.1.14 (2023/06/14)
413

514
No new features, only dependencies update

‎Makefile

+13-7
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,11 @@ bandit:
1212
build-client:
1313
cd rdltr_front && $(NPM) run build
1414

15-
check-python: bandit lint-python type-check test
15+
check-all: check-front check-python
16+
17+
check-front: lint-front type-check-front
18+
19+
check-python: bandit lint-python type-check-python test
1620

1721
clean:
1822
rm -fr .pytest_cache
@@ -46,7 +50,7 @@ install: install-python install-front
4650

4751
install-front:
4852
# NPM_ARGS="--ignore-engines", if errors with Node latest version
49-
cd rdltr_front && $(NPM) install --prod $(NPM_ARGS)
53+
cd rdltr_front && $(NPM) install $(NPM_ARGS)
5054

5155
install-python:
5256
test -d $(VENV) || $(PYTHON_VERSION) -m venv $(VENV)
@@ -63,9 +67,6 @@ lint-python:
6367
echo 'Running flake8...'
6468
$(FLAKE8) $(FLASK_APP)
6569

66-
lint-python-fix:
67-
$(BLACK) $(FLASK_APP)
68-
6970
migrate-db:
7071
$(FLASK) db migrate
7172

@@ -77,7 +78,7 @@ serve:
7778
$(MAKE) P="serve-python serve-front" make-p
7879

7980
serve-front:
80-
cd rdltr_front && $(NPM) serve
81+
cd rdltr_front && $(NPM) dev
8182

8283
serve-python:
8384
echo 'Running on http://$(HOST):$(PORT)'
@@ -89,7 +90,12 @@ test:
8990
test-ui:
9091
$(PYTEST) $(FLASK_APP)/tests/ui_tests --driver firefox $(PYTEST_ARGS)
9192

92-
type-check:
93+
type-check-all: type-check-python type-check-front
94+
95+
type-check-front:
96+
cd rdltr_front && $(NPM) type-check
97+
98+
type-check-python:
9399
echo 'Running mypy...'
94100
$(MYPY) $(FLASK_APP)
95101

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

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

‎VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.1.14
1+
0.1.15

‎docs/.buildinfo

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

‎docs/_sources/changelog.md.txt

+9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
# Changelog
22

3+
## Version 0.1.15 (2024/01/07)
4+
5+
No new features, only dependencies update
6+
7+
### Misc
8+
9+
* [#49](https://github.com/SamR1/rdltr/issues/49) - upgrade to Vue3
10+
11+
312
## Version 0.1.14 (2023/06/14)
413

514
No new features, only dependencies update

‎docs/_static/basic.css

+22
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,10 @@ a.headerlink {
237237
visibility: hidden;
238238
}
239239

240+
a:visited {
241+
color: #551A8B;
242+
}
243+
240244
h1:hover > a.headerlink,
241245
h2:hover > a.headerlink,
242246
h3:hover > a.headerlink,
@@ -670,6 +674,16 @@ dd {
670674
margin-left: 30px;
671675
}
672676

677+
.sig dd {
678+
margin-top: 0px;
679+
margin-bottom: 0px;
680+
}
681+
682+
.sig dl {
683+
margin-top: 0px;
684+
margin-bottom: 0px;
685+
}
686+
673687
dl > dd:last-child,
674688
dl > dd:last-child > :last-child {
675689
margin-bottom: 0;
@@ -738,6 +752,14 @@ abbr, acronym {
738752
cursor: help;
739753
}
740754

755+
.translated {
756+
background-color: rgba(207, 255, 207, 0.2)
757+
}
758+
759+
.untranslated {
760+
background-color: rgba(255, 207, 207, 0.2)
761+
}
762+
741763
/* -- code displays --------------------------------------------------------- */
742764

743765
pre {

‎docs/_static/documentation_options.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
var DOCUMENTATION_OPTIONS = {
2-
URL_ROOT: document.getElementById("documentation_options").getAttribute('data-url_root'),
3-
VERSION: '0.1.14',
1+
const DOCUMENTATION_OPTIONS = {
2+
VERSION: '0.1.15',
43
LANGUAGE: 'en',
54
COLLAPSE_INDEX: false,
65
BUILDER: 'html',

‎docs/_static/pygments.css

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

0 commit comments

Comments
 (0)