Skip to content

Commit fda6e7b

Browse files
Merge branch 'feature/gr-dep008-913_uplift_python_version' of https://github.com/NHSDigital/data-validation-engine into feature/gr-dep008-913_uplift_python_version
2 parents 71dce2c + 531479a commit fda6e7b

File tree

3 files changed

+8
-13
lines changed

3 files changed

+8
-13
lines changed

.github/workflows/ci_linting.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,6 @@ jobs:
1313
steps:
1414
- uses: actions/checkout@v5
1515

16-
- name: Install extra dependencies for a python 3.7.17 install
17-
run: |
18-
sudo apt-get update
19-
sudo apt -y install --no-install-recommends liblzma-dev libbz2-dev libreadline-dev
20-
2116
- name: Install asdf cli
2217
uses: asdf-vm/actions/setup@v4
2318

@@ -26,6 +21,9 @@ jobs:
2621

2722
- name: reshim asdf
2823
run: asdf reshim
24+
25+
- name: ensure poetry using desired python version
26+
run: poetry env use $(asdf which python)
2927

3028
- name: Cache Poetry virtualenv
3129
uses: actions/cache@v4

.github/workflows/ci_testing.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@ jobs:
1414
- name: Checkout code
1515
uses: actions/checkout@v5
1616

17-
- name: Install extra dependencies for a python 3.7.17 install
18-
run: |
19-
sudo apt-get update
20-
sudo apt -y install --no-install-recommends liblzma-dev libbz2-dev libreadline-dev
2117
- name: Install asdf cli
2218
uses: asdf-vm/actions/setup@v4
2319

@@ -26,6 +22,9 @@ jobs:
2622

2723
- name: reshim asdf
2824
run: asdf reshim
25+
26+
- name: ensure poetry using desired python version
27+
run: poetry env use $(asdf which python)
2928

3029
- name: Cache Poetry virtualenv
3130
uses: actions/cache@v4
@@ -42,7 +41,6 @@ jobs:
4241
- name: Run pytest and coverage
4342
run: |
4443
export JAVA_HOME=$(asdf where java)
45-
echo "JAVA_HOME - $JAVA_HOME"
4644
make coverage
4745
4846
- name: Upload Coverage Report
@@ -54,5 +52,4 @@ jobs:
5452
- name: Run behave tests
5553
run: |
5654
export JAVA_HOME=$(asdf where java)
57-
echo "JAVA_HOME - $JAVA_HOME"
5855
make behave

.tool-versions

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
python 3.11
2-
poetry 2.2
1+
python 3.11.14
2+
poetry 2.2.0
33
java liberica-1.8.0

0 commit comments

Comments
 (0)