[Pytest-commit] [pytest-dev/pytest] 14b638: Fix #2775 - running pytest with "--pyargs" will re...

[Bruno Oliveira]

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 14b6380e5f8c2e26aa518de8a499978eb9601848
      https://github.com/pytest-dev/pytest/commit/14b6380e5f8c2e26aa518de8a499978eb9601848
  Author: Christian Boelsen <christian.boelsen at hds.com>
  Date:   2017-09-13 (Wed, 13 Sep 2017)

  Changed paths:
    M _pytest/main.py
    A changelog/2775.bugfix
    M testing/acceptance_test.py

  Log Message:
  -----------
  Fix #2775 - running pytest with "--pyargs" will result in Items with empty "parent.nodeid" if run from a different root directory


  Commit: 794d4585d3b0e3c892ee97142e5c1d392928d372
      https://github.com/pytest-dev/pytest/commit/794d4585d3b0e3c892ee97142e5c1d392928d372
  Author: Christian Boelsen <christian.boelsen+github at gmail.com>
  Date:   2017-09-28 (Thu, 28 Sep 2017)

  Changed paths:
    M _pytest/main.py

  Log Message:
  -----------
  Remove unnecessary complexity in _check_initialpaths_for_relpath().


  Commit: f0f2d2b861bf8df93afce4e9844a8f97fe402cef
      https://github.com/pytest-dev/pytest/commit/f0f2d2b861bf8df93afce4e9844a8f97fe402cef
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-11-11 (Sat, 11 Nov 2017)

  Changed paths:
    M .github/PULL_REQUEST_TEMPLATE.md
    M AUTHORS
    M CHANGELOG.rst
    M CONTRIBUTING.rst
    M HOWTORELEASE.rst
    M _pytest/_argcomplete.py
    M _pytest/_code/code.py
    M _pytest/_code/source.py
    M _pytest/assertion/rewrite.py
    M _pytest/assertion/util.py
    M _pytest/config.py
    M _pytest/doctest.py
    M _pytest/fixtures.py
    M _pytest/junitxml.py
    M _pytest/main.py
    M _pytest/mark.py
    A _pytest/nodes.py
    M _pytest/pytester.py
    M _pytest/python.py
    M _pytest/python_api.py
    M _pytest/runner.py
    M _pytest/skipping.py
    M _pytest/terminal.py
    M _pytest/unittest.py
    A changelog/1505.doc
    R changelog/1548.doc
    A changelog/1997.doc
    A changelog/2658.doc
    R changelog/2722.trivial
    R changelog/2758.bugfix
    R changelog/2765.trivial
    A changelog/2819.bugfix
    A changelog/2836.bug
    A changelog/2856.bugfix
    A changelog/2882.bugfix
    A changelog/2893.doc
    A changelog/2903.doc
    A changelog/538.doc
    A changelog/911.doc
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.2.3.rst
    M doc/en/assert.rst
    M doc/en/contents.rst
    A doc/en/development_guide.rst
    M doc/en/example/parametrize.rst
    M doc/en/example/pythoncollection.rst
    M doc/en/fixture.rst
    M doc/en/getting-started.rst
    M doc/en/parametrize.rst
    M doc/en/plugins.rst
    M doc/en/proposals/parametrize_with_fixtures.rst
    M doc/en/pythonpath.rst
    M doc/en/skipping.rst
    M doc/en/unittest.rst
    M doc/en/usage.rst
    M doc/en/warnings.rst
    M doc/en/writing_plugins.rst
    M testing/code/test_excinfo.py
    M testing/code/test_source.py
    M testing/code/test_source_multiline_block.py
    M testing/python/collect.py
    M testing/python/fixture.py
    M testing/python/integration.py
    M testing/python/metafunc.py
    M testing/python/show_fixtures_per_test.py
    M testing/test_argcomplete.py
    M testing/test_assertion.py
    M testing/test_assertrewrite.py
    M testing/test_collection.py
    M testing/test_config.py
    M testing/test_conftest.py
    M testing/test_doctest.py
    M testing/test_mark.py
    A testing/test_nodes.py
    M testing/test_nose.py
    M testing/test_pluginmanager.py
    M testing/test_recwarn.py
    M testing/test_runner.py
    M testing/test_runner_xunit.py
    M testing/test_session.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 branch 'master' into fix-missing-nodeid-with-pyargs


  Commit: 259b86b6ab1aea38ae35043d8e12e82ef3576b32
      https://github.com/pytest-dev/pytest/commit/259b86b6ab1aea38ae35043d8e12e82ef3576b32
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-12 (Sun, 12 Nov 2017)

  Changed paths:
    M _pytest/main.py
    A changelog/2775.bugfix
    M testing/acceptance_test.py

  Log Message:
  -----------
  Merge pull request #2776 from cryporchild/fix-missing-nodeid-with-pyargs

Fix #2775 - running pytest with "--pyargs" will result in Items with …


Compare: https://github.com/pytest-dev/pytest/compare/b671c5a8bfde...259b86b6ab1a