Skip to content

Commit 2d488f7

Browse files
blueyedblueyed
authored
Merge pull request #6432 from blueyed/merge-master-into-features
Merge master into features
2 parents 1e28cb8 + 1356d20 commit 2d488f7

38 files changed

+512
-87
lines changed

‎.github/workflows/main.yml

Lines changed: 123 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,123 @@
1+
# evaluating GitHub actions for CI, disconsider failures when evaluating PRs
2+
#
3+
# this is still missing:
4+
# - deploy
5+
# - coverage
6+
# - upload github notes
7+
#
8+
name: main
9+
10+
on:
11+
push:
12+
branches:
13+
- master
14+
pull_request:
15+
branches:
16+
- master
17+
18+
jobs:
19+
build:
20+
21+
runs-on: ${{ matrix.os }}
22+
23+
strategy:
24+
fail-fast: false
25+
matrix:
26+
name: [
27+
"windows-py35",
28+
"windows-py36",
29+
"windows-py37",
30+
"windows-py37-pluggy",
31+
"windows-py38",
32+
33+
"ubuntu-py35",
34+
"ubuntu-py36",
35+
"ubuntu-py37",
36+
"ubuntu-py37-pluggy",
37+
"ubuntu-py37-freeze",
38+
"ubuntu-py38",
39+
"ubuntu-pypy3",
40+
41+
"macos-py37",
42+
"macos-py38",
43+
44+
"linting",
45+
]
46+
47+
include:
48+
- name: "windows-py35"
49+
python: "3.5"
50+
os: windows-latest
51+
tox_env: "py35-xdist"
52+
- name: "windows-py36"
53+
python: "3.6"
54+
os: windows-latest
55+
tox_env: "py36-xdist"
56+
- name: "windows-py37"
57+
python: "3.7"
58+
os: windows-latest
59+
tox_env: "py37-twisted-numpy"
60+
- name: "windows-py37-pluggy"
61+
python: "3.7"
62+
os: windows-latest
63+
tox_env: "py37-pluggymaster-xdist"
64+
- name: "windows-py38"
65+
python: "3.8"
66+
os: windows-latest
67+
tox_env: "py38"
68+
69+
- name: "ubuntu-py35"
70+
python: "3.5"
71+
os: ubuntu-latest
72+
tox_env: "py35-xdist"
73+
- name: "ubuntu-py36"
74+
python: "3.6"
75+
os: ubuntu-latest
76+
tox_env: "py36-xdist"
77+
- name: "ubuntu-py37"
78+
python: "3.7"
79+
os: ubuntu-latest
80+
tox_env: "py37-lsof-numpy-oldattrs-pexpect-twisted"
81+
- name: "ubuntu-py37-pluggy"
82+
python: "3.7"
83+
os: ubuntu-latest
84+
tox_env: "py37-pluggymaster-xdist"
85+
- name: "ubuntu-py37-freeze"
86+
python: "3.7"
87+
os: ubuntu-latest
88+
tox_env: "py37-freeze"
89+
- name: "ubuntu-py38"
90+
python: "3.8"
91+
os: ubuntu-latest
92+
tox_env: "py38-xdist"
93+
- name: "ubuntu-pypy3"
94+
python: "pypy3"
95+
os: ubuntu-latest
96+
tox_env: "pypy3-xdist"
97+
98+
- name: "macos-py37"
99+
python: "3.7"
100+
os: macos-latest
101+
tox_env: "py37-xdist"
102+
- name: "macos-py38"
103+
python: "3.8"
104+
os: macos-latest
105+
tox_env: "py38-xdist"
106+
107+
- name: "linting"
108+
python: "3.7"
109+
os: ubuntu-latest
110+
tox_env: "linting,docs,doctesting"
111+
112+
steps:
113+
- uses: actions/checkout@v1
114+
- name: Set up Python ${{ matrix.python }}
115+
uses: actions/setup-python@v1
116+
with:
117+
python-version: ${{ matrix.python }}
118+
- name: Install dependencies
119+
run: |
120+
python -m pip install --upgrade pip
121+
pip install tox
122+
- name: Test
123+
run: tox -e ${{ matrix.tox_env }}

