Skip to content

Commit 920b0e3

Browse files
authored
Merge pull request #70 from CabbageDevelopment/dev
Remove travis/appveyor in favor of workflows. Add windows-latest target.
2 parents 88b64c7 + 34744ea commit 920b0e3

File tree

6 files changed

+21
-165
lines changed

6 files changed

+21
-165
lines changed

.github/workflows/test.yml

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
1-
name: test
1+
name: Run Tests
22

33
on: [push]
44

55
jobs:
66
ci:
7-
name: Python-${{ matrix.python }} ${{ matrix.qt.qt_api }}
8-
runs-on: ubuntu-latest
7+
name: Python-${{ matrix.python }} ${{ matrix.os }} ${{ matrix.qt.qt_api }}
8+
runs-on: ${{ matrix.os }}
99
strategy:
1010
fail-fast: false
1111
matrix:
12+
os: [ubuntu-latest, windows-latest]
13+
python: ["3.6", "3.7", "3.8", "3.9"]
1214
qt:
1315
- package: PyQt5
1416
qt_api: "pyqt5"
@@ -18,30 +20,37 @@ jobs:
1820
qt_api: "pyside2"
1921
- package: PySide6
2022
qt_api: "pyside6"
21-
python: [3.6, 3.7, 3.8, 3.9]
23+
# exclude:
24+
# - {os: windows-latest, qt: {package: PySide2}}
2225

2326
steps:
2427
- name: Checkout
25-
uses: actions/checkout@v1
28+
uses: actions/checkout@v3
29+
2630
- name: Set up Python
27-
uses: actions/setup-python@v2
31+
uses: actions/setup-python@v4
2832
with:
2933
python-version: ${{ matrix.python }}
3034
architecture: x64
35+
3136
- name: Install pipenv
3237
run: |
3338
python -m pip install --upgrade pipenv wheel
39+
3440
- name: Install dependencies
3541
run: |
36-
pipenv install --dev
37-
pipenv run pip install ${{ matrix.qt.package }} pytest
42+
pipenv install --python ${{ matrix.python }} --dev
43+
pipenv run --python ${{ matrix.python }} pip install ${{ matrix.qt.package }} pytest
44+
3845
- name: Install Libxcb dependencies
46+
if: matrix.os == 'ubuntu-latest'
3947
run: |
4048
sudo apt-get update
4149
sudo apt-get install '^libxcb.*-dev' libx11-xcb-dev libglu1-mesa-dev libxrender-dev libxi-dev libxkbcommon-dev libxkbcommon-x11-dev
50+
4251
- name: Run headless test
43-
uses: GabrielBB/xvfb-action@v1
52+
uses: GabrielBB/xvfb-action@v1.6
4453
env:
4554
QT_API: ${{ matrix.qt.qt_api }}
4655
with:
47-
run: pipenv run py.test --forked -v
56+
run: pipenv run --python ${{ matrix.python }} pytest -v

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
.idea/
22
.vscode/
3+
Pipfile.lock
34

45
# Created by https://www.gitignore.io/api/pycharm,python
56
# Edit at https://www.gitignore.io/?templates=pycharm,python

.travis.yml

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

Pipfile.lock

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

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# qasync
22

3-
[![Maintenance](https://img.shields.io/maintenance/yes/2021)](https://pypi.org/project/qasync)
3+
[![Maintenance](https://img.shields.io/maintenance/yes/2022)](https://pypi.org/project/qasync)
44
[![PyPI - Python Version](https://img.shields.io/pypi/pyversions/qasync)](https://pypi.org/project/qasync)
55
[![PyPI - License](https://img.shields.io/pypi/l/qasync)](/LICENSE)
66
[![PyPI](https://img.shields.io/pypi/v/qasync)](https://pypi.org/project/qasync)

appveyor.yml

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

0 commit comments

Comments
 (0)