diff options
| author | Ned Batchelder <ned@nedbatchelder.com> | 2017-10-24 07:02:09 -0400 |
|---|---|---|
| committer | Ned Batchelder <ned@nedbatchelder.com> | 2017-10-24 07:02:09 -0400 |
| commit | ac4baedace2a6bcd790a293da02f9cc59729c2a7 (patch) | |
| tree | b2687e6c335745b52cf09418de9405c62d764ce7 | |
| parent | 50d056faa4ae653cfa0f4030674904c63a9ffe92 (diff) | |
| download | python-coveragepy-git-ac4baedace2a6bcd790a293da02f9cc59729c2a7.tar.gz | |
Clean up and credit for #265 and #101
| -rw-r--r-- | CHANGES.rst | 7 | ||||
| -rw-r--r-- | coverage/config.py | 7 |
2 files changed, 11 insertions, 3 deletions
diff --git a/CHANGES.rst b/CHANGES.rst index 453f82c8..58146ad4 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -12,9 +12,13 @@ Unreleased longer counted in statement totals, which could slightly change your total results. +- Specifying both ``--source`` and ``--include`` no longer silently ignores the + include setting, instead it displays a warning. Thanks, Loïc Dachary. Closes + `issue 265`_ and `issue 101`_. + - Fixed a race condition when saving data and multiple threads are tracing (`issue 581`_). It could produce a "dictionary changed size during iteration" - RuntimeError. I believe this fix mostly but not entirely fixes the race + RuntimeError. I believe this mostly but not entirely fixes the race condition. A true fix would likely be too expensive. Thanks, Peter Baughman for the debugging, and Olivier Grisel for the fix with tests. @@ -28,6 +32,7 @@ Unreleased - Be more flexible about the command name displayed by help, fixing `issue 600`_. Thanks, Ben Finney. +.. _issue 101: https://bitbucket.org/ned/coveragepy/issues/101/settings-under-report-affect-running .. _issue 581: https://bitbucket.org/ned/coveragepy/issues/581/race-condition-when-saving-data-under .. _issue 588: https://bitbucket.org/ned/coveragepy/issues/588/using-rcfile-path-to-toxini-uses-run .. _issue 589: https://bitbucket.org/ned/coveragepy/issues/589/allow-expansion-in-coveragerc diff --git a/coverage/config.py b/coverage/config.py index d4d320b0..50027274 100644 --- a/coverage/config.py +++ b/coverage/config.py @@ -224,8 +224,11 @@ class CoverageConfig(object): # Options for plugins self.plugin_options = {} - MUST_BE_LIST = ["run_omit", "run_include", "report_omit", "report_include", - "debug", "plugins", "concurrency"] + MUST_BE_LIST = [ + "debug", "concurrency", "plugins", + "report_omit", "report_include", + "run_omit", "run_include", + ] def from_args(self, **kwargs): """Read config values from `kwargs`.""" |