Skip to content

Commit b2bf8c6

Browse files
committed
Merge branch 'master' into pypy
2 parents c6fa7d4 + 2f45e79 commit b2bf8c6

File tree

2 files changed

+24
-0
lines changed

2 files changed

+24
-0
lines changed

.github/workflows/ci.yml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,32 +17,47 @@ jobs:
1717
test:
1818
name: ${{ matrix.os.name }} ${{ matrix.python.name }} ${{ matrix.reactor.name }}
1919
runs-on: ${{ matrix.os.runs-on }}
20+
container: ${{ matrix.os.container[matrix.python.docker] }}
2021
strategy:
2122
fail-fast: false
2223
matrix:
2324
os:
2425
- name: Linux
2526
runs-on: ubuntu-latest
27+
python_platform: linux
28+
container:
29+
2.7: docker://python:2.7-buster
30+
3.5: docker://python:3.5-buster
31+
3.6: docker://python:3.6-buster
32+
3.7: docker://python:3.7-buster
33+
3.8: docker://python:3.8-buster
2634
- name: Windows
2735
runs-on: windows-latest
36+
python_platform: win32
2837
- name: macOS
2938
runs-on: macos-latest
39+
python_platform: darwin
3040
python:
3141
- name: CPython 2.7
3242
tox: py27
3343
action: 2.7
44+
docker: 2.7
3445
- name: CPython 3.5
3546
tox: py35
3647
action: 3.5
48+
docker: 3.5
3749
- name: CPython 3.6
3850
tox: py36
3951
action: 3.6
52+
docker: 3.6
4053
- name: CPython 3.7
4154
tox: py37
4255
action: 3.7
56+
docker: 3.7
4357
- name: CPython 3.8
4458
tox: py38
4559
action: 3.8
60+
docker: 3.8
4661
- name: PyPy 2
4762
tox: pypy2
4863
action: pypy2
@@ -52,10 +67,13 @@ jobs:
5267
reactor:
5368
- name: default
5469
tox: default
70+
dependencies: default
5571
- name: Qt5
5672
tox: qt5
73+
dependencies: qt5
5774
- name: asyncio
5875
tox: asyncio
76+
dependencies: asyncio
5977
exclude:
6078
- python:
6179
tox: py27
@@ -84,6 +102,11 @@ jobs:
84102
with:
85103
python-version: ${{ matrix.python.action }}
86104
architecture: x64
105+
- name: Install Linux Qt5 dependencies
106+
if: matrix.os.python_platform == 'linux' && matrix.reactor.dependencies == 'qt5'
107+
run: |
108+
apt-get update --yes
109+
apt-get install --yes libgl1
87110
- name: Install
88111
run: |
89112
pip install tox

setup.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
author_email="[email protected]",
1414
url="https://github.com/pytest-dev/pytest-twisted",
1515
py_modules=["pytest_twisted"],
16+
python_requires='>=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*',
1617
install_requires=["greenlet", "pytest>=2.3", "decorator"],
1718
extras_require={"dev": ["pre-commit", "black"]},
1819
classifiers=[

0 commit comments

Comments
 (0)