Branch: refs/heads/features
Home: https://github.com/pytest-dev/pytest
Commit: e273f5399d8a3833e49c69eb5f1630fb4da030a4
https://github.com/pytest-dev/pytest/commit/e273f5399d8a3833e49c69eb5f1630fb4da030a4
Author: Eugene Prikazchikov <eprik...@gmail.com>
Date: 2017-11-25 (Sat, 25 Nov 2017)
Changed paths:
M CONTRIBUTING.rst
A changelog/2949.trivial
Log Message:
-----------
Update github "bugs" link
Apparently, some time ago label was renamed from bug to "type:bug"
Commit: 6b90ad4d4b958560a07ddaf5ec11eccff28f197e
https://github.com/pytest-dev/pytest/commit/6b90ad4d4b958560a07ddaf5ec11eccff28f197e
Author: Bruno Oliveira <nicodde...@gmail.com>
Date: 2017-11-25 (Sat, 25 Nov 2017)
Changed paths:
M CONTRIBUTING.rst
A changelog/2949.trivial
Log Message:
-----------
Merge pull request #2949 from eprikazc/master
Update github "bugs" link
Commit: d5f038e29ab3882eed8779efc98fbc3348a21ac6
https://github.com/pytest-dev/pytest/commit/d5f038e29ab3882eed8779efc98fbc3348a21ac6
Author: Daniel Hahler <g...@thequod.de>
Date: 2017-11-26 (Sun, 26 Nov 2017)
Changed paths:
M CHANGELOG.rst
M _pytest/assertion/rewrite.py
M _pytest/config.py
M _pytest/pytester.py
M doc/en/announce/release-2.7.0.rst
M doc/en/writing_plugins.rst
M testing/test_assertion.py
Log Message:
-----------
Fix spelling: s/re-writ/rewrit/g
This also fixes "can not" to "cannot" in the "Module already imported so
cannot be rewritten" assertion error.
Commit: c58715371ceb1453547a6e08dc2ae4075bc98942
https://github.com/pytest-dev/pytest/commit/c58715371ceb1453547a6e08dc2ae4075bc98942
Author: Bruno Oliveira <nicodde...@gmail.com>
Date: 2017-11-26 (Sun, 26 Nov 2017)
Changed paths:
M CHANGELOG.rst
M _pytest/assertion/rewrite.py
M _pytest/config.py
M _pytest/pytester.py
M doc/en/announce/release-2.7.0.rst
M doc/en/writing_plugins.rst
M testing/test_assertion.py
Log Message:
-----------
Merge pull request #2954 from blueyed/rewritten
Fix spelling: s/re-writ/rewrit/g
Commit: 4678cbeb913385f00cc21b79662459a8c9fafa87
https://github.com/pytest-dev/pytest/commit/4678cbeb913385f00cc21b79662459a8c9fafa87
Author: Bruno Oliveira <nicodde...@gmail.com>
Date: 2017-11-27 (Mon, 27 Nov 2017)
Changed paths:
M .coveragerc
M .travis.yml
M AUTHORS
M CHANGELOG.rst
M README.rst
M _pytest/_argcomplete.py
M _pytest/_code/code.py
M _pytest/_code/source.py
R _pytest/_pluggy.py
M _pytest/assertion/__init__.py
M _pytest/assertion/rewrite.py
M _pytest/assertion/truncate.py
M _pytest/assertion/util.py
M _pytest/capture.py
M _pytest/compat.py
M _pytest/config.py
M _pytest/debugging.py
M _pytest/deprecated.py
M _pytest/doctest.py
M _pytest/fixtures.py
M _pytest/hookspec.py
A _pytest/logging.py
M _pytest/main.py
M _pytest/mark.py
M _pytest/monkeypatch.py
M _pytest/nose.py
M _pytest/outcomes.py
M _pytest/pastebin.py
M _pytest/pytester.py
M _pytest/python.py
M _pytest/python_api.py
M _pytest/recwarn.py
M _pytest/runner.py
M _pytest/setuponly.py
M _pytest/skipping.py
M _pytest/terminal.py
M _pytest/unittest.py
R _pytest/vendored_packages/README.md
R _pytest/vendored_packages/__init__.py
R _pytest/vendored_packages/pluggy-0.4.0.dist-info/DESCRIPTION.rst
R _pytest/vendored_packages/pluggy-0.4.0.dist-info/INSTALLER
R _pytest/vendored_packages/pluggy-0.4.0.dist-info/LICENSE.txt
R _pytest/vendored_packages/pluggy-0.4.0.dist-info/METADATA
R _pytest/vendored_packages/pluggy-0.4.0.dist-info/RECORD
R _pytest/vendored_packages/pluggy-0.4.0.dist-info/WHEEL
R _pytest/vendored_packages/pluggy-0.4.0.dist-info/metadata.json
R _pytest/vendored_packages/pluggy-0.4.0.dist-info/top_level.txt
R _pytest/vendored_packages/pluggy.py
M _pytest/warnings.py
M appveyor.yml
R changelog/2939.bugfix
R changelog/2942.bugfix
M doc/en/Makefile
M doc/en/announce/index.rst
A doc/en/announce/release-3.3.0.rst
M doc/en/assert.rst
M doc/en/backwards-compatibility.rst
M doc/en/builtin.rst
M doc/en/cache.rst
M doc/en/capture.rst
M doc/en/contents.rst
M doc/en/customize.rst
M doc/en/doctest.rst
M doc/en/example/markers.rst
M doc/en/example/multipython.py
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/example/special.rst
M doc/en/fixture.rst
M doc/en/getting-started.rst
M doc/en/index.rst
A doc/en/logging.rst
M doc/en/parametrize.rst
M doc/en/plugins.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
M doc/en/writing_plugins.rst
M pytest.py
M setup.py
M tasks/__init__.py
R tasks/vendoring.py
M testing/acceptance_test.py
M testing/code/test_excinfo.py
M testing/code/test_source.py
M testing/deprecated_test.py
A testing/logging/test_fixture.py
A testing/logging/test_reporting.py
M testing/python/approx.py
M testing/python/collect.py
M testing/python/fixture.py
M testing/python/metafunc.py
M testing/python/setup_only.py
A testing/python/test_deprecations.py
M testing/test_assertion.py
M testing/test_assertrewrite.py
M testing/test_capture.py
M testing/test_collection.py
M testing/test_config.py
M testing/test_doctest.py
M testing/test_mark.py
M testing/test_parseopt.py
M testing/test_pluginmanager.py
M testing/test_pytester.py
M testing/test_recwarn.py
M testing/test_runner.py
M testing/test_skipping.py
M testing/test_terminal.py
M testing/test_unittest.py
M testing/test_warnings.py
M tox.ini
Log Message:
-----------
Merge remote-tracking branch 'upstream/features'
Commit: d95c8a22046369732f76306ce39ddd5a5c0cb305
https://github.com/pytest-dev/pytest/commit/d95c8a22046369732f76306ce39ddd5a5c0cb305
Author: Bruno Oliveira <nicodde...@gmail.com>
Date: 2017-11-27 (Mon, 27 Nov 2017)
Changed paths:
M CHANGELOG.rst
Log Message:
-----------
Fix link to #2636 in CHANGELOG
Compare:
https://github.com/pytest-dev/pytest/compare/67ad0fa3640b...d95c8a220463_______________________________________________
pytest-commit mailing list
pytest-commit@python.org
https://mail.python.org/mailman/listinfo/pytest-commit
