Skip to content

Commit c635be1

Browse files
committed
Simplify tox/CI
1 parent b782110 commit c635be1

File tree

2 files changed

+7
-30
lines changed

2 files changed

+7
-30
lines changed

.github/workflows/test_and_deploy.yml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ jobs:
2424
python-version: ['3.8', '3.9', '3.10']
2525

2626
steps:
27-
- uses: actions/checkout@v2
27+
- uses: actions/checkout@v3
2828

2929
- name: Set up Python ${{ matrix.python-version }}
30-
uses: actions/setup-python@v2
30+
uses: actions/setup-python@v3
3131
with:
3232
python-version: ${{ matrix.python-version }}
3333

@@ -41,20 +41,14 @@ jobs:
4141
git clone --depth 1 https://github.com/pyvista/gl-ci-helpers.git
4242
powershell gl-ci-helpers/appveyor/install_opengl.ps1
4343
44-
# note: if you need dependencies from conda, considering using
45-
# setup-miniconda: https://github.com/conda-incubator/setup-miniconda
46-
# and
47-
# tox-conda: https://github.com/tox-dev/tox-conda
4844
- name: Install dependencies
4945
run: |
5046
python -m pip install --upgrade pip
51-
python -m pip install setuptools tox tox-gh-actions
47+
python -m pip install tox tox-gh-actions
5248
5349
# this runs the platform-specific tests declared in tox.ini
5450
- name: Test with tox
5551
run: python -m tox
56-
env:
57-
PLATFORM: ${{ matrix.platform }}
5852

5953
- name: Coverage
6054
uses: codecov/codecov-action@v2

tox.ini

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,14 @@
11
# For more information about tox, see https://tox.readthedocs.io/en/latest/
22
[tox]
3-
envlist = py{38,39,310}-{linux,macos,windows}
4-
isolated_build=true
3+
envlist = py{38,39,310}
4+
isolated_build = true
55

66
[gh-actions]
77
python =
88
3.8: py38
99
3.9: py39
1010
3.10: py310
1111

12-
[gh-actions:env]
13-
PLATFORM =
14-
ubuntu-latest: linux
15-
macos-latest: macos
16-
windows-latest: windows
17-
1812
[testenv]
19-
platform =
20-
macos: darwin
21-
linux: linux
22-
windows: win32
23-
passenv =
24-
CI
25-
GITHUB_ACTIONS
26-
DISPLAY XAUTHORITY
27-
NUMPY_EXPERIMENTAL_ARRAY_FUNCTION
28-
PYVISTA_OFF_SCREEN
29-
extras =
30-
testing
31-
commands = pytest -v --color=yes --cov=napari_matplotlib --cov-report=xml
13+
extras = testing
14+
commands = python -m pytest -v --color=yes --cov=napari_matplotlib --cov-report=xml

0 commit comments

Comments
 (0)