Skip to content

Commit 24f5b26

Browse files
committed
move most tests from travis to gitlab actions
1 parent abb3cef commit 24f5b26

2 files changed

Lines changed: 8 additions & 42 deletions

File tree

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ jobs:
88
strategy:
99
matrix:
1010
os: [ubuntu-latest, macos-latest, windows-latest]
11-
python-version: [3.6, 3.7, 3.8]
11+
python-version: [3.6, 3.7, 3.8, 3.9, 3.10.0-alpha, pypy3]
1212
steps:
1313
- uses: actions/checkout@v2
1414
- name: Set up Python ${{ matrix.python-version }}
15-
uses: actions/setup-python@v1
15+
uses: actions/setup-python@v2
1616
with:
1717
python-version: ${{ matrix.python-version }}
1818
- name: Install dependencies

.travis.yml

Lines changed: 6 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -7,42 +7,15 @@ cache:
77
directories:
88
- "$HOME/.cache/pip"
99

10-
python:
11-
# CPython
12-
- "3.6"
13-
- "3.7"
14-
- "3.8"
15-
- "3.9"
16-
- "3.10-dev"
17-
- nightly
18-
# PyPy:
19-
- pypy3
20-
2110
install:
2211
- if [[ "$TEST_SOCKETCAN" ]]; then sudo bash test/open_vcan.sh ; fi
2312
- travis_retry python setup.py install
2413

25-
script:
26-
- |
27-
# install tox
28-
travis_retry pip install tox
29-
# Run the tests
30-
tox -e travis
31-
32-
# in addition to the above jobs also run:
3314
jobs:
34-
allow_failures:
35-
# we allow all dev & nightly builds to fail, since these python versions might
36-
# still be very unstable
37-
- python: nightly
38-
3915
include:
40-
# Note no matrix support when using stages.
4116
# Stages with the same name get run in parallel.
4217
# Jobs within a stage can also be named.
4318

44-
# Unit Testing Stage
45-
4619
# testing socketcan on Trusty & Python 3.6, since it is not available on Xenial
4720
- stage: test
4821
name: Socketcan
@@ -51,12 +24,12 @@ jobs:
5124
python: "3.6"
5225
sudo: required
5326
env: TEST_SOCKETCAN=TRUE
54-
55-
# testing on OSX
56-
- stage: test
57-
os: osx
58-
osx_image: xcode11.2 # Python 3.7.4 running on macOS 10.14.4
59-
language: shell # 'language: python' is an error on Travis CI macOS
27+
script:
28+
- |
29+
# install tox
30+
travis_retry pip install tox
31+
# Run the tests
32+
tox -e travis
6033
6134
- stage: documentation
6235
name: "Sphinx Build"
@@ -111,13 +84,6 @@ jobs:
11184
can/io/**.py
11285
scripts/**.py
11386
examples/**.py
114-
- stage: linter
115-
name: "Formatting Checks"
116-
python: "3.9"
117-
before_install:
118-
- travis_retry pip install -r requirements-lint.txt
119-
script:
120-
- black --check --verbose .
12187
- stage: deploy
12288
name: "PyPi Deployment"
12389
python: "3.9"

0 commit comments

Comments
 (0)