[Pytest-commit] [pytest-dev/pytest] d65f30: Move handling of duplicate files

[Bruno Oliveira]

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: d65f300988be1b1cfc0a98254da4aa8c75fe45e2
      https://github.com/pytest-dev/pytest/commit/d65f300988be1b1cfc0a98254da4aa8c75fe45e2
  Author: Daniel Hahler <git at thequod.de>
  Date:   2018-11-01 (Thu, 01 Nov 2018)

  Changed paths:
    M src/_pytest/main.py
    M src/_pytest/python.py
    M testing/test_session.py

  Log Message:
  -----------
  Move handling of duplicate files

This removes the hack added in https://github.com/pytest-dev/pytest/pull/3802.

Adjusts test:

- it appears to not have been changed to 7 intentionally.
- removes XXX comment, likely not relevant anymore since 6dac7743.


  Commit: 70976b04be195b6ae6fc9a74811429148479a83c
      https://github.com/pytest-dev/pytest/commit/70976b04be195b6ae6fc9a74811429148479a83c
  Author: Mick Koch <mick at kochm.co>
  Date:   2018-11-01 (Thu, 01 Nov 2018)

  Changed paths:
    M testing/test_collection.py

  Log Message:
  -----------
  Add test for __init__.py collection with package directory as argument


  Commit: 320e41b142f14e5b864131e30f4c18bdf29199c6
      https://github.com/pytest-dev/pytest/commit/320e41b142f14e5b864131e30f4c18bdf29199c6
  Author: Mick Koch <mick at kochm.co>
  Date:   2018-11-01 (Thu, 01 Nov 2018)

  Changed paths:
    M testing/test_collection.py

  Log Message:
  -----------
  Add failing test for __init__.py also including other package files


  Commit: 5ac4eff09b8514a5b46bdff464605a60051abc83
      https://github.com/pytest-dev/pytest/commit/5ac4eff09b8514a5b46bdff464605a60051abc83
  Author: Mick Koch <mick at kochm.co>
  Date:   2018-11-01 (Thu, 01 Nov 2018)

  Changed paths:
    M src/_pytest/main.py

  Log Message:
  -----------
  Fix __init__.py as argument also including other package files


  Commit: 51973543754b0f1149fcf36298bb47e82ccc9ead
      https://github.com/pytest-dev/pytest/commit/51973543754b0f1149fcf36298bb47e82ccc9ead
  Author: Mick Koch <mick at kochm.co>
  Date:   2018-11-01 (Thu, 01 Nov 2018)

  Changed paths:
    A changelog/4046.bugfix.rst

  Log Message:
  -----------
  Add changelog entry


  Commit: 21725e930462a6533b98ac89d50e1e171d9f0c66
      https://github.com/pytest-dev/pytest/commit/21725e930462a6533b98ac89d50e1e171d9f0c66
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-11-02 (Fri, 02 Nov 2018)

  Changed paths:
    A changelog/4046.bugfix.rst
    M src/_pytest/main.py
    M src/_pytest/python.py
    M testing/test_collection.py
    M testing/test_session.py

  Log Message:
  -----------
  Merge pull request #4285 from kchmck/fix-4046

Fix problems with running tests in package `__init__` files (#4046)


Compare: https://github.com/pytest-dev/pytest/compare/48f52b1be0c0...21725e930462
      **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.