Skip to content

Commit 453c19d

Browse files
mauvais2mauvais2
committed
updated from python 3.9 to 3.10
1 parent 135bcd2 commit 453c19d

File tree

14 files changed

+137
-143
lines changed

14 files changed

+137
-143
lines changed

‎.github/workflows/lint.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
runs-on: ubuntu-24.04
88
strategy:
99
matrix:
10-
python-version: ["3.9"]
10+
python-version: ["3.10"]
1111

1212
steps:
1313
- name: Update apt cache
@@ -36,15 +36,15 @@ jobs:
3636
3737
- name: Install dependencies
3838
run: |
39-
python3.9 -m pip install --upgrade pip
39+
python3.10 -m pip install --upgrade pip
4040
if [ -f pip/cpu_requirements.txt ]; then pip install -r pip/cpu_requirements.txt; fi
4141
4242
- name: Install ruff
4343
run: |
44-
python3.9 -m pip install ruff
44+
python3.10 -m pip install ruff
4545
4646
- name: Lint with ruff
4747
run: |
4848
# Check all lint rules
49-
python3.9 -m ruff check atomsci/
49+
python3.10 -m ruff check atomsci/
5050

‎.github/workflows/pytest.yml‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: tests
22

3-
on:
4-
push:
3+
on:
4+
push:
55
branches: ["**"]
66
pull_request:
77
types:
@@ -14,7 +14,7 @@ jobs:
1414
runs-on: ubuntu-24.04
1515
strategy:
1616
matrix:
17-
python-version: ["3.9"]
17+
python-version: ["3.10"]
1818
steps:
1919
- name: System Dependencies
2020
run: |
@@ -40,16 +40,16 @@ jobs:
4040
4141
- name: Install dependencies
4242
run: |
43-
python3.9 -m pip install --upgrade pip
43+
python3.10 -m pip install --upgrade pip
4444
pip install -e .
4545
if [ -f pip/cpu_requirements.txt ]; then pip install -r pip/cpu_requirements.txt; fi
4646
if [ -f pip/dev_requirements.txt ]; then pip install -r pip/dev_requirements.txt; fi
4747
4848
- name: pytest
4949
run: |
50-
# python3.9 -m pytest --capture=sys --capture=fd --cov=atomsci/ -vv atomsci/ddm/test/unit
51-
cd atomsci/modac/test/unit && python3.9 -m pytest --capture=sys --capture=fd --cov=atomsci/ -vv
52-
cd ../../../../atomsci/ddm/test/unit && python3.9 -m pytest -m "not moe_required" -n 2 --capture=sys --capture=fd --cov=atomsci -vv
50+
# python3.10 -m pytest --capture=sys --capture=fd --cov=atomsci/ -vv atomsci/ddm/test/unit
51+
cd atomsci/modac/test/unit && python3.10 -m pytest --capture=sys --capture=fd --cov=atomsci/ -vv
52+
cd ../../../../atomsci/ddm/test/unit && python3.10 -m pytest -m "not moe_required" -n 2 --capture=sys --capture=fd --cov=atomsci -vv
5353
env:
5454
ENV: test
5555