‎.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ repos:
88
rev: v1.0.0
99
hooks:
1010
- id: blacken-docs
11-
additional_dependencies: [black==19.3b0]
11+
additional_dependencies: [black==19.10b0]
1212
- repo: https://github.com/pre-commit/pre-commit-hooks
1313
rev: v2.2.3
1414
hooks:

‎.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,9 @@ jobs:
8080
addons:
8181
apt:
8282
packages:
83-
# required by publish_gh_release_notes
83+
# required by publish-gh-release-notes
8484
- pandoc
85-
after_deploy: tox -e publish_gh_release_notes
85+
after_deploy: tox -e publish-gh-release-notes
8686
deploy:
8787
provider: pypi
8888
user: nicoddemus

‎AUTHORS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,7 @@ Samuele Pedroni
238238
Sankt Petersbug
239239
Segev Finer
240240
Serhii Mozghovyi
241+
Seth Junot
241242
Simon Gomizelj
242243
Skylar Downes
243244
Srinivas Reddy Thatiparthy

‎CONTRIBUTING.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@ Fix bugs
5151

5252
Look through the `GitHub issues for bugs <https://github.com/pytest-dev/pytest/labels/type:%20bug>`_.
5353

54-
:ref:`Talk <contact>` to developers to find out how you can fix specific bugs.
54+
:ref:`Talk <contact>` to developers to find out how you can fix specific bugs. To indicate that you are going
55+
to work on a particular issue, add a comment to that effect on the specific issue.
5556

5657
Don't forget to check the issue trackers of your favourite plugins, too!
5758

‎LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2004-2019 Holger Krekel and others
3+
Copyright (c) 2004-2020 Holger Krekel and others
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy of
66
this software and associated documentation files (the "Software"), to deal in

‎README.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,12 +112,12 @@ Support pytest
112112
--------------
113113

114114
`Open Collective`_ is an online funding platform for open and transparent communities.
115-
It provide tools to raise money and share your finances in full transparency.
115+
It provides tools to raise money and share your finances in full transparency.
116116

117117
It is the platform of choice for individuals and companies that want to make one-time or
118118
monthly donations directly to the project.
119119

120-
See more datails in the `pytest collective`_.
120+
See more details in the `pytest collective`_.
121121

122122
.. _Open Collective: https://opencollective.com
123123
.. _pytest collective: https://opencollective.com/pytest
@@ -145,7 +145,7 @@ Tidelift will coordinate the fix and disclosure.
145145
License
146146
-------
147147

148-
Copyright Holger Krekel and others, 2004-2019.
148+
Copyright Holger Krekel and others, 2004-2020.
149149

150150
Distributed under the terms of the `MIT`_ license, pytest is free and open source software.
151151

‎azure-pipelines.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,9 @@ jobs:
3939
py37-pluggymaster-xdist:
4040
python.version: '3.7'
4141
tox.env: 'py37-pluggymaster-xdist'
42+
py38-xdist:
43+
python.version: '3.8'
44+
tox.env: 'py38-xdist'
4245
maxParallel: 10
4346

4447
steps:

‎changelog/5971.bugfix.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Fix a ``pytest-xdist`` crash when dealing with exceptions raised in subprocesses created by the
2+
``multiprocessing`` module.

‎changelog/6350.trivial.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Optimized automatic renaming of test parameter IDs.

‎changelog/6532.bugfix.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fix parsing of outcomes containing multiple errors with ``testdir`` results (regression in 5.3.0).

‎doc/en/announce/index.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ Release announcements
2020
release-5.1.0
2121
release-5.0.1
2222
release-5.0.0
23+
release-4.6.9
24+
release-4.6.8
25+
release-4.6.7
26+
release-4.6.6
2327
release-4.6.5
2428
release-4.6.4
2529
release-4.6.3

‎doc/en/announce/release-2.3.0.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ pytest-2.3: improved fixtures / better unittest integration
33

