Branch: refs/tags/3.7.0
Home: https://github.com/pytest-dev/pytest
Commit: eada0b1fd7a892be9c8e32cac7b3af26b919056d
https://github.com/pytest-dev/pytest/commit/eada0b1fd7a892be9c8e32cac7b3af26b919056d
Author: Bruno Oliveira <nicodde...@gmail.com>
Date: 2018-07-30 (Mon, 30 Jul 2018)
Changed paths:
M .travis.yml
M appveyor.yml
A changelog/3295.doc.rst
A changelog/3695.bugfix.rst
M doc/en/cache.rst
M src/_pytest/python_api.py
M testing/python/approx.py
Log Message:
-----------
Merge remote-tracking branch 'upstream/master' into release-3.7.0
Commit: d461e931dd7fa7eae7b835cb84047e033872aade
https://github.com/pytest-dev/pytest/commit/d461e931dd7fa7eae7b835cb84047e033872aade
Author: Bruno Oliveira <nicodde...@gmail.com>
Date: 2018-07-30 (Mon, 30 Jul 2018)
Changed paths:
M tox.ini
Log Message:
-----------
Use python 3.6 for regendoc
Commit: 2c09930b6d701d91a0284c6d44086488ffbcb419
https://github.com/pytest-dev/pytest/commit/2c09930b6d701d91a0284c6d44086488ffbcb419
Author: Bruno Oliveira <nicodde...@gmail.com>
Date: 2018-07-30 (Mon, 30 Jul 2018)
Changed paths:
M .travis.yml
Log Message:
-----------
Use proper quotes for python 3.7 on travis.yml
Commit: 60b1913ba21094da5eb91d8c68642c38f20f6a26
https://github.com/pytest-dev/pytest/commit/60b1913ba21094da5eb91d8c68642c38f20f6a26
Author: Bruno Oliveira <nicodde...@gmail.com>
Date: 2018-07-30 (Mon, 30 Jul 2018)
Changed paths:
M CHANGELOG.rst
R changelog/2220.bugfix.rst
R changelog/2283.feature
R changelog/2639.removal.rst
R changelog/3295.doc.rst
R changelog/3519.trivial.rst
R changelog/3576.feature.rst
R changelog/3579.feature.rst
R changelog/3610.feature.rst
R changelog/3623.feature.rst
R changelog/3661.removal.rst
R changelog/3695.bugfix.rst
R changelog/980.bugfix.rst
M doc/en/announce/index.rst
A doc/en/announce/release-3.7.0.rst
M doc/en/example/markers.rst
M doc/en/example/nonpython.rst
M doc/en/example/reportingdemo.rst
M doc/en/example/simple.rst
M doc/en/fixture.rst
M doc/en/getting-started.rst
Log Message:
-----------
Preparing release version 3.7.0
Commit: 997ef593068a36c283cbb83d938272b9770caa36
https://github.com/pytest-dev/pytest/commit/997ef593068a36c283cbb83d938272b9770caa36
Author: Bruno Oliveira <nicodde...@gmail.com>
Date: 2018-07-30 (Mon, 30 Jul 2018)
Changed paths:
M CHANGELOG.rst
Log Message:
-----------
Fix typos in CHANGELOG
Compare:
https://github.com/pytest-dev/pytest/compare/eada0b1fd7a8^...997ef593068a
**NOTE:** This service has 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
