Branch: refs/heads/features
Home: https://github.com/pytest-dev/pytest
Commit: 5bd5b8c68aed33ad6b74f79208ef012e0b16c232
https://github.com/pytest-dev/pytest/commit/5bd5b8c68aed33ad6b74f79208ef012e0b16c232
Author: Ronny Pfannschmidt <ronny.pfannschm...@redhat.com>
Date: 2018-06-29 (Fri, 29 Jun 2018)
Changed paths:
A changelog/3631.bugfix.rst
M src/_pytest/mark/structures.py
M testing/test_mark.py
Log Message:
-----------
fix #3631 - don't store legacy markinfo when its impossible
Commit: 342f2cdc17d5030ddc59d88b647fbc4c732c502d
https://github.com/pytest-dev/pytest/commit/342f2cdc17d5030ddc59d88b647fbc4c732c502d
Author: Victor <victor.mary...@typhoon-hil.com>
Date: 2018-06-29 (Fri, 29 Jun 2018)
Changed paths:
M src/_pytest/logging.py
M testing/logging/test_reporting.py
Log Message:
-----------
Fixes #3630
Commit: 738933938a51f324187bef3188eb2d8ea69e83b9
https://github.com/pytest-dev/pytest/commit/738933938a51f324187bef3188eb2d8ea69e83b9
Author: Victor <victor.mary...@typhoon-hil.com>
Date: 2018-06-29 (Fri, 29 Jun 2018)
Changed paths:
A changelog/3630.bugfix.rst
Log Message:
-----------
Added changelog.
Commit: a6636fddcdcbb198e750f4097d5d0c08442e1f00
https://github.com/pytest-dev/pytest/commit/a6636fddcdcbb198e750f4097d5d0c08442e1f00
Author: Victor <victor.mary...@typhoon-hil.com>
Date: 2018-06-29 (Fri, 29 Jun 2018)
Changed paths:
M testing/logging/test_reporting.py
Log Message:
-----------
Fixed open function with encoding in python 2.7
Commit: 3a1c15316b55656ed57355dec27d223e378bf481
https://github.com/pytest-dev/pytest/commit/3a1c15316b55656ed57355dec27d223e378bf481
Author: Victor <victor.mary...@typhoon-hil.com>
Date: 2018-06-30 (Sat, 30 Jun 2018)
Changed paths:
M testing/logging/test_reporting.py
Log Message:
-----------
Updated test for python 2.7
Commit: dad3e773198a95e49a0b5a1e805bd0318c508996
https://github.com/pytest-dev/pytest/commit/dad3e773198a95e49a0b5a1e805bd0318c508996
Author: victor <victor.mary...@typhoon-hil.com>
Date: 2018-06-30 (Sat, 30 Jun 2018)
Changed paths:
M testing/logging/test_reporting.py
Log Message:
-----------
Improve test readability.
Commit: 26e1784e52fdd16c420349c1f45d8a210cf7c368
https://github.com/pytest-dev/pytest/commit/26e1784e52fdd16c420349c1f45d8a210cf7c368
Author: Bruno Oliveira <nicodde...@gmail.com>
Date: 2018-06-30 (Sat, 30 Jun 2018)
Changed paths:
A changelog/3630.bugfix.rst
M src/_pytest/logging.py
M testing/logging/test_reporting.py
Log Message:
-----------
Merge pull request #3641 from Sup3rGeo/bugfix/logfile-unicode
Fixes #3630
Commit: 2b75a311a78b9e07de4335738c374f3dfbc6a68e
https://github.com/pytest-dev/pytest/commit/2b75a311a78b9e07de4335738c374f3dfbc6a68e
Author: Bruno Oliveira <nicodde...@gmail.com>
Date: 2018-06-30 (Sat, 30 Jun 2018)
Changed paths:
A changelog/3631.bugfix.rst
M src/_pytest/mark/structures.py
M testing/test_mark.py
Log Message:
-----------
Merge pull request #3637 from RonnyPfannschmidt/fix-3631
fix #3631 - don't store legacy markinfo when its impossible
Commit: a43205b4bc572aad746b9fbd6f6701722d86bce1
https://github.com/pytest-dev/pytest/commit/a43205b4bc572aad746b9fbd6f6701722d86bce1
Author: T.E.A de Souza <tea.deso...@gmail.com>
Date: 2018-07-02 (Mon, 02 Jul 2018)
Changed paths:
M src/_pytest/monkeypatch.py
Log Message:
-----------
Fix monkeypatch doc
`delenv` is incorrectly documented.
Commit: b50911285a4d2f593afb92f568b21686473e25a5
https://github.com/pytest-dev/pytest/commit/b50911285a4d2f593afb92f568b21686473e25a5
Author: Bruno Oliveira <nicodde...@gmail.com>
Date: 2018-07-02 (Mon, 02 Jul 2018)
Changed paths:
M src/_pytest/monkeypatch.py
Log Message:
-----------
Merge pull request #3648 from eelstork/patch-1
Fix monkeypatch doc
Commit: 55ebf261ce9eee7d7dd67a332deb151747e8648e
https://github.com/pytest-dev/pytest/commit/55ebf261ce9eee7d7dd67a332deb151747e8648e
Author: Jean-Paul Calderone <exar...@twistedmatrix.com>
Date: 2018-07-03 (Tue, 03 Jul 2018)
Changed paths:
M src/_pytest/mark/structures.py
Log Message:
-----------
Switch to new API
Commit: b815f67e656d77b089babb7f68340014aab01807
https://github.com/pytest-dev/pytest/commit/b815f67e656d77b089babb7f68340014aab01807
Author: Jean-Paul Calderone <exar...@twistedmatrix.com>
Date: 2018-07-03 (Tue, 03 Jul 2018)
Changed paths:
A changelog/3653.trivial.rst
Log Message:
-----------
add changelog
Commit: b84a6463899c63e8b6c761d3c2e3682b5f48e1c7
https://github.com/pytest-dev/pytest/commit/b84a6463899c63e8b6c761d3c2e3682b5f48e1c7
Author: Bruno Oliveira <nicodde...@gmail.com>
Date: 2018-07-03 (Tue, 03 Jul 2018)
Changed paths:
M changelog/3653.trivial.rst
Log Message:
-----------
Add note to the changelog
Commit: 3ed8e28ef31004d64ad992a914775fe3ff23b7cb
https://github.com/pytest-dev/pytest/commit/3ed8e28ef31004d64ad992a914775fe3ff23b7cb
Author: Bruno Oliveira <nicodde...@gmail.com>
Date: 2018-07-03 (Tue, 03 Jul 2018)
Changed paths:
A changelog/3653.trivial.rst
M src/_pytest/mark/structures.py
Log Message:
-----------
Merge pull request #3654 from LeastAuthority/3653.deprecated-convert
Switch to new API
Commit: 43c0346d681800d41510ad3c0cfc5f8fd1bf04e4
https://github.com/pytest-dev/pytest/commit/43c0346d681800d41510ad3c0cfc5f8fd1bf04e4
Author: Bruno Oliveira <nicodde...@gmail.com>
Date: 2018-07-04 (Wed, 04 Jul 2018)
Changed paths:
M CHANGELOG.rst
R changelog/3061.bugfix.rst
R changelog/3593.bugfix.rst
R changelog/3598.trivial.rst
R changelog/3605.bugfix.rst
R changelog/3609.trivial.rst
R changelog/3611.doc.rst
R changelog/3630.bugfix.rst
R changelog/3631.bugfix.rst
R changelog/3653.trivial.rst
M doc/en/announce/index.rst
A doc/en/announce/release-3.6.3.rst
M doc/en/assert.rst
M doc/en/builtin.rst
M doc/en/cache.rst
M doc/en/capture.rst
M doc/en/doctest.rst
M doc/en/example/markers.rst
M doc/en/example/nonpython.rst
M doc/en/example/parametrize.rst
M doc/en/example/pythoncollection.rst
M doc/en/example/reportingdemo.rst
M doc/en/example/simple.rst
M doc/en/fixture.rst
M doc/en/getting-started.rst
M doc/en/index.rst
M doc/en/parametrize.rst
M doc/en/skipping.rst
M doc/en/tmpdir.rst
M doc/en/unittest.rst
M doc/en/usage.rst
M doc/en/warnings.rst
Log Message:
-----------
Preparing release version 3.6.3
Commit: 2921ca6e6449fbd69e9a73df304bc373dd41f0da
https://github.com/pytest-dev/pytest/commit/2921ca6e6449fbd69e9a73df304bc373dd41f0da
Author: Bruno Oliveira <nicodde...@gmail.com>
Date: 2018-07-03 (Tue, 03 Jul 2018)
Changed paths:
M doc/en/assert.rst
M doc/en/builtin.rst
M doc/en/cache.rst
M doc/en/capture.rst
M doc/en/doctest.rst
M doc/en/example/markers.rst
M doc/en/example/nonpython.rst
M doc/en/example/parametrize.rst
M doc/en/example/pythoncollection.rst
M doc/en/example/reportingdemo.rst
M doc/en/example/simple.rst
M doc/en/fixture.rst
M doc/en/getting-started.rst
M doc/en/index.rst
M doc/en/parametrize.rst
M doc/en/skipping.rst
M doc/en/tmpdir.rst
M doc/en/unittest.rst
M doc/en/usage.rst
M doc/en/warnings.rst
Log Message:
-----------
Run pre-commit on all doc files
Commit: fa3161011a6039bef955ee29ec46f5748bdec303
https://github.com/pytest-dev/pytest/commit/fa3161011a6039bef955ee29ec46f5748bdec303
Author: Bruno Oliveira <nicodde...@gmail.com>
Date: 2018-07-03 (Tue, 03 Jul 2018)
Changed paths:
M CHANGELOG.rst
Log Message:
-----------
Improve CHANGELOG for 3.6.3
Commit: 73d787df3a13af635d18464a6560984e78c0b4da
https://github.com/pytest-dev/pytest/commit/73d787df3a13af635d18464a6560984e78c0b4da
Author: Bruno Oliveira <nicodde...@gmail.com>
Date: 2018-07-03 (Tue, 03 Jul 2018)
Changed paths:
M HOWTORELEASE.rst
Log Message:
-----------
HOWTORELEASE: create branch first and run pre-commit after generate-release
task
This makes more sense because we need to install from
tasks/requirements.txt
Commit: b64c26674d10da13e957e5e101e1854d29938717
https://github.com/pytest-dev/pytest/commit/b64c26674d10da13e957e5e101e1854d29938717
Author: Bruno Oliveira <nicodde...@gmail.com>
Date: 2018-07-04 (Wed, 04 Jul 2018)
Changed paths:
M CHANGELOG.rst
M HOWTORELEASE.rst
R changelog/3061.bugfix.rst
R changelog/3593.bugfix.rst
R changelog/3598.trivial.rst
R changelog/3605.bugfix.rst
R changelog/3609.trivial.rst
R changelog/3611.doc.rst
R changelog/3630.bugfix.rst
R changelog/3631.bugfix.rst
R changelog/3653.trivial.rst
M doc/en/announce/index.rst
A doc/en/announce/release-3.6.3.rst
M doc/en/builtin.rst
M doc/en/example/reportingdemo.rst
M doc/en/example/simple.rst
Log Message:
-----------
Merge pull request #3656 from nicoddemus/release-3.6.3
Release 3.6.3
Commit: 7696d5371a85147f24b22cf6786b6331827bcc1b
https://github.com/pytest-dev/pytest/commit/7696d5371a85147f24b22cf6786b6331827bcc1b
Author: Bruno Oliveira <nicodde...@gmail.com>
Date: 2018-07-04 (Wed, 04 Jul 2018)
Changed paths:
M CHANGELOG.rst
M HOWTORELEASE.rst
R changelog/3061.bugfix.rst
R changelog/3593.bugfix.rst
R changelog/3598.trivial.rst
R changelog/3605.bugfix.rst
R changelog/3609.trivial.rst
R changelog/3611.doc.rst
M doc/en/announce/index.rst
A doc/en/announce/release-3.6.3.rst
M doc/en/builtin.rst
M doc/en/example/simple.rst
M src/_pytest/logging.py
M src/_pytest/mark/structures.py
M src/_pytest/monkeypatch.py
M testing/logging/test_reporting.py
M testing/test_mark.py
Log Message:
-----------
Merge remote-tracking branch 'upstream/master' into features
Commit: 3f5e06ecc465b1befb5e6ad062a264b47bab9f45
https://github.com/pytest-dev/pytest/commit/3f5e06ecc465b1befb5e6ad062a264b47bab9f45
Author: Bruno Oliveira <nicodde...@gmail.com>
Date: 2018-07-04 (Wed, 04 Jul 2018)
Changed paths:
M CHANGELOG.rst
M HOWTORELEASE.rst
R changelog/3061.bugfix.rst
R changelog/3593.bugfix.rst
R changelog/3598.trivial.rst
R changelog/3605.bugfix.rst
R changelog/3609.trivial.rst
R changelog/3611.doc.rst
M doc/en/announce/index.rst
A doc/en/announce/release-3.6.3.rst
M doc/en/builtin.rst
M doc/en/example/simple.rst
M src/_pytest/logging.py
M src/_pytest/mark/structures.py
M src/_pytest/monkeypatch.py
M testing/logging/test_reporting.py
M testing/test_mark.py
Log Message:
-----------
Merge pull request #3659 from nicoddemus/merge-master-into-features
Merge master into features
Compare:
https://github.com/pytest-dev/pytest/compare/8680dfc93964...3f5e06ecc465
**NOTE:** This service been marked for deprecation:
https://developer.github.com/changes/2018-04-25-github-services-deprecation/
Functionality will be removed from GitHub.com on January 31st, 2019.
_______________________________________________
pytest-commit mailing list
pytest-commit@python.org
https://mail.python.org/mailman/listinfo/pytest-commit
