Branch: refs/heads/features
Home: https://github.com/pytest-dev/pytest
Commit: f300f7fa241e47d0a0f4c47e86817fe8a21cc9b1
https://github.com/pytest-dev/pytest/commit/f300f7fa241e47d0a0f4c47e86817fe8a21cc9b1
Author: Bruno Oliveira <nicodde...@gmail.com>
Date: 2018-06-11 (Mon, 11 Jun 2018)
Changed paths:
M CONTRIBUTING.rst
Log Message:
-----------
Improve contributing instructions regarding black/linting
Commit: 4983de60d3c587f1f9643a7c3595ba5109d71dd3
https://github.com/pytest-dev/pytest/commit/4983de60d3c587f1f9643a7c3595ba5109d71dd3
Author: Bruno Oliveira <nicodde...@gmail.com>
Date: 2018-06-11 (Mon, 11 Jun 2018)
Changed paths:
R doc/en/check_sphinx.py
R doc/en/genapi.py
Log Message:
-----------
Remove unused scripts from docs
Commit: d6e7b1a21bb2f9cf9019cbfee1f3bfad160891dd
https://github.com/pytest-dev/pytest/commit/d6e7b1a21bb2f9cf9019cbfee1f3bfad160891dd
Author: Bruno Oliveira <nicodde...@gmail.com>
Date: 2018-06-11 (Mon, 11 Jun 2018)
Changed paths:
R doc/en/test/attic.rst
R doc/en/test/config.html
R doc/en/test/dist.html
R doc/en/test/extend.html
R doc/en/test/index.rst
R doc/en/test/mission.rst
R doc/en/test/plugin/cov.rst
R doc/en/test/plugin/coverage.rst
R doc/en/test/plugin/django.rst
R doc/en/test/plugin/figleaf.rst
R doc/en/test/plugin/helpconfig.rst
R doc/en/test/plugin/index.rst
R doc/en/test/plugin/links.rst
R doc/en/test/plugin/nose.rst
R doc/en/test/plugin/oejskit.rst
R doc/en/test/plugin/terminal.rst
R doc/en/test/plugin/xdist.rst
R doc/en/test/test.html
Log Message:
-----------
Remove obsolete doc/en/test directory
Apparently this was an old version of the docs, which has long been superseded
Commit: 1b5322da1bc9b41cf5667d8b50cf2a8067b2410b
https://github.com/pytest-dev/pytest/commit/1b5322da1bc9b41cf5667d8b50cf2a8067b2410b
Author: Ronny Pfannschmidt <opensou...@ronnypfannschmidt.de>
Date: 2018-06-12 (Tue, 12 Jun 2018)
Changed paths:
M CONTRIBUTING.rst
Log Message:
-----------
Merge pull request #3571 from nicoddemus/pre-commit-contributors-guide
Improve contributing instructions regarding black/linting
Commit: 37793d4cdbf71f597a3c69c827e0c010528d53a5
https://github.com/pytest-dev/pytest/commit/37793d4cdbf71f597a3c69c827e0c010528d53a5
Author: Ronny Pfannschmidt <ronny.pfannschm...@redhat.com>
Date: 2018-06-12 (Tue, 12 Jun 2018)
Changed paths:
A changelog/3555.bugfix.rst
M src/_pytest/mark/structures.py
M src/_pytest/nodes.py
M testing/test_mark.py
Log Message:
-----------
fix addmarker - extract mark from markdecorator
Commit: 9a7c3a65f4edce61669d10db0d3f112c506d0b5c
https://github.com/pytest-dev/pytest/commit/9a7c3a65f4edce61669d10db0d3f112c506d0b5c
Author: Bruno Oliveira <nicodde...@gmail.com>
Date: 2018-06-12 (Tue, 12 Jun 2018)
Changed paths:
M changelog/3555.bugfix.rst
Log Message:
-----------
Improve CHANGELOG formatting
Commit: b0ec442d2498cbb48159f2c2469126c06d1a0d35
https://github.com/pytest-dev/pytest/commit/b0ec442d2498cbb48159f2c2469126c06d1a0d35
Author: Ronny Pfannschmidt <ronny.pfannschm...@redhat.com>
Date: 2018-06-12 (Tue, 12 Jun 2018)
Changed paths:
M src/_pytest/mark/structures.py
M src/_pytest/nodes.py
Log Message:
-----------
rework Node.add_marker parameter list and docstring
Commit: f786534173e448e5499413f967ce620cec8e7a53
https://github.com/pytest-dev/pytest/commit/f786534173e448e5499413f967ce620cec8e7a53
Author: Bartosz Cierocki <bartosz.ciero...@gmail.com>
Date: 2018-06-12 (Tue, 12 Jun 2018)
Changed paths:
M doc/en/assert.rst
Log Message:
-----------
Fix three spaces instead of four in docs
Commit: 077c44cf694fcfeb73cf6e8320261217c81bb7a6
https://github.com/pytest-dev/pytest/commit/077c44cf694fcfeb73cf6e8320261217c81bb7a6
Author: Bruno Oliveira <nicodde...@gmail.com>
Date: 2018-06-12 (Tue, 12 Jun 2018)
Changed paths:
M doc/en/assert.rst
Log Message:
-----------
Merge pull request #3578 from BartoszCki/master
Fix three spaces instead of four in docs
Commit: 52c42799181d25f38abb6dfc7fbde2a04ab00a43
https://github.com/pytest-dev/pytest/commit/52c42799181d25f38abb6dfc7fbde2a04ab00a43
Author: Ronny Pfannschmidt <opensou...@ronnypfannschmidt.de>
Date: 2018-06-12 (Tue, 12 Jun 2018)
Changed paths:
R doc/en/check_sphinx.py
R doc/en/genapi.py
R doc/en/test/attic.rst
R doc/en/test/config.html
R doc/en/test/dist.html
R doc/en/test/extend.html
R doc/en/test/index.rst
R doc/en/test/mission.rst
R doc/en/test/plugin/cov.rst
R doc/en/test/plugin/coverage.rst
R doc/en/test/plugin/django.rst
R doc/en/test/plugin/figleaf.rst
R doc/en/test/plugin/helpconfig.rst
R doc/en/test/plugin/index.rst
R doc/en/test/plugin/links.rst
R doc/en/test/plugin/nose.rst
R doc/en/test/plugin/oejskit.rst
R doc/en/test/plugin/terminal.rst
R doc/en/test/plugin/xdist.rst
R doc/en/test/test.html
Log Message:
-----------
Merge pull request #3572 from nicoddemus/remove-unused-scripts
Remove unused scripts and old docs
Commit: 321f66f71148c978c1bf45dace61886b5e263bd4
https://github.com/pytest-dev/pytest/commit/321f66f71148c978c1bf45dace61886b5e263bd4
Author: Ronny Pfannschmidt <ronny.pfannschm...@redhat.com>
Date: 2018-06-12 (Tue, 12 Jun 2018)
Changed paths:
M testing/python/integration.py
Log Message:
-----------
mark test_wrapped_getfuncargnames_patching as xfail
Commit: 88ae21f2ccaf4e3ebf5486ce423acf4361685df5
https://github.com/pytest-dev/pytest/commit/88ae21f2ccaf4e3ebf5486ce423acf4361685df5
Author: Bruno Oliveira <nicodde...@gmail.com>
Date: 2018-06-12 (Tue, 12 Jun 2018)
Changed paths:
M tox.ini
Log Message:
-----------
Add mock dependency to py27-nobyte
Commit: 4d0297b4138b694e1d99f4c8147aaf06d725d0f4
https://github.com/pytest-dev/pytest/commit/4d0297b4138b694e1d99f4c8147aaf06d725d0f4
Author: Bruno Oliveira <nicodde...@gmail.com>
Date: 2018-06-13 (Wed, 13 Jun 2018)
Changed paths:
A changelog/3555.bugfix.rst
M src/_pytest/mark/structures.py
M src/_pytest/nodes.py
M testing/python/integration.py
M testing/test_mark.py
M tox.ini
Log Message:
-----------
Merge pull request #3577 from RonnyPfannschmidt/addmarker-fix
fix addmarker - extract mark from markdecorator
Commit: eb0c6a82875a986d9bf4cf0efdcee5641fe84fef
https://github.com/pytest-dev/pytest/commit/eb0c6a82875a986d9bf4cf0efdcee5641fe84fef
Author: Ronny Pfannschmidt <ronny.pfannschm...@redhat.com>
Date: 2018-06-13 (Wed, 13 Jun 2018)
Changed paths:
M src/_pytest/nodes.py
M testing/test_mark.py
Log Message:
-----------
fix addmarker - extract mark from markdecorator
Commit: 791bb3502cc6c0539e9428f49f0082038d46619f
https://github.com/pytest-dev/pytest/commit/791bb3502cc6c0539e9428f49f0082038d46619f
Author: Ronny Pfannschmidt <ronny.pfannschm...@redhat.com>
Date: 2018-06-13 (Wed, 13 Jun 2018)
Changed paths:
A changelog/3576.feature.rst
Log Message:
-----------
changelog
Commit: b5102d03a62ef5cd7704cadc5e704df3cd812e21
https://github.com/pytest-dev/pytest/commit/b5102d03a62ef5cd7704cadc5e704df3cd812e21
Author: Bruno Oliveira <nicodde...@gmail.com>
Date: 2018-06-13 (Wed, 13 Jun 2018)
Changed paths:
M src/_pytest/nodes.py
Log Message:
-----------
Fix add_marker docs
Commit: 8d072205e9119ec3c8b95ca66876b9a1a50b6e3e
https://github.com/pytest-dev/pytest/commit/8d072205e9119ec3c8b95ca66876b9a1a50b6e3e
Author: Ronny Pfannschmidt <ronny.pfannschm...@redhat.com>
Date: 2018-06-13 (Wed, 13 Jun 2018)
Changed paths:
M src/_pytest/nodes.py
Log Message:
-----------
fix whitespace
Commit: 94c41bec64d77f816e7598cc74527377e6bb8536
https://github.com/pytest-dev/pytest/commit/94c41bec64d77f816e7598cc74527377e6bb8536
Author: Bruno Oliveira <nicodde...@gmail.com>
Date: 2018-06-13 (Wed, 13 Jun 2018)
Changed paths:
M CONTRIBUTING.rst
A changelog/3555.bugfix.rst
A changelog/3576.feature.rst
M doc/en/assert.rst
R doc/en/check_sphinx.py
R doc/en/genapi.py
R doc/en/test/attic.rst
R doc/en/test/config.html
R doc/en/test/dist.html
R doc/en/test/extend.html
R doc/en/test/index.rst
R doc/en/test/mission.rst
R doc/en/test/plugin/cov.rst
R doc/en/test/plugin/coverage.rst
R doc/en/test/plugin/django.rst
R doc/en/test/plugin/figleaf.rst
R doc/en/test/plugin/helpconfig.rst
R doc/en/test/plugin/index.rst
R doc/en/test/plugin/links.rst
R doc/en/test/plugin/nose.rst
R doc/en/test/plugin/oejskit.rst
R doc/en/test/plugin/terminal.rst
R doc/en/test/plugin/xdist.rst
R doc/en/test/test.html
M src/_pytest/mark/structures.py
M src/_pytest/nodes.py
M testing/python/integration.py
M testing/test_mark.py
M tox.ini
Log Message:
-----------
Merge pull request #3576 from RonnyPfannschmidt/addmarker-api
fix addmarker - extract mark from markdecorator
Compare:
https://github.com/pytest-dev/pytest/compare/e0a1da4eb9a8...94c41bec64d7
**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
