Skip to content

Commit 860ab9e

Browse files
authored
Merge pull request #124 from altendky/py3.9
Add Python 3.9 to CI
2 parents d851f56 + eb397b8 commit 860ab9e

File tree

2 files changed

+30
-7
lines changed

2 files changed

+30
-7
lines changed

.github/workflows/ci.yml

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ jobs:
3434
3.6: docker://python:3.6-buster
3535
3.7: docker://python:3.7-buster
3636
3.8: docker://python:3.8-buster
37+
3.9: docker://python:3.9-rc-buster
3738
pypy2: docker://pypy:2-jessie
3839
pypy3: docker://pypy:3-stretch
3940
- name: Windows
@@ -47,30 +48,42 @@ jobs:
4748
tox: py27
4849
action: 2.7
4950
docker: 2.7
51+
implementation: cpython
5052
- name: CPython 3.5
5153
tox: py35
5254
action: 3.5
5355
docker: 3.5
56+
implementation: cpython
5457
- name: CPython 3.6
5558
tox: py36
5659
action: 3.6
5760
docker: 3.6
61+
implementation: cpython
5862
- name: CPython 3.7
5963
tox: py37
6064
action: 3.7
6165
docker: 3.7
66+
implementation: cpython
6267
- name: CPython 3.8
6368
tox: py38
6469
action: 3.8
6570
docker: 3.8
71+
implementation: cpython
72+
- name: CPython 3.9
73+
tox: py39
74+
action: 3.9
75+
docker: 3.9
76+
implementation: cpython
6677
- name: PyPy 2
6778
tox: pypy2
6879
action: pypy2
6980
docker: pypy2
81+
implementation: pypy
7082
- name: PyPy 3
7183
tox: pypy3
7284
action: pypy3
7385
docker: pypy3
86+
implementation: pypy
7487
reactor:
7588
- name: default
7689
tox: default
@@ -117,16 +130,26 @@ jobs:
117130
tox: pypy3
118131
reactor:
119132
tox: pyside2
133+
- python:
134+
tox: py39
135+
os:
136+
python_platform: win32
120137
steps:
121138
- uses: actions/checkout@v2
122139
- name: Enable Problem Matchers
123140
run: |
124141
echo "::add-matcher::.github/local-problem-matchers.json"
125-
- name: Set up ${{ matrix.python.name }}
126-
if: ${{ job.container == '' }}
142+
- name: Set up ${{ matrix.python.name }} (if CPython)
143+
if: ${{ job.container == '' && matrix.python.implementation == 'cpython'}}
144+
uses: actions/setup-python@v2
145+
with:
146+
python-version: '${{ matrix.python.action }}.0-alpha - ${{ matrix.python.action }}.X'
147+
architecture: x64
148+
- name: Set up ${{ matrix.python.name }} (if PyPy)
149+
if: ${{ job.container == '' && matrix.python.implementation == 'pypy'}}
127150
uses: actions/setup-python@v2
128151
with:
129-
python-version: ${{ matrix.python.action }}
152+
python-version: '${{ matrix.python.action }}'
130153
architecture: x64
131154
- name: Report Python information
132155
shell: bash

tox.ini

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
[tox]
22
envlist=
3-
py{27,py2,35,36,37,38,py3}-defaultreactor
4-
py{35,36,37,38,py3}-asyncioreactor
5-
py{35,36,37,38}-pyqt5reactor
6-
py{35,36,37,38}-pyside2reactor
3+
py{27,py2,35,36,37,38,39,py3}-defaultreactor
4+
py{35,36,37,38,39,py3}-asyncioreactor
5+
py{35,36,37,38,39}-pyqt5reactor
6+
py{35,36,37,38,39}-pyside2reactor
77
linting
88

99
[testenv]

0 commit comments

Comments
 (0)