Skip to content

Commit e71e70e

Browse files
committed
Testing and operating on native RHEL-9 python v3.9
1 parent e7cbb86 commit e71e70e

File tree

4 files changed

+9
-31
lines changed

4 files changed

+9
-31
lines changed

.github/workflows/anms-core.yaml

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -7,30 +7,8 @@ on:
77
- anms-core/**
88

99
jobs:
10-
unit-test:
11-
runs-on: ubuntu-latest
12-
steps:
13-
- name: Checkout repository
14-
uses: actions/checkout@v4
15-
with:
16-
submodules: recursive
17-
- name: Set up Python
18-
uses: actions/setup-python@v5
19-
with:
20-
python-version: "3.10"
21-
- name: Install dependencies
22-
run: |
23-
pip3 install deps/dtnma-ace
24-
pip3 install deps/dtnma-camp
25-
- name: Install
26-
working-directory: anms-core
27-
run: pip3 install -e '.[test]'
28-
- name: Run test
29-
working-directory: anms-core
30-
run: PYTHONPATH=src python3 -m pytest --junit-xml=testresults.xml --cov=anms test
31-
3210
flake8:
33-
runs-on: ubuntu-latest
11+
runs-on: ubuntu-24.04
3412
steps:
3513
- name: Checkout repository
3614
uses: actions/checkout@v4
@@ -39,7 +17,7 @@ jobs:
3917
- name: Set up Python
4018
uses: actions/setup-python@v5
4119
with:
42-
python-version: "3.10"
20+
python-version: "3.9"
4321
- name: Install dependencies
4422
run: |
4523
pip3 install deps/dtnma-ace

.github/workflows/aricodec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- name: Set up Python
1818
uses: actions/setup-python@v5
1919
with:
20-
python-version: "3.10"
20+
python-version: "3.9"
2121
- name: Install dependencies
2222
run: |
2323
pip3 install deps/dtnma-ace

.github/workflows/transcoder.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88

99
jobs:
1010
flake8:
11-
runs-on: ubuntu-latest
11+
runs-on: ubuntu-24.04
1212
steps:
1313
- name: Checkout repository
1414
uses: actions/checkout@v4
@@ -17,7 +17,7 @@ jobs:
1717
- name: Set up Python
1818
uses: actions/setup-python@v5
1919
with:
20-
python-version: "3.10"
20+
python-version: "3.9"
2121
- name: Install flake8
2222
working-directory: transcoder
2323
run: pip3 install flake8

base.Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,12 @@ FROM anms-base AS dtnma-acelib
6969

7070
# Install System Level Dependencies
7171
RUN --mount=type=cache,target=/var/cache/yum \
72-
dnf -y install gcc-c++ python3.11-devel python3.11 python3.11-pip python3.11-wheel python3.11-setuptools iputils && \
73-
pip3.11 install pip-tools
72+
dnf -y install gcc-c++ python-devel python3-pip python3-wheel python3-setuptools iputils && \
73+
pip3 install pip-tools
7474

7575
# Use specific OS python version
76-
ENV PIP=pip3.11
77-
ENV PYTHON=python3.11
76+
ENV PIP=pip3
77+
ENV PYTHON=python3
7878
# Submodules with dependencies
7979
ENV PY_WHEEL_DIR=/usr/local/lib/wheels
8080

0 commit comments

Comments
 (0)