@@ -85,7 +85,7 @@ jobs:
8585
runs-on: ubuntu-24.04
8686
strategy:
8787
matrix:
88-
python-version: ["3.9"]
88+
python-version: ["3.10"]
8989
steps:
9090
- name: System Dependencies
9191
run: |
@@ -111,15 +111,15 @@ jobs:
111111
112112
- name: Install dependencies
113113
run: |
114-
python3.9 -m pip install --upgrade pip
114+
python3.10 -m pip install --upgrade pip
115115
pip install -e .
116116
if [ -f pip/cpu_requirements.txt ]; then pip install -r pip/cpu_requirements.txt; fi
117117
if [ -f pip/dev_requirements.txt ]; then pip install -r pip/dev_requirements.txt; fi
118118
119119
- name: pytest
120120
run: |
121121
# TODO: Run this test with pytest for paralell testing
122-
# python3.9 -m pytest -n 2 --capture=sys --capture=fd --cov=atomsci -vv atomsci/ddm/test/integrative
122+
# python3.10 -m pytest -n 2 --capture=sys --capture=fd --cov=atomsci -vv atomsci/ddm/test/integrative
123123
cd atomsci/ddm/test/integrative && ./integrative_batch_chunk_tests 0
124124
env:
125125
ENV: test
@@ -154,7 +154,7 @@ jobs:
154154
runs-on: ubuntu-24.04
155155
strategy:
156156
matrix:
157-
python-version: ["3.9"]
157+
python-version: ["3.10"]
158158
steps:
159159
- name: System Dependencies
160160
run: |
@@ -180,7 +180,7 @@ jobs:
180180
181181
- name: Install dependencies
182182
run: |
183-
python3.9 -m pip install --upgrade pip
183+
python3.10 -m pip install --upgrade pip
184184
pip install -e .
185185
if [ -f pip/cpu_requirements.txt ]; then pip install -r pip/cpu_requirements.txt; fi
186186
if [ -f pip/dev_requirements.txt ]; then pip install -r pip/dev_requirements.txt; fi
@@ -223,7 +223,7 @@ jobs:
223223
runs-on: ubuntu-24.04
224224
strategy:
225225
matrix:
226-
python-version: ["3.9"]
226+
python-version: ["3.10"]
227227
steps:
228228
- name: System Dependencies
229229
run: |
@@ -249,15 +249,15 @@ jobs:
249249
250250
- name: Install dependencies
251251
run: |
252-
python3.9 -m pip install --upgrade pip
252+
python3.10 -m pip install --upgrade pip
253253
pip install -e .
254254
if [ -f pip/cpu_requirements.txt ]; then pip install -r pip/cpu_requirements.txt; fi
255255
if [ -f pip/dev_requirements.txt ]; then pip install -r pip/dev_requirements.txt; fi
256256
257257
- name: pytest
258258
run: |
259259
# TODO: Run this test with pytest for paralell testing
260-
# python3.9 -m pytest -n 2 --capture=sys --capture=fd --cov=atomsci -vv atomsci/ddm/test/integrative
260+
# python3.10 -m pytest -n 2 --capture=sys --capture=fd --cov=atomsci -vv atomsci/ddm/test/integrative
261261
cd atomsci/ddm/test/integrative && ./integrative_batch_chunk_tests 2
262262
env:
263263
ENV: test
@@ -292,7 +292,7 @@ jobs:
292292
runs-on: ubuntu-24.04
293293
strategy:
294294
matrix:
295-
python-version: ["3.9"]
295+
python-version: ["3.10"]
296296
steps:
297297
- name: System Dependencies
298298
run: |
@@ -318,15 +318,15 @@ jobs:
318318
319319
- name: Install dependencies
320320
run: |
321-
python3.9 -m pip install --upgrade pip
321+
python3.10 -m pip install --upgrade pip
322322
pip install -e .
323323
if [ -f pip/cpu_requirements.txt ]; then pip install -r pip/cpu_requirements.txt; fi
324324
if [ -f pip/dev_requirements.txt ]; then pip install -r pip/dev_requirements.txt; fi
325325
326326
- name: pytest
327327
run: |
328328
# TODO: Run this test with pytest for paralell testing
329-
# python3.9 -m pytest -n 2 --capture=sys --capture=fd --cov=atomsci -vv atomsci/ddm/test/integrative
329+
# python3.10 -m pytest -n 2 --capture=sys --capture=fd --cov=atomsci -vv atomsci/ddm/test/integrative
330330
cd atomsci/ddm/test/integrative && ./integrative_batch_chunk_tests 3
331331
env:
332332
ENV: test
@@ -365,31 +365,31 @@ jobs:
365365
- name: Set up Python
366366
uses: actions/setup-python@v4
367367
with:
368-
python-version: "3.9"
369-
368+
python-version: "3.10"
369+
370370
- name: Install coverage
371371
run: pip install coverage
372-
372+
373373
- name: Download all coverage artifacts
374374
uses: actions/download-artifact@v5
375375
with:
376376
path: coverage-reports
377-
377+
378378
- name: Merge coverage reports
379379
run: |
380380
# List directory structure for debugging
381381
ls -la
382382
ls -la coverage-reports/ || echo "coverage-reports directory not found"
383-
383+
384384
# Find and combine all coverage files
385385
find coverage-reports -name ".coverage*" -type f
386-
386+
387387
# Combine all coverage files
388388
coverage combine $(find coverage-reports -name ".coverage*" -type f -print)
389-
389+
390390
# Generate XML report for codecov
391391
coverage xml
392-
392+
393393
- name: Upload merged coverage to Codecov
394394
uses: codecov/codecov-action@v4
395395
with:

