Skip to content

Commit a75072a

Browse files
committed
Merge branch 'master' into stubtest
2 parents ff4c4e3 + de88ed8 commit a75072a

File tree

3 files changed

+81
-27
lines changed

3 files changed

+81
-27
lines changed

.github/workflows/ci.yml

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
name: CI
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
tags:
8+
- v*
9+
pull_request:
10+
branches:
11+
- "*"
12+
schedule:
13+
# Daily at 06:14. This is just an arbitrary time to stagger
14+
# relative to other daily builds in any given organization.
15+
- cron: '14 6 * * *'
16+
17+
jobs:
18+
test:
19+
name: ${{ matrix.os.name }} ${{ matrix.python.name }}
20+
runs-on: ${{ matrix.os.runs-on }}
21+
strategy:
22+
fail-fast: false
23+
matrix:
24+
os:
25+
- name: Linux
26+
runs-on: ubuntu-latest
27+
matrix: linux
28+
- name: Windows
29+
runs-on: windows-latest
30+
matrix: windows
31+
- name: macOS
32+
runs-on: macos-latest
33+
matrix: macos
34+
python:
35+
- name: CPython 3.5
36+
tox: py35
37+
action: 3.5
38+
- name: CPython 3.6
39+
tox: py36
40+
action: 3.6
41+
- name: CPython 3.7
42+
tox: py37
43+
action: 3.7
44+
- name: CPython 3.8
45+
tox: py38
46+
action: 3.8
47+
- name: CPython 3.9
48+
tox: py39
49+
action: 3.9
50+
steps:
51+
- uses: actions/checkout@v2
52+
- name: Set up ${{ matrix.python.name }}
53+
uses: actions/setup-python@v2
54+
with:
55+
python-version: '${{ matrix.python.action }}.0-alpha - ${{ matrix.python.action }}.X'
56+
architecture: x64
57+
- uses: twisted/python-info-action@v1.0.1
58+
- name: Install Linux Qt5 dependencies
59+
if: matrix.os.matrix == 'linux'
60+
run: |
61+
sudo apt-get update --yes
62+
sudo apt-get install --yes libgl1
63+
- name: Install
64+
run: |
65+
pip install --upgrade pip setuptools wheel
66+
pip install tox
67+
- name: Test
68+
run: |
69+
tox -v -e ${{ matrix.python.tox }}
70+
71+
all:
72+
name: All
73+
runs-on: ubuntu-latest
74+
needs:
75+
- test
76+
steps:
77+
- name: This
78+
shell: python
79+
run: |
80+
import this

.travis.yml

Lines changed: 0 additions & 26 deletions
This file was deleted.

tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ commands =
1313
pytest {posargs}
1414

1515
[pytest]
16-
addopts = --strict
16+
addopts = --strict-markers
1717
testpaths = tests
1818
xfail_strict = true

0 commit comments

Comments
 (0)