Branch: refs/heads/master
Home: https://github.com/pytest-dev/pytest
Commit: b48f1d378b4a9f96425aac848eacf3ef1ee1cce5
https://github.com/pytest-dev/pytest/commit/b48f1d378b4a9f96425aac848eacf3ef1ee1cce5
Author: Hugo Martins <caramelo.mart...@gmail.com>
Date: 2018-06-30 (Sat, 30 Jun 2018)
Changed paths:
A changelog/3592.doc.rst
M doc/en/fixture.rst
Log Message:
-----------
Clarify examples in fixtures' documentation
Commit: f7c929c932c4a73934ee1ea3cb3fc2a5e2e3e852
https://github.com/pytest-dev/pytest/commit/f7c929c932c4a73934ee1ea3cb3fc2a5e2e3e852
Author: Hugo Martins <caramelo.mart...@gmail.com>
Date: 2018-06-30 (Sat, 30 Jun 2018)
Changed paths:
M changelog/3592.doc.rst
M doc/en/fixture.rst
Log Message:
-----------
Fix linting errors in docs/fixtures.rst
Commit: f52a5d3be2b9c7f3145ec28f0650df33d1eb11b6
https://github.com/pytest-dev/pytest/commit/f52a5d3be2b9c7f3145ec28f0650df33d1eb11b6
Author: Hugo Martins <caramelo.mart...@gmail.com>
Date: 2018-07-03 (Tue, 03 Jul 2018)
Changed paths:
A changelog/3630.bugfix.rst
A changelog/3631.bugfix.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'
Commit: 8232fd1a2d1534b7a99479f12c37ad23a00e0716
https://github.com/pytest-dev/pytest/commit/8232fd1a2d1534b7a99479f12c37ad23a00e0716
Author: Hugo Martins <caramelo.mart...@gmail.com>
Date: 2018-07-03 (Tue, 03 Jul 2018)
Changed paths:
M doc/en/fixture.rst
Log Message:
-----------
Fix remaining "smtp" references
Commit: 63b25304c3727f37874d0923db4603a08ba7b1b2
https://github.com/pytest-dev/pytest/commit/63b25304c3727f37874d0923db4603a08ba7b1b2
Author: Bruno Oliveira <nicodde...@gmail.com>
Date: 2018-07-03 (Tue, 03 Jul 2018)
Changed paths:
M doc/en/fixture.rst
Log Message:
-----------
Run pre-commit fixers
Commit: 4dfe2eee945db025aad942fef71b98b4f789c349
https://github.com/pytest-dev/pytest/commit/4dfe2eee945db025aad942fef71b98b4f789c349
Author: Bruno Oliveira <nicodde...@gmail.com>
Date: 2018-07-11 (Wed, 11 Jul 2018)
Changed paths:
M doc/en/fixture.rst
Log Message:
-----------
Fix finalize call
Commit: 2c4759ce5761b3fbc32f1d98a808b655ae964f2d
https://github.com/pytest-dev/pytest/commit/2c4759ce5761b3fbc32f1d98a808b655ae964f2d
Author: Bruno Oliveira <nicodde...@gmail.com>
Date: 2018-07-11 (Wed, 11 Jul 2018)
Changed paths:
M doc/en/builtin.rst
M doc/en/example/reportingdemo.rst
M doc/en/example/simple.rst
M doc/en/fixture.rst
Log Message:
-----------
Run regendocs
Commit: 251adbf6444667cda2c5ce24596001ca29a4776e
https://github.com/pytest-dev/pytest/commit/251adbf6444667cda2c5ce24596001ca29a4776e
Author: Bruno Oliveira <nicodde...@gmail.com>
Date: 2018-07-11 (Wed, 11 Jul 2018)
Changed paths:
M .pre-commit-config.yaml
M .travis.yml
M CHANGELOG.rst
M HOWTORELEASE.rst
M README.rst
A changelog/2319.trivial.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
A changelog/742.bugfix.rst
M doc/en/announce/index.rst
M doc/en/announce/release-2.9.0.rst
A doc/en/announce/release-3.6.3.rst
M doc/en/example/markers.rst
M doc/en/example/simple.rst
M doc/en/fixture.rst
M doc/en/goodpractices.rst
M doc/en/mark.rst
M doc/en/reference.rst
M src/_pytest/_code/source.py
M src/_pytest/compat.py
M src/_pytest/config/__init__.py
M src/_pytest/mark/structures.py
M src/_pytest/pytester.py
M testing/code/test_source.py
R testing/code/test_source_multiline_block.py
M testing/python/raises.py
M testing/test_assertrewrite.py
M testing/test_capture.py
M testing/test_pytester.py
M tox.ini
Log Message:
-----------
Merge with upstream/master
Commit: aa47b64e2a337df4520eea5a680b14990b724ee1
https://github.com/pytest-dev/pytest/commit/aa47b64e2a337df4520eea5a680b14990b724ee1
Author: Bruno Oliveira <nicodde...@gmail.com>
Date: 2018-07-11 (Wed, 11 Jul 2018)
Changed paths:
M changelog/3592.doc.rst
Log Message:
-----------
Improve CHANGELOG entry
Commit: 6c3713226c1c619196ddc0fe870ea4fa4f5253c3
https://github.com/pytest-dev/pytest/commit/6c3713226c1c619196ddc0fe870ea4fa4f5253c3
Author: Bruno Oliveira <nicodde...@gmail.com>
Date: 2018-07-11 (Wed, 11 Jul 2018)
Changed paths:
A changelog/3592.doc.rst
M doc/en/fixture.rst
Log Message:
-----------
Merge pull request #3642 from caramelomartins/master
Fixes # 3592 - Clarify Fixtures' Documentation
Compare:
https://github.com/pytest-dev/pytest/compare/593b451373ec...6c3713226c1c
**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
