Skip to content

Commit 365fc4f

Browse files
authored
Merge pull request #107 from altendky/also_test_pyside2
also test pyside2
2 parents ae01922 + f1acdc6 commit 365fc4f

File tree

4 files changed

+44
-23
lines changed

4 files changed

+44
-23
lines changed

.github/workflows/ci.yml

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,11 @@ jobs:
7272
- name: default
7373
tox: default
7474
dependencies: default
75-
- name: Qt5
76-
tox: qt5
75+
- name: PyQt5
76+
tox: pyqt5
77+
dependencies: qt5
78+
- name: PySide2
79+
tox: pyside2
7780
dependencies: qt5
7881
- name: asyncio
7982
tox: asyncio
@@ -82,7 +85,11 @@ jobs:
8285
- python:
8386
tox: py27
8487
reactor:
85-
tox: qt5
88+
tox: pyqt5
89+
- python:
90+
tox: py27
91+
reactor:
92+
tox: pyside2
8693
- python:
8794
tox: py27
8895
reactor:
@@ -94,11 +101,19 @@ jobs:
94101
- python:
95102
tox: pypy2
96103
reactor:
97-
tox: qt5
104+
tox: pyqt5
105+
- python:
106+
tox: pypy2
107+
reactor:
108+
tox: pyside2
109+
- python:
110+
tox: pypy3
111+
reactor:
112+
tox: pyqt5
98113
- python:
99114
tox: pypy3
100115
reactor:
101-
tox: qt5
116+
tox: pyside2
102117
steps:
103118
- uses: actions/checkout@v2
104119
- name: Enable Problem Matchers

appveyor.yml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
image: Visual Studio 2019
2+
13
environment:
24
VENV: "%APPVEYOR_BUILD_FOLDER%\\venv"
35

@@ -8,28 +10,28 @@ environment:
810
- TOXENV: py27-defaultreactor
911
PYTHON: "C:\\Python27-x64"
1012

11-
- TOXENV: py35-defaultreactor, py35-qt5reactor, py35-asyncioreactor
13+
- TOXENV: py35-defaultreactor, py35-pyqt5reactor, py35-pyside2reactor, py35-asyncioreactor
1214
PYTHON: "C:\\Python35"
1315

14-
- TOXENV: py35-defaultreactor, py35-qt5reactor, py35-asyncioreactor
16+
- TOXENV: py35-defaultreactor, py35-pyqt5reactor, py35-pyside2reactor, py35-asyncioreactor
1517
PYTHON: "C:\\Python35-x64"
1618

17-
- TOXENV: py36-defaultreactor, py36-qt5reactor, py36-asyncioreactor
19+
- TOXENV: py36-defaultreactor, py36-pyqt5reactor, py36-pyside2reactor, py36-asyncioreactor
1820
PYTHON: "C:\\Python36"
1921

20-
- TOXENV: py36-defaultreactor, py36-qt5reactor, py36-asyncioreactor
22+
- TOXENV: py36-defaultreactor, py36-pyqt5reactor, py36-pyside2reactor, py36-asyncioreactor
2123
PYTHON: "C:\\Python36-x64"
2224

23-
- TOXENV: py37-defaultreactor, py37-qt5reactor, py37-asyncioreactor
25+
- TOXENV: py37-defaultreactor, py37-pyqt5reactor, py37-pyside2reactor, py37-asyncioreactor
2426
PYTHON: "C:\\Python37"
2527

26-
- TOXENV: py37-defaultreactor, py37-qt5reactor, py37-asyncioreactor
28+
- TOXENV: py37-defaultreactor, py37-pyqt5reactor, py37-pyside2reactor, py37-asyncioreactor
2729
PYTHON: "C:\\Python37-x64"
2830

29-
- TOXENV: py38-defaultreactor, py38-qt5reactor, py38-asyncioreactor
31+
- TOXENV: py38-defaultreactor, py38-pyqt5reactor, py38-pyside2reactor, py38-asyncioreactor
3032
PYTHON: "C:\\Python38"
3133

32-
- TOXENV: py38-defaultreactor, py38-qt5reactor, py38-asyncioreactor
34+
- TOXENV: py38-defaultreactor, py38-pyqt5reactor, py38-pyside2reactor, py38-asyncioreactor
3335
PYTHON: "C:\\Python38-x64"
3436

3537
install:

setup.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,11 @@
1717
install_requires=["greenlet", "pytest>=2.3", "decorator"],
1818
extras_require={
1919
"dev": ["pre-commit", "black"],
20-
"pyside2": ["pyside2", "qt5reactor"],
21-
"pyqt5": ["pyqt5", "qt5reactor>=0.6.2"],
20+
"pyside2": [
21+
# >= 0.6.3 for PySide2 extra version constraints
22+
"qt5reactor[pyside2]>=0.6.3",
23+
],
24+
"pyqt5": ["qt5reactor[pyqt5]>=0.6.2"],
2225
},
2326
classifiers=[
2427
"Development Status :: 5 - Production/Stable",

tox.ini

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,25 @@
22
envlist=
33
py{27,py2,35,36,37,38,py3}-defaultreactor
44
py{35,36,37,38,py3}-asyncioreactor
5-
py{35,36,37,38}-qt5reactor
5+
py{35,36,37,38}-pyqt5reactor
6+
py{35,36,37,38}-pyside2reactor
67
linting
78

89
[testenv]
910
deps=
1011
greenlet
1112
pytest
1213
twisted
13-
qt5reactor: pytest-qt
14-
qt5reactor: qt5reactor
15-
qt5reactor: pytest-xvfb
16-
qt5reactor: pyqt5
17-
qt5reactor: pywin32; sys_platform == 'win32'
14+
pyqt5reactor,pyside2reactor: pytest-qt
15+
pyqt5reactor,pyside2reactor: pytest-xvfb
16+
pyqt5reactor,pyside2reactor: pywin32; sys_platform == 'win32'
1817
extras=
19-
qt5reactor: pyqt5
18+
pyqt5reactor: pyqt5
19+
pyside2reactor: pyside2
2020
setenv=
2121
defaultreactor: REACTOR = default
22-
qt5reactor: REACTOR = qt5reactor
22+
pyqt5reactor: REACTOR = qt5reactor
23+
pyside2reactor: REACTOR = qt5reactor
2324
asyncioreactor: REACTOR = asyncio
2425
commands=
2526
pytest --reactor={env:REACTOR}

0 commit comments

Comments
 (0)