Skip to content

Commit 8176d6d

Browse files
committed
restricted python versions to 3.9 and 3.10 to ensure compatibility with pythonocc-core
1 parent bad6ac5 commit 8176d6d

File tree

2 files changed

+26
-12
lines changed

2 files changed

+26
-12
lines changed

.github/workflows/ci.yml

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
strategy:
99
matrix:
1010
os: [ubuntu-latest, windows-latest, macos-12]
11-
python-version: ["3.9", "3.10", "3.11"]
11+
python-version: ["3.9", "3.10"]
1212

1313
steps:
1414
- uses: actions/checkout@v4
@@ -18,17 +18,30 @@ jobs:
1818
with:
1919
python-version: ${{ matrix.python-version }}
2020

21-
- name: Install Python dependencies
21+
- name: Setup Conda
22+
if: matrix.os != 'windows-latest'
23+
uses: s-weigand/setup-conda@v1
24+
with:
25+
auto-update-conda: true
26+
conda-channels: conda-forge
27+
28+
- name: Install pythonocc-core (Conda)
29+
if: matrix.os != 'windows-latest'
30+
run: conda install --yes pythonocc-core
31+
shell: bash
32+
33+
- name: Install pip dependencies
2234
run: |
2335
python -m pip install --upgrade pip
2436
python -m pip install numpy scipy matplotlib pytest pytest-cov
37+
python -m pip install smithers[vtk]
38+
python -m pip install .[test]
2539
2640
- name: Run tests with pytest
2741
env:
2842
CODACY_API_TOKEN: ${{ secrets.CODACY_API_TOKEN }}
2943
run: |
30-
if [ -z "$CODACY_API_TOKEN" ]
31-
then
44+
if [ -z "$CODACY_API_TOKEN" ]; then
3245
python -m pytest
3346
else
3447
python -m pytest --cov-report term --cov-report xml:cobertura.xml --cov=pygem

.github/workflows/testing_pr.yml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
fail-fast: false
1313
matrix:
1414
os: [windows-latest, macos-12, ubuntu-latest]
15-
python-version: ["3.9", "3.10", "3.11"]
15+
python-version: ["3.9", "3.10"]
1616

1717
steps:
1818
- uses: actions/checkout@v4
@@ -23,21 +23,22 @@ jobs:
2323
python-version: ${{ matrix.python-version }}
2424

2525
- name: Setup Conda
26-
if: matrix.os == 'macos-12' || matrix.os == 'ubuntu-latest'
26+
if: matrix.os != 'windows-latest'
2727
uses: s-weigand/setup-conda@v1
2828
with:
2929
auto-update-conda: true
3030
conda-channels: conda-forge
3131

32-
- name: Install Python dependencies
32+
- name: Install pythonocc-core (Conda)
33+
if: matrix.os != 'windows-latest'
34+
run: conda install --yes pythonocc-core
35+
shell: bash
36+
37+
- name: Install pip dependencies
3338
run: |
34-
if [[ "${{ matrix.os }}" == "macos-12" || "${{ matrix.os }}" == "ubuntu-latest" ]]; then
35-
conda install --yes pythonocc-core=7.4.0
36-
fi
3739
python -m pip install --upgrade pip
3840
python -m pip install smithers[vtk]
3941
python -m pip install .[test]
4042
4143
- name: Run tests with pytest
42-
run: |
43-
python -m pytest
44+
run: python -m pytest

0 commit comments

Comments
 (0)