diff --git a/.github/workflows/test_and_deploy.yml b/.github/workflows/test_and_deploy.yml index 8b499f7..afc8d4f 100644 --- a/.github/workflows/test_and_deploy.yml +++ b/.github/workflows/test_and_deploy.yml @@ -23,12 +23,14 @@ jobs: matrix: platform: [ubuntu-latest, windows-latest, macos-latest] python-version: [3.7, 3.8, 3.9] - backend: [pyqt, pyside] + backend: [pyqt5, pyside2] include: - python: 3.9 platform: macos-11.0 + backend: pyside2 - python: 3.6 platform: ubuntu-16.04 + backend: pyqt5 steps: - uses: actions/checkout@v2 @@ -43,6 +45,7 @@ jobs: sudo apt-get install -y libdbus-1-3 libxkbcommon-x11-0 libxcb-icccm4 \ libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 \ libxcb-xinerama0 libxcb-xfixes0 + # libxcb-xinput0 - name: Install dependencies run: | diff --git a/setup.cfg b/setup.cfg index 1671f72..2bca758 100644 --- a/setup.cfg +++ b/setup.cfg @@ -39,6 +39,8 @@ setup_requires = setuptools_scm [options.extras_require] pyside2 = pyside2 pyqt5 = pyqt5 +pyside6 = pyside6 +pyqt6 = pyqt6 testing = tox tox-conda diff --git a/tox.ini b/tox.ini index 82d2aae..e040e40 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ # For more information about tox, see https://tox.readthedocs.io/en/latest/ [tox] -envlist = py{37,38,39}-{linux,macos,windows}-{pyqt,pyside} +envlist = py{37,38,39}-{linux,macos,windows}-{pyqt5,pyside2} toxworkdir=/tmp/.tox [gh-actions] @@ -20,8 +20,8 @@ PLATFORM = macos-latest: macos macos-11.0: macos BACKEND = - pyqt: pyqt - pyside: pyside + pyqt5: pyqt5 + pyside2: pyside2 [testenv] platform = @@ -33,6 +33,6 @@ deps = pytest-xvfb ; sys_platform == 'linux' extras = testing - pyqt: pyqt5 - pyside: pyside2 + pyqt5: pyqt5 + pyside2: pyside2 commands = pytest -v --color=yes --cov=pyqrangeslider --cov-report=xml