Skip to content

Commit 12d3d75

Browse files
committed
macos PR fix
1 parent 20a34cb commit 12d3d75

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

.github/workflows/ci.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
runs-on: ${{ matrix.os }}
88
strategy:
99
matrix:
10-
os: [ubuntu-latest, windows-latest, macos-latest]
10+
os: [ubuntu-latest, windows-latest, macos-12]
1111
python-version: ["3.9", "3.10"]
1212

1313
steps:
@@ -19,10 +19,10 @@ jobs:
1919
python-version: ${{ matrix.python-version }}
2020

2121
- name: Setup Conda
22-
uses: s-weigand/setup-conda@v1
22+
uses: s-weigand/setup-conda@v2
2323
with:
2424
python-version: ${{ matrix.python-version }}
25-
auto-update-conda: true
25+
update-conda: true
2626
conda-channels: anaconda, conda-forge
2727

2828
- name: Install pythonocc-core (Conda)
@@ -33,8 +33,8 @@ jobs:
3333
run: |
3434
python -m pip install --upgrade pip
3535
python -m pip install numpy scipy matplotlib pytest pytest-cov
36-
python -m pip install smithers[vtk]
37-
python -m pip install .[test]
36+
python -m pip install "smithers[vtk]"
37+
python -m pip install ".[test]"
3838
3939
- name: Run tests with pytest
4040
env:
@@ -46,5 +46,5 @@ jobs:
4646
python -m pytest --cov-report term --cov-report xml:cobertura.xml --cov=pygem
4747
curl -s https://coverage.codacy.com/get.sh -o CodacyCoverageReporter.sh
4848
chmod +x CodacyCoverageReporter.sh
49-
./CodacyCoverageReporter.sh report -r cobertura.xml -t $CODACY_API_TOKEN
50-
fi
49+
./CodacyCoverageReporter.sh report -r cobertura.xml -t "$CODACY_API_TOKEN"
50+
fi

.github/workflows/testing_pr.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
strategy:
1212
fail-fast: false
1313
matrix:
14-
os: [windows-latest, macos-latest, ubuntu-latest]
14+
os: [windows-latest, macos-12, ubuntu-latest]
1515
python-version: ["3.9", "3.10"]
1616

1717
steps:
@@ -23,10 +23,10 @@ jobs:
2323
python-version: ${{ matrix.python-version }}
2424

2525
- name: Setup Conda
26-
uses: s-weigand/setup-conda@v1
26+
uses: s-weigand/setup-conda@v2
2727
with:
2828
python-version: ${{ matrix.python-version }}
29-
auto-update-conda: true
29+
update-conda: true
3030
conda-channels: anaconda, conda-forge
3131

3232
- name: Install pythonocc-core (Conda)
@@ -36,8 +36,8 @@ jobs:
3636
- name: Install pip dependencies
3737
run: |
3838
python -m pip install --upgrade pip
39-
python -m pip install smithers[vtk]
40-
python -m pip install .[test]
39+
python -m pip install "smithers[vtk]"
40+
python -m pip install ".[test]"
4141
4242
- name: Run tests with pytest
4343
run: python -m pytest

0 commit comments

Comments
 (0)