Skip to content

Commit 8a3f8bd

Browse files
committed
Modernised and cleaned up (#23)
* Upgraded to Python 3.10.5 container * Local backup * Modernised surroundings * We do need itsdangerous * Removed duplicate keyword * Adjusted path to badge * Added test dependencies * Migrations are part of the package again
1 parent b6be670 commit 8a3f8bd

File tree

4 files changed

+23
-69
lines changed

4 files changed

+23
-69
lines changed

.github/workflows/build.yml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ name: Build
99
env:
1010
MAJOR: 0
1111
MINOR: 0
12-
PYTHON_VERSION: 3.10.1
12+
PYTHON_VERSION: 3.11.0
1313

1414
#
1515
# Establish when the workflow is run
@@ -44,7 +44,7 @@ jobs:
4444
- name: Calculate Build Context
4545
run: |
4646
MRMAT_VERSION="${MAJOR}.${MINOR}.${GITHUB_RUN_NUMBER}"
47-
if [ "$GITHUB_EVENT_NAME" == 'pull_request_target' && GITHUB_BASE_REF == 'main']; then
47+
if [ "$GITHUB_EVENT_NAME" == 'pull_request_target' -a "$GITHUB_BASE_REF" == 'main' ]; then
4848
MRMAT_IS_RELEASE=true
4949
echo "::warning ::Building release ${MRMAT_VERSION}"
5050
echo "MRMAT_IS_RELEASE=true" >> $GITHUB_ENV
@@ -69,12 +69,10 @@ jobs:
6969

7070
- name: Build
7171
run: |
72-
export PYTHONUSERBASE=${HOME}/.local
73-
pip install --user wheel
7472
pip install --user -r requirements.txt
75-
${PYTHONUSERBASE}/bin/pylint ${GITHUB_WORKSPACE}/src/python/mrmat_python_api_flask
76-
PYTHONPATH=${GITHUB_WORKSPACE}/src/python python -m pytest --cov=mrmat_python_api_flask
77-
PYTHONPATH=${GITHUB_WORKSPACE} python -m build --wheel -n
73+
pylint ${GITHUB_WORKSPACE}/src/python/mrmat_python_api_flask
74+
PYTHONPATH=${GITHUB_WORKSPACE}/src/python python -m pytest
75+
python -m build --wheel -n
7876
7977
- name: Upload test results
8078
uses: actions/upload-artifact@v2

.pylintrc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ disable=abstract-method,
9090
map-builtin-not-iterating,
9191
misplaced-comparison-constant,
9292
missing-function-docstring,
93-
missing-module-docstring,
9493
metaclass-assignment,
9594
next-method-called,
9695
next-method-defined,

requirements.txt

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,27 @@
55

66
# Build/Test requirements
77

8-
build~=0.8.0 # MIT
9-
wheel~=0.37.1 # MIT
10-
pylint~=2.14.5 # GPL-2.0-or-later
11-
pytest~=7.1.2 # MIT
12-
pytest-cov~=3.0.0 # MIT
13-
pyjwt~=2.4.0 # MIT
14-
python-keycloak~=2.1.1 # MIT
8+
setuptools>=42.0.0
9+
build>=0.9.0 # MIT
10+
wheel>=0.36.0 # MIT
11+
pylint~=2.15.5 # MIT
12+
pytest~=7.2.0 # GPL-2.0-or-later
13+
pytest-cov~=4.0.0 # MIT
14+
pyjwt~=2.6.0 # MIT
15+
python-keycloak~=2.6.0 # MIT
1516

1617
# Runtime requirements
1718

18-
rich~=12.5.1 # MIT
19-
Flask~=2.1.3 # BSD 3-Clause
20-
Flask-SQLAlchemy~=2.5.1 # BSD 3-Clause
21-
Flask-Migrate~=3.1.0 # MIT
22-
flask-smorest~=0.38.1 # MIT
19+
rich~=12.6.0 # MIT
20+
Flask~=2.2.2 # BSD 3-Clause
21+
Flask-SQLAlchemy~=3.0.2 # BSD 3-Clause
22+
Flask-Migrate~=4.0.0 # MIT
23+
flask-smorest~=0.40.0 # MIT
2324
Flask-Marshmallow~=0.14.0 # MIT
24-
marshmallow-sqlalchemy~=0.27.0 # MIT
25-
psycopg2-binary~=2.9.3 # LGPL with exceptions
25+
marshmallow-sqlalchemy~=0.28.1 # MIT
26+
psycopg2-binary~=2.9.5 # LGPL with exceptions
2627
Flask-OIDC~=1.4.0 # MIT
27-
requests_oauthlib~=1.3.1 # ISC
28+
29+
# Do we need these?
30+
#requests_oauthlib~=1.3.1 # ISC
2831
itsdangerous<=2.0.1 # BSD 3-Clause Must affix so JSONWebSignatureSerializer is known

setup.cfg

Lines changed: 0 additions & 46 deletions
This file was deleted.

0 commit comments

Comments
 (0)