Branch: refs/heads/features
Home: https://github.com/pytest-dev/pytest
Commit: 0f5fb7ed05c7911bbfe1583491f735c205453c34
https://github.com/pytest-dev/pytest/commit/0f5fb7ed05c7911bbfe1583491f735c205453c34
Author: Daniel Hahler <g...@thequod.de>
Date: 2017-11-29 (Wed, 29 Nov 2017)
Changed paths:
M _pytest/terminal.py
Log Message:
-----------
Fix ZeroDivisionError with 0 collected tests
This can easily happen with pytest-testmon.
Commit: 6bbd7410397fc3ea95b48cf38a3d8070ebf80fb7
https://github.com/pytest-dev/pytest/commit/6bbd7410397fc3ea95b48cf38a3d8070ebf80fb7
Author: Bruno Oliveira <nicodde...@gmail.com>
Date: 2017-11-28 (Tue, 28 Nov 2017)
Changed paths:
A changelog/2971.bugfix
M testing/test_terminal.py
Log Message:
-----------
Add test for #2971
Commit: fdfc1946da9dff75747d734c26b3602edfec1226
https://github.com/pytest-dev/pytest/commit/fdfc1946da9dff75747d734c26b3602edfec1226
Author: Bruno Oliveira <nicodde...@gmail.com>
Date: 2017-11-29 (Wed, 29 Nov 2017)
Changed paths:
M CHANGELOG.rst
Log Message:
-----------
Add CHANGELOG entry about pytest.fixture "params" being now immutable
Fix #2959
Commit: 70f1e3b4b0cdcf428fdcf44b6bc62ad76e2a03b2
https://github.com/pytest-dev/pytest/commit/70f1e3b4b0cdcf428fdcf44b6bc62ad76e2a03b2
Author: Bruno Oliveira <nicodde...@gmail.com>
Date: 2017-11-30 (Thu, 30 Nov 2017)
Changed paths:
M _pytest/fixtures.py
Log Message:
-----------
Improve getscopeitem assertion message
Fix #2979
Commit: 4de433e280050a1e7d6f903170540fa25cbb8ddf
https://github.com/pytest-dev/pytest/commit/4de433e280050a1e7d6f903170540fa25cbb8ddf
Author: Ronny Pfannschmidt <opensou...@ronnypfannschmidt.de>
Date: 2017-11-30 (Thu, 30 Nov 2017)
Changed paths:
M _pytest/fixtures.py
Log Message:
-----------
Merge pull request #2983 from nicoddemus/improve-assert-2979
Improve getscopeitem assertion message
Commit: a9dd37f42954da679638e3fb28da086dab1d0fb5
https://github.com/pytest-dev/pytest/commit/a9dd37f42954da679638e3fb28da086dab1d0fb5
Author: Bruno Oliveira <nicodde...@gmail.com>
Date: 2017-11-30 (Thu, 30 Nov 2017)
Changed paths:
M CHANGELOG.rst
Log Message:
-----------
Merge pull request #2980 from nicoddemus/immutable-fix-parameters
Add CHANGELOG entry about pytest.fixture "params" being now immutable
Commit: cf0cac3b734dd47c8f6cbf3afa759231fbb76bc9
https://github.com/pytest-dev/pytest/commit/cf0cac3b734dd47c8f6cbf3afa759231fbb76bc9
Author: Bruno Oliveira <nicodde...@gmail.com>
Date: 2017-11-30 (Thu, 30 Nov 2017)
Changed paths:
M _pytest/terminal.py
A changelog/2984.bugfix
M testing/deprecated_test.py
Log Message:
-----------
Bring back TerminalReporter.writer as an alias to TerminalReporter._tw
Fix #2984
Commit: 369c711f140fc5fac051a8ea1749a18874de268f
https://github.com/pytest-dev/pytest/commit/369c711f140fc5fac051a8ea1749a18874de268f
Author: Bruno Oliveira <nicodde...@gmail.com>
Date: 2017-11-30 (Thu, 30 Nov 2017)
Changed paths:
M _pytest/terminal.py
A changelog/2971.bugfix
M testing/test_terminal.py
Log Message:
-----------
Merge pull request #2971 from blueyed/fix-ZeroDivisionError
Fix ZeroDivisionError with 0 collected tests
Commit: 2e8b0a83fe467a3a8365b6e661e44e54d3a00b03
https://github.com/pytest-dev/pytest/commit/2e8b0a83fe467a3a8365b6e661e44e54d3a00b03
Author: Ronny Pfannschmidt <opensou...@ronnypfannschmidt.de>
Date: 2017-12-01 (Fri, 01 Dec 2017)
Changed paths:
M _pytest/terminal.py
A changelog/2984.bugfix
M testing/deprecated_test.py
Log Message:
-----------
Merge pull request #2989 from nicoddemus/bring-tr-writer-back-2984
Bring back TerminalReporter.writer as an alias to TerminalReporter._tw
Commit: ce30896cd20953f4eca1f2acac904c3f7a8e0c78
https://github.com/pytest-dev/pytest/commit/ce30896cd20953f4eca1f2acac904c3f7a8e0c78
Author: Florian Bruhin <g...@the-compiler.org>
Date: 2017-12-05 (Tue, 05 Dec 2017)
Changed paths:
M _pytest/config.py
A changelog/3004.bugfix
M testing/deprecated_test.py
Log Message:
-----------
Also blacklist pytest-capturelog plugin
This is the older plugin before pytest-catchlog was around. Apparently there are
people still using it.
Fixes #3004
Commit: cbdab02d050bb4f9780802e9e7b905008a8209c1
https://github.com/pytest-dev/pytest/commit/cbdab02d050bb4f9780802e9e7b905008a8209c1
Author: Florian Bruhin <g...@the-compiler.org>
Date: 2017-12-05 (Tue, 05 Dec 2017)
Changed paths:
M .github/PULL_REQUEST_TEMPLATE.md
Log Message:
-----------
Fix example in PR template
Commit: 9bd8420a6bd89695630e8eb8a49d00e1f7f396b2
https://github.com/pytest-dev/pytest/commit/9bd8420a6bd89695630e8eb8a49d00e1f7f396b2
Author: Bruno Oliveira <nicodde...@gmail.com>
Date: 2017-12-05 (Tue, 05 Dec 2017)
Changed paths:
M _pytest/config.py
A changelog/3004.bugfix
M testing/deprecated_test.py
Log Message:
-----------
Merge pull request #3005 from The-Compiler/blacklist-catchlog
Also blacklist pytest-capturelog plugin
Commit: 5c6758fde43a21d6e109e9c8884b045266deb7ef
https://github.com/pytest-dev/pytest/commit/5c6758fde43a21d6e109e9c8884b045266deb7ef
Author: Bruno Oliveira <nicodde...@gmail.com>
Date: 2017-12-05 (Tue, 05 Dec 2017)
Changed paths:
M .github/PULL_REQUEST_TEMPLATE.md
Log Message:
-----------
Merge pull request #3006 from The-Compiler/template-fix
Fix example in PR template
Commit: 2a111ff700f295d9b27fb1a43219e08df62fc0bd
https://github.com/pytest-dev/pytest/commit/2a111ff700f295d9b27fb1a43219e08df62fc0bd
Author: Bruno Oliveira <nicodde...@gmail.com>
Date: 2017-12-05 (Tue, 05 Dec 2017)
Changed paths:
M CHANGELOG.rst
R changelog/2920.bugfix
R changelog/2949.trivial
R changelog/2956.bugfix
R changelog/2957.bugfix
R changelog/2963.doc
R changelog/2971.bugfix
R changelog/2984.bugfix
R changelog/3004.bugfix
M doc/en/announce/index.rst
A doc/en/announce/release-3.3.1.rst
Log Message:
-----------
Preparing release version 3.3.1
Commit: ed2bb9d7231de1d845a7e60f9d21374fca3b2d93
https://github.com/pytest-dev/pytest/commit/ed2bb9d7231de1d845a7e60f9d21374fca3b2d93
Author: Bruno Oliveira <nicodde...@gmail.com>
Date: 2017-12-05 (Tue, 05 Dec 2017)
Changed paths:
M CHANGELOG.rst
R changelog/2920.bugfix
R changelog/2949.trivial
R changelog/2956.bugfix
R changelog/2957.bugfix
R changelog/2963.doc
R changelog/2971.bugfix
R changelog/2984.bugfix
R changelog/3004.bugfix
M doc/en/announce/index.rst
A doc/en/announce/release-3.3.1.rst
Log Message:
-----------
Merge pull request #2997 from nicoddemus/release-3.3.1
Preparing release version 3.3.1
Commit: 88f2cc9b641bca41818918ef853b7d10dca6bcaa
https://github.com/pytest-dev/pytest/commit/88f2cc9b641bca41818918ef853b7d10dca6bcaa
Author: Bruno Oliveira <nicodde...@gmail.com>
Date: 2017-12-05 (Tue, 05 Dec 2017)
Changed paths:
M CHANGELOG.rst
Log Message:
-----------
Small formatting fixes in CHANGELOG
Commit: 655146e522d611925d0bcf5778b7ae96b2cf379f
https://github.com/pytest-dev/pytest/commit/655146e522d611925d0bcf5778b7ae96b2cf379f
Author: Bruno Oliveira <nicodde...@gmail.com>
Date: 2017-12-05 (Tue, 05 Dec 2017)
Changed paths:
M .github/PULL_REQUEST_TEMPLATE.md
M CHANGELOG.rst
M _pytest/config.py
M _pytest/fixtures.py
M _pytest/terminal.py
R changelog/2920.bugfix
R changelog/2949.trivial
R changelog/2956.bugfix
R changelog/2957.bugfix
R changelog/2963.doc
M doc/en/announce/index.rst
A doc/en/announce/release-3.3.1.rst
M testing/deprecated_test.py
M testing/test_terminal.py
Log Message:
-----------
Merge remote-tracking branch 'upstream/master' into features
Compare:
https://github.com/pytest-dev/pytest/compare/294729962d1f...655146e522d6_______________________________________________
pytest-commit mailing list
pytest-commit@python.org
https://mail.python.org/mailman/listinfo/pytest-commit