‎Dockerfile.arm‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,19 @@
1-
FROM python:3.9
1+
FROM python:3.10
22

33
# Prevent interactive dialogs from halting the build
44
ENV DEBIAN_FRONTEND=noninteractive
55

6-
RUN apt update -y && apt install -y \
6+
RUN apt-get update -y && apt-get install -y \
77
build-essential \
88
libcairo2-dev \
99
libhdf5-dev \
1010
pkg-config \
11-
python3-dev \
12-
python3-openssl && \
13-
apt clean && \
14-
rm -rf /var/lib/apt/lists/*
11+
&& apt-get clean \
12+
&& rm -rf /var/lib/apt/lists/*
1513

1614
COPY ./pip/mchip_requirements.txt ./pip/mchip_requirements.txt
1715
RUN pip install -U pip && \
18-
pip install --no-cache-dir \
16+
pip install -v --no-cache-dir \
1917
--trusted-host pypi.python.org \
2018
--trusted-host files.pythonhosted.org \
2119
--trusted-host pypi.org \
@@ -25,7 +23,7 @@ RUN pip install -U pip && \
2523

2624
COPY ./pip/mchip_dev_requirements.txt ./pip/mchip_dev_requirements.txt
2725
RUN pip install -U pip && \
28-
pip install --no-cache-dir \
26+
pip install -v --no-cache-dir \
2927
--trusted-host pypi.python.org \
3028
--trusted-host files.pythonhosted.org \
3129
--trusted-host pypi.org \
@@ -43,7 +41,7 @@ RUN ./build.sh
4341
RUN pip install -e .
4442

4543
# Clean up
46-
RUN apt purge -y build-essential python3-dev && \
47-
apt autoremove -y && \
44+
RUN apt-get purge -y build-essential && \
45+
apt-get autoremove -y && \
4846
rm -rf /var/lib/apt/lists/*
4947
RUN rm -rf /root/.cache/pip

‎Dockerfile.cpu‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,19 @@
1-
FROM python:3.9
1+
FROM python:3.10
22

33
# Prevent interactive dialogs from halting the build
44
ENV DEBIAN_FRONTEND=noninteractive
55

6-
RUN apt update -y && apt install -y \
6+
RUN apt-get update -y && apt-get install -y \
77
build-essential \
88
libcairo2-dev \
99
libhdf5-dev \
1010
pkg-config \
11-
python3-dev \
12-
python3-openssl && \
13-
apt clean && \
14-
rm -rf /var/lib/apt/lists/*
11+
&& apt-get clean && \
12+
&& rm -rf /var/lib/apt/lists/*
1513

1614
COPY ./pip/cpu_requirements.txt ./pip/cpu_requirements.txt
1715
RUN pip install -U pip && \
18-
pip install --no-cache-dir \
16+
pip install -v --no-cache-dir \
1917
--trusted-host pypi.python.org \
2018
--trusted-host files.pythonhosted.org \
2119
--trusted-host pypi.org \
@@ -25,7 +23,7 @@ RUN pip install -U pip && \
2523

2624
COPY ./pip/dev_requirements.txt ./pip/dev_requirements.txt
2725
RUN pip install -U pip && \
28-
pip install --no-cache-dir \
26+
pip install -v --no-cache-dir \
2927
--trusted-host pypi.python.org \
3028
--trusted-host files.pythonhosted.org \
3129
--trusted-host pypi.org \
@@ -43,7 +41,7 @@ RUN ./build.sh
4341
RUN pip install -e .
4442

4543
# Clean up
46-
RUN apt purge -y build-essential python3-dev && \
47-
apt autoremove -y && \
44+
RUN apt-get purge -y build-essential && \
45+
apt-get autoremove -y && \
4846
rm -rf /var/lib/apt/lists/*
4947
RUN rm -rf /root/.cache/pip

‎Dockerfile.gpu‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,19 @@
1-
FROM python:3.9
1+
FROM python:3.10
22

33
# Prevent interactive dialogs from halting the build
44
ENV DEBIAN_FRONTEND=noninteractive
55

6-
RUN apt update -y && apt install -y \
6+
RUN apt-get update -y && apt-get install -y \
77
build-essential \
88
libcairo2-dev \
99
libhdf5-dev \
1010
pkg-config \
11-
python3-dev \
12-
python3-openssl && \
13-
apt clean && \
14-
rm -rf /var/lib/apt/lists/*
11+
&& apt-get clean \
12+
&& rm -rf /var/lib/apt/lists/*
1513

1614
COPY ./pip/cuda_requirements.txt ./pip/cuda_requirements.txt
1715
RUN pip install -U pip && \
18-
pip install --no-cache-dir \
16+
pip install -v --no-cache-dir \
1917
--trusted-host pypi.python.org \
2018
--trusted-host files.pythonhosted.org \
2119
--trusted-host pypi.org \
@@ -25,7 +23,7 @@ RUN pip install -U pip && \
2523

2624
COPY ./pip/dev_requirements.txt ./pip/dev_requirements.txt
2725
RUN pip install -U pip && \
28-
pip install --no-cache-dir \
26+
pip install -v --no-cache-dir \
2927
--trusted-host pypi.python.org \
3028
--trusted-host files.pythonhosted.org \
3129
--trusted-host pypi.org \
@@ -43,7 +41,7 @@ RUN ./build.sh
4341
RUN pip install -e .
4442

4543
# Clean up
46-
RUN apt purge -y build-essential python3-dev && \
47-
apt autoremove -y && \
44+
RUN apt-get purge -y build-essential && \
45+
apt-get autoremove -y && \
4846
rm -rf /var/lib/apt/lists/*
4947
RUN rm -rf /root/.cache/pip

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ pytest-integrative:
123123
pytest-unit:
124124
@echo "Running unit tests"
125125
docker run -v $(shell pwd)/$(WORK_DIR):/$(WORK_DIR) $(IMAGE_REPO):$(TAG) \
126-
/bin/bash -l -c "cd atomsci/ddm/test/unit && python3.9 -m pytest --capture=sys --capture=fd --cov=atomsci -vv"
126+
/bin/bash -l -c "cd atomsci/ddm/test/unit && python3.10 -m pytest --capture=sys --capture=fd --cov=atomsci -vv"
127127

128128
# Run ruff linter
129129
ruff:
@@ -144,7 +144,7 @@ setup:
144144
@echo "Removing old environment"
145145
rm -rf $(VENV)/ || true
146146
@echo "Creating new venv"
147-
python3.9 -m venv $(VENV)/
147+
python3.10 -m venv $(VENV)/
148148
$(VENV)/bin/pip install -U pip
149149
@echo "Installing dependencies"
150150
@if [ "$(PLATFORM)" = "gpu" ]; then \

0 commit comments

Comments
 (0)