Skip to content

Commit 37bef40

Browse files
authored
Merge branch 'master' into update-copyright
2 parents 9963acc + a487615 commit 37bef40

File tree

6 files changed

+457
-88
lines changed

6 files changed

+457
-88
lines changed

.github/workflows/ci.yml

Lines changed: 45 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,44 +9,65 @@ on:
99
pull_request:
1010
branches:
1111
- "*"
12+
schedule:
13+
# Daily at 05:47
14+
- cron: '47 5 * * *'
1215

1316
jobs:
1417
test:
1518
name: ${{ matrix.os.name }} ${{ matrix.python.name }} ${{ matrix.reactor.name }}
1619
runs-on: ${{ matrix.os.runs-on }}
20+
container: ${{ matrix.os.container[matrix.python.docker] }}
1721
strategy:
1822
fail-fast: false
1923
matrix:
2024
os:
2125
- name: Linux
2226
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
2334
- name: Windows
2435
runs-on: windows-latest
36+
python_platform: win32
2537
- name: macOS
2638
runs-on: macos-latest
39+
python_platform: darwin
2740
python:
2841
- name: CPython 2.7
2942
tox: py27
3043
action: 2.7
44+
docker: 2.7
3145
- name: CPython 3.5
3246
tox: py35
3347
action: 3.5
48+
docker: 3.5
3449
- name: CPython 3.6
3550
tox: py36
3651
action: 3.6
52+
docker: 3.6
3753
- name: CPython 3.7
3854
tox: py37
3955
action: 3.7
56+
docker: 3.7
4057
- name: CPython 3.8
4158
tox: py38
4259
action: 3.8
60+
docker: 3.8
4361
reactor:
4462
- name: default
4563
tox: default
64+
dependencies: default
4665
- name: Qt5
4766
tox: qt5
67+
dependencies: qt5
4868
- name: asyncio
4969
tox: asyncio
70+
dependencies: asyncio
5071
exclude:
5172
- python:
5273
tox: py27
@@ -59,10 +80,32 @@ jobs:
5980
steps:
6081
- uses: actions/checkout@v2
6182
- name: Set up ${{ matrix.python.name }}
62-
uses: actions/setup-python@v1
83+
if: ${{ job.container == '' }}
84+
uses: actions/setup-python@v2
6385
with:
6486
python-version: ${{ matrix.python.action }}
6587
architecture: x64
88+
- name: Report Python information
89+
shell: bash
90+
run: |
91+
python -c 'import sys; print(sys.version)'
92+
echo
93+
echo " <=======>"
94+
echo
95+
pip --version
96+
echo
97+
echo " <=======>"
98+
echo
99+
pip list --no-python-version-warning
100+
echo
101+
echo " <=======>"
102+
echo
103+
pip freeze --all --no-python-version-warning
104+
- name: Install Linux Qt5 dependencies
105+
if: matrix.os.python_platform == 'linux' && matrix.reactor.dependencies == 'qt5'
106+
run: |
107+
apt-get update --yes
108+
apt-get install --yes libgl1
66109
- name: Install
67110
run: |
68111
pip install tox
@@ -80,7 +123,7 @@ jobs:
80123
steps:
81124
- uses: actions/checkout@v2
82125
- name: Set up Python ${{ matrix.python.dotted }}
83-
uses: actions/setup-python@v1
126+
uses: actions/setup-python@v2
84127
with:
85128
python-version: ${{ matrix.python.dotted }}
86129
architecture: x64

README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ async/await fixtures
162162
====================
163163
``async``/``await`` fixtures can be used along with ``yield`` for normal
164164
pytest fixture semantics of setup, value, and teardown. At present only
165-
function scope is supported.
165+
function and module scope are supported.
166166

167167
Note: You must *call* ``pytest_twisted.async_fixture()`` and
168168
``pytest_twisted.async_yield_fixture()``.

0 commit comments

Comments
 (0)