Skip to content

Commit e7c0d1b

Browse files
committed
Modernised
1 parent 6f3379e commit e7c0d1b

Some content is hidden

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

69 files changed

+1196
-2921
lines changed

.github/workflows/build.yml

Lines changed: 10 additions & 9 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.11.0
12+
PYTHON_VERSION: 3.13.0
1313

1414
#
1515
# Establish when the workflow is run
@@ -39,12 +39,12 @@ jobs:
3939
steps:
4040

4141
- name: Checkout out our code
42-
uses: actions/checkout@v2
42+
uses: actions/checkout@v3
4343

4444
- name: Calculate Build Context
4545
run: |
4646
MRMAT_VERSION="${MAJOR}.${MINOR}.${GITHUB_RUN_NUMBER}"
47-
if [ "$GITHUB_EVENT_NAME" == 'pull_request_target' -a "$GITHUB_BASE_REF" == 'main' ]; then
47+
if [ "$GITHUB_EVENT_NAME" == 'pull_request_target' && 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
@@ -60,7 +60,7 @@ jobs:
6060
python-version: ${{ env.PYTHON_VERSION }}
6161

6262
- name: Establish a cache for dependencies
63-
uses: actions/cache@v2
63+
uses: actions/cache@v4
6464
with:
6565
path: |
6666
~/.local
@@ -69,16 +69,17 @@ jobs:
6969

7070
- name: Build
7171
run: |
72-
pip install --user -r requirements.txt
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
72+
export PYTHONUSERBASE=${HOME}/.local
73+
pip install --user -r requirements.txt -r requirements.dev.txt
74+
PYTHONPATH=${GITHUB_WORKSPACE}/src pytest
75+
PYTHONPATH=${GITHUB_WORKSPACE}/src python -m build --wheel -n
7676
7777
- name: Upload test results
78-
uses: actions/upload-artifact@v2
78+
uses: actions/upload-artifact@v4
7979
if: ${{ always() }}
8080
with:
8181
name: Test and Coverage
82+
8283
path: |
8384
build/junit.xml
8485
build/coverage.xml

.idea/misc.xml

Lines changed: 4 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/mrmat-python-api-flask.iml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/runConfigurations/client.xml

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

.idea/runConfigurations/db_current.xml

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

.idea/runConfigurations/db_downgrade.xml

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

.idea/runConfigurations/db_revision.xml

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

.idea/runConfigurations/db_upgrade.xml

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

.idea/runConfigurations/lint.xml

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/runConfigurations/mrmat_python_api_flask__local_infrastructure_.xml

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

0 commit comments

Comments
 (0)