Skip to content

Commit 4e4857f

Browse files
authored
Merge pull request #272 from boutproject/remove-codecov
No CI failure when coverage upload fails
2 parents afb5ba6 + 5fcb4da commit 4e4857f

File tree

3 files changed

+7
-23
lines changed

3 files changed

+7
-23
lines changed

.github/workflows/master.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
if: always()
2121
strategy:
2222
matrix:
23-
python-version: [3.8, 3.9, '3.10']
23+
python-version: [3.8, 3.9, '3.10', 3.x]
2424
pip-packages:
2525
- "setuptools pip pytest pytest-cov coverage codecov boutdata xarray numpy>=1.16.0"
2626
fail-fast: false
@@ -43,8 +43,6 @@ jobs:
4343
pytest -v --long --cov
4444
- name: Upload coverage to Codecov
4545
uses: codecov/codecov-action@v1
46-
with:
47-
fail_ci_if_error: true
4846

4947

5048
pytest-min-versions:
@@ -76,8 +74,6 @@ jobs:
7674
pytest -v --long --cov
7775
- name: Upload coverage to Codecov
7876
uses: codecov/codecov-action@v1
79-
with:
80-
fail_ci_if_error: true
8177

8278

8379
# Need to tidy up the things that flake8 finds before we activate this

.github/workflows/pythonpackage.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
if: always()
2121
strategy:
2222
matrix:
23-
python-version: [3.8, 3.9, '3.10']
23+
python-version: [3.8, 3.9, '3.10', 3.x]
2424
pip-packages:
2525
- "setuptools pip pytest pytest-cov coverage codecov boutdata xarray numpy>=1.16.0"
2626
fail-fast: false
@@ -43,8 +43,6 @@ jobs:
4343
pytest -v --long --cov
4444
- name: Upload coverage to Codecov
4545
uses: codecov/codecov-action@v1
46-
with:
47-
fail_ci_if_error: true
4846

4947

5048
pytest-min-versions:
@@ -76,8 +74,6 @@ jobs:
7674
pytest -v --long --cov
7775
- name: Upload coverage to Codecov
7876
uses: codecov/codecov-action@v1
79-
with:
80-
fail_ci_if_error: true
8177

8278

8379
# Need to tidy up the things that flake8 finds before we activate this

.github/workflows/pythonpublish.yml

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ jobs:
1414
if: always()
1515
strategy:
1616
matrix:
17-
python-version: [3.8, 3.9, '3.10']
17+
python-version: [3.8, 3.9, '3.10', 3.x]
1818
pip-packages:
19-
- "setuptools pip pytest pytest-cov coverage codecov boutdata xarray numpy>=1.16.0"
19+
- "setuptools pip pytest boutdata xarray numpy>=1.16.0"
2020
fail-fast: true
2121

2222
steps:
@@ -34,11 +34,7 @@ jobs:
3434
- name: Test with pytest
3535
run: |
3636
pip install pytest
37-
pytest -v --long --cov
38-
- name: Upload coverage to Codecov
39-
uses: codecov/codecov-action@v1
40-
with:
41-
fail_ci_if_error: true
37+
pytest -v --long
4238
4339
4440
pytest-min-versions:
@@ -49,7 +45,7 @@ jobs:
4945
matrix:
5046
python-version: [3.8]
5147
pip-packages:
52-
- "setuptools pip pytest pytest-cov coverage codecov boutdata==0.1.4 xarray==0.18.0 dask==2.10.0 numpy==1.18.0 natsort==5.5.0 matplotlib==3.1.1 animatplot==0.4.2 netcdf4==1.4.2 Pillow==7.2.0" # test with oldest supported version of packages. Note, using numpy==1.18.0 as a workaround because numpy==1.17.0 is not supported on Python-3.7, even though we should currently support numpy==1.17.0.
48+
- "setuptools pip pytest boutdata==0.1.4 xarray==0.18.0 dask==2.10.0 numpy==1.18.0 natsort==5.5.0 matplotlib==3.1.1 animatplot==0.4.2 netcdf4==1.4.2 Pillow==7.2.0" # test with oldest supported version of packages. Note, using numpy==1.18.0 as a workaround because numpy==1.17.0 is not supported on Python-3.7, even though we should currently support numpy==1.17.0.
5349
fail-fast: true
5450

5551
steps:
@@ -67,11 +63,7 @@ jobs:
6763
- name: Test with pytest
6864
run: |
6965
pip install pytest
70-
pytest -v --long --cov
71-
- name: Upload coverage to Codecov
72-
uses: codecov/codecov-action@v1
73-
with:
74-
fail_ci_if_error: true
66+
pytest -v --long
7567
7668
7769
# Need to tidy up the things that flake8 finds before we activate this

0 commit comments

Comments
 (0)