44
pytest-2.3 comes with many major improvements for fixture/funcarg management
55
and parametrized testing in Python. It is now easier, more efficient and
6-
more predicatable to re-run the same tests with different fixture
6+
more predictable to re-run the same tests with different fixture
77
instances. Also, you can directly declare the caching "scope" of
88
fixtures so that dependent tests throughout your whole test suite can
99
re-use database or other expensive fixture objects with ease. Lastly,
1010
it's possible for fixture functions (formerly known as funcarg
1111
factories) to use other fixtures, allowing for a completely modular and
12-
re-useable fixture design.
12+
re-usable fixture design.
1313

1414
For detailed info and tutorial-style examples, see:
1515

‎doc/en/announce/release-2.5.0.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ holger krekel
9191
it might be the cause for other finalizers to fail.
9292

9393
- fix ordering when mock.patch or other standard decorator-wrappings
94-
are used with test methods. This fixues issue346 and should
94+
are used with test methods. This fixes issue346 and should
9595
help with random "xdist" collection failures. Thanks to
9696
Ronny Pfannschmidt and Donald Stufft for helping to isolate it.
9797

‎doc/en/announce/release-2.7.0.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ holger krekel
3535
- fix issue435: make reload() work when assert rewriting is active.
3636
Thanks Daniel Hahler.
3737

38-
- fix issue616: conftest.py files and their contained fixutres are now
38+
- fix issue616: conftest.py files and their contained fixtures are now
3939
properly considered for visibility, independently from the exact
4040
current working directory and test arguments that are used.
4141
Many thanks to Eric Siegerman and his PR235 which contains

‎doc/en/announce/release-4.6.6.rst

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
pytest-4.6.6
2+
=======================================
3+
4+
pytest 4.6.6 has just been released to PyPI.
5+
6+
This is a bug-fix release, being a drop-in replacement. To upgrade::
7+
8+
pip install --upgrade pytest
9+
10+
The full changelog is available at https://docs.pytest.org/en/latest/changelog.html.
11+
12+
Thanks to all who contributed to this release, among them:
13+
14+
* Anthony Sottile
15+
* Bruno Oliveira
16+
* Michael Goerz
17+
18+
19+
Happy testing,
20+
The pytest Development Team

‎doc/en/announce/release-4.6.7.rst

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
pytest-4.6.7
2+
=======================================
3+
4+
pytest 4.6.7 has just been released to PyPI.
5+
6+
This is a bug-fix release, being a drop-in replacement. To upgrade::
7+
8+
pip install --upgrade pytest
9+
10+
The full changelog is available at https://docs.pytest.org/en/latest/changelog.html.
11+
12+
Thanks to all who contributed to this release, among them:
13+
14+
* Bruno Oliveira
15+
* Daniel Hahler
16+
17+
18+
Happy testing,
19+
The pytest Development Team

‎doc/en/announce/release-4.6.8.rst

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
pytest-4.6.8
2+
=======================================
3+
4+
pytest 4.6.8 has just been released to PyPI.
5+
6+
This is a bug-fix release, being a drop-in replacement. To upgrade::
7+
8+
pip install --upgrade pytest
9+
10+
The full changelog is available at https://docs.pytest.org/en/latest/changelog.html.
11+
12+
Thanks to all who contributed to this release, among them:
13+
14+
* Anthony Sottile
15+
* Bruno Oliveira
16+
* Ryan Mast
17+
18+
19+
Happy testing,
20+
The pytest Development Team

‎doc/en/announce/release-4.6.9.rst

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
pytest-4.6.9
2+
=======================================
3+
4+
pytest 4.6.9 has just been released to PyPI.
5+
6+
This is a bug-fix release, being a drop-in replacement. To upgrade::
7+
8+
pip install --upgrade pytest
9+
10+
The full changelog is available at https://docs.pytest.org/en/latest/changelog.html.
11+
12+
Thanks to all who contributed to this release, among them:
13+
14+
* Anthony Sottile
15+
* Bruno Oliveira
16+
* Felix Yan
17+
* Hugo
18+
19+
20+
Happy testing,
21+
The pytest Development Team

0 commit comments

Comments
 (0)