Map also empty dictionaries to file #1347
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nedbat
force-pushed
the
master
branch
2 times, most recently
from
0c14f1a
to
82169a6
Compare
|
This looks like a very simple fix. I wonder why it hasn't received any traction unless its incorrect? |
|
This does look like a simple fix. I wish I understood more about Cython and its plugin. But I guess it is reasonable to continue processing files that have had no data collected. I will merge this, and hope that we don't discover why the |
|
This is now released as part of coverage 6.4.3. |
There's was a short comment at the top of https://github.com/cython/cython/blob/master/Cython/Coverage.py that I now expanded to explain the mechanics in an "obvious" place. |
netbsd-srcmastr
pushed a commit
to NetBSD/pkgsrc
that referenced
this pull request
Aug 24, 2022
Version 6.4.4 — 2022-08-16 -------------------------- - Wheels are now provided for Python 3.11. .. _changes_6-4-3: Version 6.4.3 — 2022-08-06 -------------------------- - Fix a failure when combining data files if the file names contained glob-like patterns (`pull 1405`_). Thanks, Michael Krebs and Benjamin Schubert. - Fix a messaging failure when combining Windows data files on a different drive than the current directory. (`pull 1430`_, fixing `issue 1428`_). Thanks, Lorenzo Micò. - Fix path calculations when running in the root directory, as you might do in a Docker container: `pull 1403`_, thanks Arthur Rio. - Filtering in the HTML report wouldn't work when reloading the index page. This is now fixed (`pull 1413`_). Thanks, Marc Legendre. - Fix a problem with Cython code measurement (`pull 1347`_, fixing `issue 972`_). Thanks, Matus Valo. .. _issue 972: nedbat/coveragepy#972 .. _pull 1347: nedbat/coveragepy#1347 .. _pull 1403: nedbat/coveragepy#1403 .. _pull 1405: nedbat/coveragepy#1405 .. _pull 1413: nedbat/coveragepy#1413 .. _issue 1428: nedbat/coveragepy#1428 .. _pull 1430: nedbat/coveragepy#1430 .. _changes_6-4-2: Version 6.4.2 — 2022-07-12 -------------------------- - Updated for a small change in Python 3.11.0 beta 4: modules now start with a line with line number 0, which is ignored. This line cannnot be executed, so coverage totals were thrown off. This line is now ignored by coverage.py, but this also means that truly empty modules (like ``__init__.py``) have no lines in them, rather than one phantom line. Fixes `issue 1419`_. - Internal debugging data added to sys.modules is now an actual module, to avoid confusing code that examines everything in sys.modules. Thanks, Yilei Yang (`pull 1399`_). .. _pull 1399: nedbat/coveragepy#1399 .. _issue 1419: nedbat/coveragepy#1419 .. _changes_6-4-1: Version 6.4.1 — 2022-06-02 -------------------------- - Greatly improved performance on PyPy, and other environments that need the pure Python trace function. Thanks, Carl Friedrich Bolz-Tereick (`pull 1381`_ and `pull 1388`_). Slightly improved performance when using the C trace function, as most environments do. Closes `issue 1339`_. - The conditions for using tomllib from the standard library have been made more precise, so that 3.11 alphas will continue to work. Closes `issue 1390`_. .. _issue 1339: nedbat/coveragepy#1339 .. _pull 1381: nedbat/coveragepy#1381 .. _pull 1388: nedbat/coveragepy#1388 .. _issue 1390: nedbat/coveragepy#1390 .. _changes_64: Version 6.4 — 2022-05-22 ------------------------ - A new setting, :ref:`config_run_sigterm`, controls whether a SIGTERM signal handler is used. In 6.3, the signal handler was always installed, to capture data at unusual process ends. Unfortunately, this introduced other problems (see `issue 1310`_). Now the signal handler is only used if you opt-in by setting ``[run] sigterm = true``. - Small changes to the HTML report: - Added links to next and previous file, and more keyboard shortcuts: ``[`` and ``]`` for next file and previous file; ``u`` for up to the index; and ``?`` to open/close the help panel. Thanks, `J. M. F. Tsang <pull 1364_>`_. - The timestamp and version are displayed at the top of the report. Thanks, `Ammar Askar <pull 1354_>`_. Closes `issue 1351`_. - A new debug option ``debug=sqldata`` adds more detail to ``debug=sql``, logging all the data being written to the database. - Previously, running ``coverage report`` (or any of the reporting commands) in an empty directory would create a .coverage data file. Now they do not, fixing `issue 1328`_. - On Python 3.11, the ``[toml]`` extra no longer installs tomli, instead using tomllib from the standard library. Thanks `Shantanu <pull 1359_>`_. - In-memory CoverageData objects now properly update(), closing `issue 1323`_. .. _issue 1310: nedbat/coveragepy#1310 .. _issue 1323: nedbat/coveragepy#1323 .. _issue 1328: nedbat/coveragepy#1328 .. _issue 1351: nedbat/coveragepy#1351 .. _pull 1354: nedbat/coveragepy#1354 .. _pull 1359: nedbat/coveragepy#1359 .. _pull 1364: nedbat/coveragepy#1364 .. _changes_633: Version 6.3.3 — 2022-05-12 -------------------------- - Fix: Coverage.py now builds successfully on CPython 3.11 (3.11.0b1) again. Closes `issue 1367`_. Some results for generators may have changed. .. _issue 1367: nedbat/coveragepy#1367 .. _changes_632: Version 6.3.2 — 2022-02-20 -------------------------- - Fix: adapt to pypy3.9's decorator tracing behavior. It now traces function decorators like CPython 3.8: both the @-line and the def-line are traced. Fixes `issue 1326`_. - Debug: added ``pybehave`` to the list of :ref:`coverage debug <cmd_debug>` and :ref:`cmd_run_debug` options. - Fix: show an intelligible error message if ``--concurrency=multiprocessing`` is used without a configuration file. Closes `issue 1320`_. .. _issue 1320: nedbat/coveragepy#1320 .. _issue 1326: nedbat/coveragepy#1326 .. _changes_631: Version 6.3.1 — 2022-02-01 -------------------------- - Fix: deadlocks could occur when terminating processes. Some of these deadlocks (described in `issue 1310`_) are now fixed. - Fix: a signal handler was being set from multiple threads, causing an error: "ValueError: signal only works in main thread". This is now fixed, closing `issue 1312`_. - Fix: ``--precision`` on the command-line was being ignored while considering ``--fail-under``. This is now fixed, thanks to `Marcelo Trylesinski <pull 1317_>`_. - Fix: releases no longer provide 3.11.0-alpha wheels. Coverage.py uses CPython internal fields which are moving during the alpha phase. Fixes `issue 1316`_. .. _issue 1310: nedbat/coveragepy#1310 .. _issue 1312: nedbat/coveragepy#1312 .. _issue 1316: nedbat/coveragepy#1316 .. _pull 1317: nedbat/coveragepy#1317 .. _changes_63: Version 6.3 — 2022-01-25 ------------------------ - Feature: Added the ``lcov`` command to generate reports in LCOV format. Thanks, `Bradley Burns <pull 1289_>`_. Closes issues `587 <issue 587_>`_ and `626 <issue 626_>`_. - Feature: the coverage data file can now be specified on the command line with the ``--data-file`` option in any command that reads or writes data. This is in addition to the existing ``COVERAGE_FILE`` environment variable. Closes `issue 624`_. Thanks, `Nikita Bloshchanevich <pull 1304_>`_. - Feature: coverage measurement data will now be written when a SIGTERM signal is received by the process. This includes :meth:`Process.terminate <python:multiprocessing.Process.terminate>`, and other ways to terminate a process. Currently this is only on Linux and Mac; Windows is not supported. Fixes `issue 1307`_. - Dropped support for Python 3.6, which reached end-of-life on 2021-12-23. - Updated Python 3.11 support to 3.11.0a4, fixing `issue 1294`_. - Fix: the coverage data file is now created in a more robust way, to avoid problems when multiple processes are trying to write data at once. Fixes issues `1303 <issue 1303_>`_ and `883 <issue 883_>`_. - Fix: a .gitignore file will only be written into the HTML report output directory if the directory is empty. This should prevent certain unfortunate accidents of writing the file where it is not wanted. - Releases now have MacOS arm64 wheels for Apple Silicon, fixing `issue 1288`_. .. _issue 587: nedbat/coveragepy#587 .. _issue 624: nedbat/coveragepy#624 .. _issue 626: nedbat/coveragepy#626 .. _issue 883: nedbat/coveragepy#883 .. _issue 1288: nedbat/coveragepy#1288 .. _issue 1294: nedbat/coveragepy#1294 .. _issue 1303: nedbat/coveragepy#1303 .. _issue 1307: nedbat/coveragepy#1307 .. _pull 1289: nedbat/coveragepy#1289 .. _pull 1304: nedbat/coveragepy#1304 .. _changes_62: Version 6.2 — 2021-11-26 ------------------------ - Feature: Now the ``--concurrency`` setting can now have a list of values, so that threads and another lightweight threading package can be measured together, such as ``--concurrency=gevent,thread``. Closes `issue 1012`_ and `issue 1082`_. - Fix: A module specified as the ``source`` setting is imported during startup, before the user program imports it. This could cause problems if the rest of the program isn't ready yet. For example, `issue 1203`_ describes a Django setting that is accessed before settings have been configured. Now the early import is wrapped in a try/except so errors then don't stop execution. - Fix: A colon in a decorator expression would cause an exclusion to end too early, preventing the exclusion of the decorated function. This is now fixed. - Fix: The HTML report now will not overwrite a .gitignore file that already exists in the HTML output directory (follow-on for `issue 1244`_). - API: The exceptions raised by Coverage.py have been specialized, to provide finer-grained catching of exceptions by third-party code. - API: Using ``suffix=False`` when constructing a Coverage object with multiprocessing wouldn't suppress the data file suffix (`issue 989`_). This is now fixed. - Debug: The ``coverage debug data`` command will now sniff out combinable data files, and report on all of them. - Debug: The ``coverage debug`` command used to accept a number of topics at a time, and show all of them, though this was never documented. This no longer works, to allow for command-line options in the future. .. _issue 989: nedbat/coveragepy#989 .. _issue 1012: nedbat/coveragepy#1012 .. _issue 1082: nedbat/coveragepy#1082 .. _issue 1203: nedbat/coveragepy#1203 .. _changes_612: Version 6.1.2 — 2021-11-10 -------------------------- - Python 3.11 is supported (tested with 3.11.0a2). One still-open issue has to do with `exits through with-statements <issue 1270_>`_. - Fix: When remapping file paths through the ``[paths]`` setting while combining, the ``[run] relative_files`` setting was ignored, resulting in absolute paths for remapped file names (`issue 1147`_). This is now fixed. - Fix: Complex conditionals over excluded lines could have incorrectly reported a missing branch (`issue 1271`_). This is now fixed. - Fix: More exceptions are now handled when trying to parse source files for reporting. Problems that used to terminate coverage.py can now be handled with ``[report] ignore_errors``. This helps with plugins failing to read files (`django_coverage_plugin issue 78`_). - Fix: Removed another vestige of jQuery from the source tarball (`issue 840`_). - Fix: Added a default value for a new-to-6.x argument of an internal class. This unsupported class is being used by coveralls (`issue 1273`_). Although I'd rather not "fix" unsupported interfaces, it's actually nicer with a default value. .. _django_coverage_plugin issue 78: nedbat/django_coverage_plugin#78 .. _issue 1147: nedbat/coveragepy#1147 .. _issue 1270: nedbat/coveragepy#1270 .. _issue 1271: nedbat/coveragepy#1271 .. _issue 1273: nedbat/coveragepy#1273 .. _changes_611: Version 6.1.1 — 2021-10-31 -------------------------- - Fix: The sticky header on the HTML report didn't work unless you had branch coverage enabled. This is now fixed: the sticky header works for everyone. (Do people still use coverage without branch measurement!? j/k) - Fix: When using explicitly declared namespace packages, the "already imported a file that will be measured" warning would be issued (`issue 888`_). This is now fixed. .. _issue 888: nedbat/coveragepy#888 .. _changes_61: Version 6.1 — 2021-10-30 ------------------------ - Deprecated: The ``annotate`` command and the ``Coverage.annotate`` function will be removed in a future version, unless people let me know that they are using it. Instead, the ``html`` command gives better-looking (and more accurate) output, and the ``report -m`` command will tell you line numbers of missing lines. Please get in touch if you have a reason to use ``annotate`` over those better options: [email protected]. - Feature: Coverage now sets an environment variable, ``COVERAGE_RUN`` when running your code with the ``coverage run`` command. The value is not important, and may change in the future. Closes `issue 553`_. - Feature: The HTML report pages for Python source files now have a sticky header so the file name and controls are always visible. - Feature: The ``xml`` and ``json`` commands now describe what they wrote where. - Feature: The ``html``, ``combine``, ``xml``, and ``json`` commands all accept a ``-q/--quiet`` option to suppress the messages they write to stdout about what they are doing (`issue 1254`_). - Feature: The ``html`` command writes a ``.gitignore`` file into the HTML output directory, to prevent the report from being committed to git. If you want to commit it, you will need to delete that file. Closes `issue 1244`_. - Feature: Added support for PyPy 3.8. - Fix: More generated code is now excluded from measurement. Code such as `attrs`_ boilerplate, or doctest code, was being measured though the synthetic line numbers meant they were never reported. Once Cython was involved though, the generated .so files were parsed as Python, raising syntax errors, as reported in `issue 1160`_. This is now fixed. - Fix: When sorting human-readable names, numeric components are sorted correctly: file10.py will appear after file9.py. This applies to file names, module names, environment variables, and test contexts. - Performance: Branch coverage measurement is faster, though you might only notice on code that is executed many times, such as long-running loops. - Build: jQuery is no longer used or vendored (`issue 840`_ and `issue 1118`_). Huge thanks to Nils Kattenbeck (septatrix) for the conversion to vanilla JavaScript in `pull request 1248`_. .. _issue 553: nedbat/coveragepy#553 .. _issue 840: nedbat/coveragepy#840 .. _issue 1118: nedbat/coveragepy#1118 .. _issue 1160: nedbat/coveragepy#1160 .. _issue 1244: nedbat/coveragepy#1244 .. _pull request 1248: nedbat/coveragepy#1248 .. _issue 1254: nedbat/coveragepy#1254 .. _attrs: https://www.attrs.org/ .. _changes_602: Version 6.0.2 — 2021-10-11 -------------------------- - Namespace packages being measured weren't properly handled by the new code that ignores third-party packages. If the namespace package was installed, it was ignored as a third-party package. That problem (`issue 1231`_) is now fixed. - Packages named as "source packages" (with ``source``, or ``source_pkgs``, or pytest-cov's ``--cov``) might have been only partially measured. Their top-level statements could be marked as unexecuted, because they were imported by coverage.py before measurement began (`issue 1232`_). This is now fixed, but the package will be imported twice, once by coverage.py, then again by your test suite. This could cause problems if importing the package has side effects. - The :meth:`.CoverageData.contexts_by_lineno` method was documented to return a dict, but was returning a defaultdict. Now it returns a plain dict. It also no longer returns negative numbered keys. .. _issue 1231: nedbat/coveragepy#1231 .. _issue 1232: nedbat/coveragepy#1232 .. _changes_601: Version 6.0.1 — 2021-10-06 -------------------------- - In 6.0, the coverage.py exceptions moved from coverage.misc to coverage.exceptions. These exceptions are not part of the public supported API, CoverageException is. But a number of other third-party packages were importing the exceptions from coverage.misc, so they are now available from there again (`issue 1226`_). - Changed an internal detail of how tomli is imported, so that tomli can use coverage.py for their own test suite (`issue 1228`_). - Defend against an obscure possibility under code obfuscation, where a function can have an argument called "self", but no local named "self" (`pull request 1210`_). Thanks, Ben Carlsson. .. _pull request 1210: nedbat/coveragepy#1210 .. _issue 1226: nedbat/coveragepy#1226 .. _issue 1228: nedbat/coveragepy#1228 .. _changes_60: Version 6.0 — 2021-10-03 ------------------------ - The ``coverage html`` command now prints a message indicating where the HTML report was written. Fixes `issue 1195`_. - The ``coverage combine`` command now prints messages indicating each data file being combined. Fixes `issue 1105`_. - The HTML report now includes a sentence about skipped files due to ``skip_covered`` or ``skip_empty`` settings. Fixes `issue 1163`_. - Unrecognized options in the configuration file are no longer errors. They are now warnings, to ease the use of coverage across versions. Fixes `issue 1035`_. - Fix handling of exceptions through context managers in Python 3.10. A missing exception is no longer considered a missing branch from the with statement. Fixes `issue 1205`_. - Fix another rarer instance of "Error binding parameter 0 - probably unsupported type." (`issue 1010`_). - Creating a directory for the coverage data file now is safer against conflicts when two coverage runs happen simultaneously (`pull 1220`_). Thanks, Clément Pit-Claudel. .. _issue 1035: nedbat/coveragepy#1035 .. _issue 1105: nedbat/coveragepy#1105 .. _issue 1163: nedbat/coveragepy#1163 .. _issue 1195: nedbat/coveragepy#1195 .. _issue 1205: nedbat/coveragepy#1205 .. _pull 1220: nedbat/coveragepy#1220 .. _changes_60b1: Version 6.0b1 — 2021-07-18 -------------------------- - Dropped support for Python 2.7, PyPy 2, and Python 3.5. - Added support for the Python 3.10 ``match/case`` syntax. - Data collection is now thread-safe. There may have been rare instances of exceptions raised in multi-threaded programs. - Plugins (like the `Django coverage plugin`_) were generating "Already imported a file that will be measured" warnings about Django itself. These have been fixed, closing `issue 1150`_. - Warnings generated by coverage.py are now real Python warnings. - Using ``--fail-under=100`` with coverage near 100% could result in the self-contradictory message :code:`total of 100 is less than fail-under=100`. This bug (`issue 1168`_) is now fixed. - The ``COVERAGE_DEBUG_FILE`` environment variable now accepts ``stdout`` and ``stderr`` to write to those destinations. - TOML parsing now uses the `tomli`_ library. - Some minor changes to usually invisible details of the HTML report: - Use a modern hash algorithm when fingerprinting, for high-security environments (`issue 1189`_). When generating the HTML report, we save the hash of the data, to avoid regenerating an unchanged HTML page. We used to use MD5 to generate the hash, and now use SHA-3-256. This was never a security concern, but security scanners would notice the MD5 algorithm and raise a false alarm. - Change how report file names are generated, to avoid leading underscores (`issue 1167`_), to avoid rare file name collisions (`issue 584`_), and to avoid file names becoming too long (`issue 580`_). .. _Django coverage plugin: https://pypi.org/project/django-coverage-plugin/ .. _issue 580: nedbat/coveragepy#580 .. _issue 584: nedbat/coveragepy#584 .. _issue 1150: nedbat/coveragepy#1150 .. _issue 1167: nedbat/coveragepy#1167 .. _issue 1168: nedbat/coveragepy#1168 .. _issue 1189: nedbat/coveragepy#1189 .. _tomli: https://pypi.org/project/tomli/ .. _changes_56b1: Version 5.6b1 — 2021-04-13 -------------------------- Note: 5.6 final was never released. These changes are part of 6.0. - Third-party packages are now ignored in coverage reporting. This solves a few problems: - Coverage will no longer report about other people's code (`issue 876`_). This is true even when using ``--source=.`` with a venv in the current directory. - Coverage will no longer generate "Already imported a file that will be measured" warnings about coverage itself (`issue 905`_). - The HTML report uses j/k to move up and down among the highlighted chunks of code. They used to highlight the current chunk, but 5.0 broke that behavior. Now the highlighting is working again. - The JSON report now includes ``percent_covered_display``, a string with the total percentage, rounded to the same number of decimal places as the other reports' totals. .. _issue 876: nedbat/coveragepy#876 .. _issue 905: nedbat/coveragepy#905
|
@matusvalo #1538 points out that this change has a performance impact. Can we try to understand more about why Cython needs this change when other situations don't? |
RobertCraigie
referenced
this pull request
in RobertCraigie/prisma-client-py
Feb 1, 2023
[](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [coverage](https://togithub.com/nedbat/coveragepy) | `==6.5.0` -> `==7.1.0` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | | [mkdocs-material](https://togithub.com/squidfunk/mkdocs-material) | `==8.5.11` -> `==9.0.9` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | | [mock](http://mock.readthedocs.org/en/latest/) ([source](https://togithub.com/testing-cabal/mock)) | `==4.0.3` -> `==5.0.1` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | | [pre-commit](https://togithub.com/pre-commit/pre-commit) | `==2.21.0` -> `==3.0.2` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes <details> <summary>nedbat/coveragepy</summary> ### [`v7.1.0`](https://togithub.com/nedbat/coveragepy/blob/HEAD/CHANGES.rst#Version-710--2023-01-24) [Compare Source](https://togithub.com/nedbat/coveragepy/compare/7.0.5...7.1.0) - Added: the debug output file can now be specified with `[run] debug_file` in the configuration file. Closes `issue 1319`\_. - Performance: fixed a slowdown with dynamic contexts that's been around since 6.4.3. The fix closes `issue 1538`*. Thankfully this doesn't break the `Cython change`* that fixed `issue 972`\_. Thanks to Mathieu Kniewallner for the deep investigative work and comprehensive issue report. - Typing: all product and test code has type annotations. .. \_Cython change:[https://github.com/nedbat/coveragepy/pull/1347](https://togithub.com/nedbat/coveragepy/pull/1347)7 .. \_issue 972[https://github.com/nedbat/coveragepy/issues/972](https://togithub.com/nedbat/coveragepy/issues/972)72 .. \_issue 131[https://github.com/nedbat/coveragepy/issues/1319](https://togithub.com/nedbat/coveragepy/issues/1319)319 .. \_issue 15[https://github.com/nedbat/coveragepy/issues/1538](https://togithub.com/nedbat/coveragepy/issues/1538)1538 .. \_changes\_7-0-5: ### [`v7.0.5`](https://togithub.com/nedbat/coveragepy/blob/HEAD/CHANGES.rst#Version-705--2023-01-10) [Compare Source](https://togithub.com/nedbat/coveragepy/compare/7.0.4...7.0.5) - Fix: On Python 3.7, a file with type annotations but no `from __future__ import annotations` would be missing statements in the coverage report. This is now fixed, closing `issue 1524`\_. .. \_issue 1524:[https://github.com/nedbat/coveragepy/issues/1524](https://togithub.com/nedbat/coveragepy/issues/1524)4 .. \_changes\_7-0-4: ### [`v7.0.4`](https://togithub.com/nedbat/coveragepy/blob/HEAD/CHANGES.rst#Version-704--2023-01-07) [Compare Source](https://togithub.com/nedbat/coveragepy/compare/7.0.3...7.0.4) - Performance: an internal cache of file names was accidentally disabled, resulting in sometimes drastic reductions in performance. This is now fixed, closing `issue 1527`\_. Thanks to Ivan Ciuvalschii for the reproducible test case. .. \_issue 1527:[https://github.com/nedbat/coveragepy/issues/1527](https://togithub.com/nedbat/coveragepy/issues/1527)7 .. \_changes\_7-0-3: ### [`v7.0.3`](https://togithub.com/nedbat/coveragepy/blob/HEAD/CHANGES.rst#Version-703--2023-01-03) [Compare Source](https://togithub.com/nedbat/coveragepy/compare/7.0.2...7.0.3) - Fix: when using pytest-cov or pytest-xdist, or perhaps both, the combining step could fail with `assert row is not None` using 7.0.2. This was due to a race condition that has always been possible and is still possible. In 7.0.1 and before, the error was silently swallowed by the combining code. Now it will produce a message "Couldn't combine data file" and ignore the data file as it used to do before 7.0.2. Closes `issue 1522`\_. .. \_issue 1522:[https://github.com/nedbat/coveragepy/issues/1522](https://togithub.com/nedbat/coveragepy/issues/1522)2 .. \_changes\_7-0-2: ### [`v7.0.2`](https://togithub.com/nedbat/coveragepy/blob/HEAD/CHANGES.rst#Version-702--2023-01-02) [Compare Source](https://togithub.com/nedbat/coveragepy/compare/7.0.1...7.0.2) - Fix: when using the `[run] relative_files = True` setting, a relative `[paths]` pattern was still being made absolute. This is now fixed, closing `issue 1519`\_. - Fix: if Python doesn't provide tomllib, then TOML configuration files can only be read if coverage.py is installed with the `[toml]` extra. Coverage.py will raise an error if TOML support is not installed when it sees your settings are in a .toml file. But it didn't understand that `[tools.coverage]` was a valid section header, so the error wasn't reported if you used that header, and settings were silently ignored. This is now fixed, closing `issue 1516`\_. - Fix: adjusted how decorators are traced on PyPy 7.3.10, fixing `issue 1515`\_. - Fix: the `coverage lcov` report did not properly implement the `--fail-under=MIN` option. This has been fixed. - Refactor: added many type annotations, including a number of refactorings. This should not affect outward behavior, but they were a bit invasive in some places, so keep your eyes peeled for oddities. - Refactor: removed the vestigial and long untested support for Jython and IronPython. .. \_issue 1515:[https://github.com/nedbat/coveragepy/issues/1515](https://togithub.com/nedbat/coveragepy/issues/1515)5 .. \_issue 1516[https://github.com/nedbat/coveragepy/issues/1516](https://togithub.com/nedbat/coveragepy/issues/1516)16 .. \_issue 151[https://github.com/nedbat/coveragepy/issues/1519](https://togithub.com/nedbat/coveragepy/issues/1519)519 .. \_changes\_7-0-1: ### [`v7.0.1`](https://togithub.com/nedbat/coveragepy/blob/HEAD/CHANGES.rst#Version-701--2022-12-23) [Compare Source](https://togithub.com/nedbat/coveragepy/compare/7.0.0...7.0.1) - When checking if a file mapping resolved to a file that exists, we weren't considering files in .whl files. This is now fixed, closing `issue 1511`\_. - File pattern rules were too strict, forbidding plus signs and curly braces in directory and file names. This is now fixed, closing `issue 1513`\_. - Unusual Unicode or control characters in source files could prevent reporting. This is now fixed, closing `issue 1512`\_. - The PyPy wheel now installs on PyPy 3.7, 3.8, and 3.9, closing `issue 1510`\_. .. \_issue 1510:[https://github.com/nedbat/coveragepy/issues/1510](https://togithub.com/nedbat/coveragepy/issues/1510)0 .. \_issue 1511[https://github.com/nedbat/coveragepy/issues/1511](https://togithub.com/nedbat/coveragepy/issues/1511)11 .. \_issue 151[https://github.com/nedbat/coveragepy/issues/1512](https://togithub.com/nedbat/coveragepy/issues/1512)512 .. \_issue 15[https://github.com/nedbat/coveragepy/issues/1513](https://togithub.com/nedbat/coveragepy/issues/1513)1513 .. \_changes\_7-0-0: ### [`v7.0.0`](https://togithub.com/nedbat/coveragepy/blob/HEAD/CHANGES.rst#Version-700--2022-12-18) [Compare Source](https://togithub.com/nedbat/coveragepy/compare/6.5.0...7.0.0) Nothing new beyond 7.0.0b1. .. \_changes\_7-0-0b1: </details> <details> <summary>squidfunk/mkdocs-material</summary> ### [`v9.0.9`](https://togithub.com/squidfunk/mkdocs-material/releases/tag/9.0.9): mkdocs-material-9.0.9 [Compare Source](https://togithub.com/squidfunk/mkdocs-material/compare/9.0.8...9.0.9) - Updated Bulgarian translations - Updated Chinese (Simplified) translations - Updated Dutch translations - Updated Hindi translations - Updated Japanese translations - Updated Polish translations ### [`v9.0.8`](https://togithub.com/squidfunk/mkdocs-material/releases/tag/9.0.8): mkdocs-material-9.0.8 [Compare Source](https://togithub.com/squidfunk/mkdocs-material/compare/9.0.7...9.0.8) - Updated Croatian translations - Updated French translations - Updated Hungarian translations - Updated Portuguese (Brasilian) translations - Updated Spanish translations - Updated Ukrainian translations - Updated Urdu translations - Updated Vietnamese translations ### [`v9.0.7`](https://togithub.com/squidfunk/mkdocs-material/releases/tag/9.0.7): mkdocs-material-9.0.7 [Compare Source](https://togithub.com/squidfunk/mkdocs-material/compare/9.0.6...9.0.7) - Improved accessibility of sidebar navigation - Moved all translations into community edition - Updated Polish and Portuguese (Brasilian) translations - Fixed info plugin terminating on subsequent reload when serving - Fixed [#​4910](https://togithub.com/squidfunk/mkdocs-material/issues/4910): Sidebar navigation labels have invalid ARIA roles - Fixed [#​4884](https://togithub.com/squidfunk/mkdocs-material/issues/4884): Search query terms can't be separated by colons ### [`v9.0.6`](https://togithub.com/squidfunk/mkdocs-material/releases/tag/9.0.6): mkdocs-material-9.0.6 [Compare Source](https://togithub.com/squidfunk/mkdocs-material/compare/9.0.5...9.0.6) - Fixed [#​4883](https://togithub.com/squidfunk/mkdocs-material/issues/4883): Automatically disable info plugin when serving - Fixed [#​4885](https://togithub.com/squidfunk/mkdocs-material/issues/4885): Search plugin crashes in some exotic cases (9.0.3 regression) ### [`v9.0.5`](https://togithub.com/squidfunk/mkdocs-material/releases/tag/9.0.5): mkdocs-material-9.0.5 [Compare Source](https://togithub.com/squidfunk/mkdocs-material/compare/9.0.4...9.0.5) - Fixed [#​4842](https://togithub.com/squidfunk/mkdocs-material/issues/4842): Improved accessibility of search result list ### [`v9.0.4`](https://togithub.com/squidfunk/mkdocs-material/releases/tag/9.0.4): mkdocs-material-9.0.4 [Compare Source](https://togithub.com/squidfunk/mkdocs-material/compare/9.0.3...9.0.4) - Fixed [#​4823](https://togithub.com/squidfunk/mkdocs-material/issues/4823): Improved contrast ratio in footer (9.0.2 regression) - Fixed [#​4832](https://togithub.com/squidfunk/mkdocs-material/issues/4832): Set navigation items back to black (9.0.3 regression) - Fixed [#​4843](https://togithub.com/squidfunk/mkdocs-material/issues/4843): Emojis broken due to `maxcdn.com` shutting down - Upgraded Python Markdown Extensions to 9.9.1 ### [`v9.0.3`](https://togithub.com/squidfunk/mkdocs-material/releases/tag/9.0.3): mkdocs-material-9.0.3 [Compare Source](https://togithub.com/squidfunk/mkdocs-material/compare/9.0.2...9.0.3) - Improved discernability of section index pages in navigation - Improved collapsing of adjacent whitespace in search plugin - Updated Indonesian translations - Fixed view source of this page button when edit URL points to blob - Fixed [#​4829](https://togithub.com/squidfunk/mkdocs-material/issues/4829): Search overlay does not close for active anchor result - Fixed [#​4824](https://togithub.com/squidfunk/mkdocs-material/issues/4824): Search plugin crashes for `h[1-6]` contained in other elements - Fixed [#​4804](https://togithub.com/squidfunk/mkdocs-material/issues/4804): Nested navigation items not expandable with keyboard - Fixed [#​4689](https://togithub.com/squidfunk/mkdocs-material/issues/4689): anchor tracking not working for anchors in tables - Upgraded to Mermaid 9.3.0 ### [`v9.0.2`](https://togithub.com/squidfunk/mkdocs-material/releases/tag/9.0.2): mkdocs-material-9.0.2 [Compare Source](https://togithub.com/squidfunk/mkdocs-material/compare/9.0.1...9.0.2) - Fixed [#​4823](https://togithub.com/squidfunk/mkdocs-material/issues/4823): Improved contrast ratio in footer to meet WCAG guidelines - Fixed [#​4819](https://togithub.com/squidfunk/mkdocs-material/issues/4819): Social plugin crashes when card generation is disabled - Fixed [#​4817](https://togithub.com/squidfunk/mkdocs-material/issues/4817): Search plugin crashes on numeric page titles in `nav` ### [`v9.0.1`](https://togithub.com/squidfunk/mkdocs-material/releases/tag/9.0.1): mkdocs-material-9.0.1 [Compare Source](https://togithub.com/squidfunk/mkdocs-material/compare/9.0.0...9.0.1) - Removed `pipdeptree` dependency for built-in info plugin - Fixed appearance of linked tags when hovered (9.0.0 regression) - Fixed [#​4810](https://togithub.com/squidfunk/mkdocs-material/issues/4810): Abbreviations run out of screen on touch devices - Fixed [#​4813](https://togithub.com/squidfunk/mkdocs-material/issues/4813): View source and edit button links are the same ### [`v9.0.0`](https://togithub.com/squidfunk/mkdocs-material/releases/tag/9.0.0): mkdocs-material-9.0.0 [Compare Source](https://togithub.com/squidfunk/mkdocs-material/compare/8.5.11...9.0.0) **Additions and improvements** - Added support for rich search previews - Added support for tokenizer lookahead - Added support for better search highlighting - Added support for excluding content from search - Added support for configurable search pipeline - Added support for offline search via offline plugin - Added support for multiple instances of built-in tags plugin - Added support for removing copy-to-clipboard button - Added support for removing footer navigation - Added support for button to view the source of a page - Improved readability of query string for search sharing - Improved stability of search plugin when using `--dirtyreload` - Improved search result group button, now sticky and stable - Updated Norwegian translations - Updated MkDocs to 1.4.2 **Removals** - Removed deprecated alternative admonition qualifiers - Removed `:is()` selectors (in output) for easier overriding - Removed `.title` suffix on translations - Removed legacy method for providing page title in feedback URL - Removed support for indexing only titles in search - Removed support for custom search transforms - Removed support for custom search workers - Removed temporary snow feature (easter egg) **Fixes** - Fixed Norwegian and Korean language code - Fixed detection of composition events in search interface - Fixed search plugin not using title set via front matter - Fixed search highlighting of tags - Fixed search sharing URL using post transformed string - Fixed theme-color meta tag getting out-of-sync with palette toggle - Fixed prev/next page keyboard navigation when footer is not present - Fixed overflowing navigation tabs not being scrollable - Fixed inclusion of code block line numbers from search </details> <details> <summary>testing-cabal/mock</summary> ### [`v5.0.1`](https://togithub.com/testing-cabal/mock/blob/HEAD/CHANGELOG.rst#​501) [Compare Source](https://togithub.com/testing-cabal/mock/compare/5.0.0...5.0.1) - [gh-100740](https://togithub.com/testing-cabal/mock/issues/100740): Fix `unittest.mock.Mock` not respecting the spec for attribute names prefixed with `assert`. - [gh-100690](https://togithub.com/testing-cabal/mock/issues/100690): `Mock` objects which are not unsafe will now raise an `AttributeError` when accessing an attribute that matches the name of an assertion but without the prefix `assert_`, e.g. accessing `called_once` instead of `assert_called_once`. This is in addition to this already happening for accessing attributes with prefixes `assert`, `assret`, `asert`, `aseert`, and `assrt`. - [gh-96127](https://togithub.com/testing-cabal/mock/issues/96127): `inspect.signature` was raising `TypeError` on call with mock objects. Now it correctly returns `(*args, **kwargs)` as infered signature. ### [`v5.0.0`](https://togithub.com/testing-cabal/mock/blob/HEAD/CHANGELOG.rst#​500) [Compare Source](https://togithub.com/testing-cabal/mock/compare/4.0.3...5.0.0) - [gh-98624](https://togithub.com/testing-cabal/mock/issues/98624): Add a mutex to unittest.mock.NonCallableMock to protect concurrent access to mock attributes. - bpo-43478: Mocks can no longer be used as the specs for other Mocks. As a result, an already-mocked object cannot have an attribute mocked using `autospec=True` or be the subject of a `create_autospec(...)` call. This can uncover bugs in tests since these Mock-derived Mocks will always pass certain tests (e.g. isinstance) and builtin assert functions (e.g. assert_called_once_with) will unconditionally pass. - bpo-45156: Fixes infinite loop on :func:`unittest.mock.seal` of mocks created by :func:`~unittest.create_autospec`. - bpo-41403: Make :meth:`mock.patch` raise a :exc:`TypeError` with a relevant error message on invalid arg. Previously it allowed a cryptic :exc:`AttributeError` to escape. - [gh-91803](https://togithub.com/testing-cabal/mock/issues/91803): Fix an error when using a method of objects mocked with :func:`unittest.mock.create_autospec` after it was sealed with :func:`unittest.mock.seal` function. - bpo-41877: AttributeError for suspected misspellings of assertions on mocks are now pointing out that the cause are misspelled assertions and also what to do if the misspelling is actually an intended attribute name. The unittest.mock document is also updated to reflect the current set of recognised misspellings. - bpo-43478: Mocks can no longer be provided as the specs for other Mocks. As a result, an already-mocked object cannot be passed to `mock.Mock()`. This can uncover bugs in tests since these Mock-derived Mocks will always pass certain tests (e.g. isinstance) and builtin assert functions (e.g. assert_called_once_with) will unconditionally pass. - bpo-45010: Remove support of special method `__div__` in :mod:`unittest.mock`. It is not used in Python 3. - [gh-84753](https://togithub.com/testing-cabal/mock/issues/84753): :func:`inspect.iscoroutinefunction` now properly returns `True` when an instance of :class:`unittest.mock.AsyncMock` is passed to it. This makes it consistent with behavior of :func:`asyncio.iscoroutinefunction`. Patch by Mehdi ABAAKOUK. - bpo-46852: Remove the undocumented private `float.__set_format__()` method, previously known as `float.__setformat__()` in Python 3.7. Its docstring said: "You probably don't want to use this function. It exists mainly to be used in Python's test suite." Patch by Victor Stinner. - [gh-98086](https://togithub.com/testing-cabal/mock/issues/98086): Make sure `patch.dict()` can be applied on async functions. - [gh-100287](https://togithub.com/testing-cabal/mock/issues/100287): Fix the interaction of :func:`unittest.mock.seal` with :class:`unittest.mock.AsyncMock`. - [gh-83076](https://togithub.com/testing-cabal/mock/issues/83076): Instantiation of `Mock()` and `AsyncMock()` is now 3.8x faster. - bpo-41877: A check is added against misspellings of autospect, auto_spec and set_spec being passed as arguments to patch, patch.object and create_autospec. </details> <details> <summary>pre-commit/pre-commit</summary> ### [`v3.0.2`](https://togithub.com/pre-commit/pre-commit/blob/HEAD/CHANGELOG.md#​302---2023-01-29) [Compare Source](https://togithub.com/pre-commit/pre-commit/compare/v3.0.1...v3.0.2) \================== ##### Fixes - Prevent local `Gemfile` from interfering with hook execution. - [#​2727](https://togithub.com/pre-commit/pre-commit/issues/2727) PR by [@​asottile](https://togithub.com/asottile). - Fix `language: r`, `repo: local` hooks - [pre-commit-ci/issues#​107](https://togithub.com/pre-commit-ci/issues/issues/107) by [@​lorenzwalthert](https://togithub.com/lorenzwalthert). - [#​2728](https://togithub.com/pre-commit/pre-commit/issues/2728) PR by [@​asottile](https://togithub.com/asottile). ### [`v3.0.1`](https://togithub.com/pre-commit/pre-commit/blob/HEAD/CHANGELOG.md#​301---2023-01-26) [Compare Source](https://togithub.com/pre-commit/pre-commit/compare/v3.0.0...v3.0.1) \================== ##### Fixes - Ensure coursier hooks are available offline after install. - [#​2723](https://togithub.com/pre-commit/pre-commit/issues/2723) PR by [@​asottile](https://togithub.com/asottile). ### [`v3.0.0`](https://togithub.com/pre-commit/pre-commit/blob/HEAD/CHANGELOG.md#​300---2023-01-23) [Compare Source](https://togithub.com/pre-commit/pre-commit/compare/v2.21.0...v3.0.0) \================== ##### Features - Make `language: golang` bootstrap `go` if not present. - [#​2651](https://togithub.com/pre-commit/pre-commit/issues/2651) PR by [@​taoufik07](https://togithub.com/taoufik07). - [#​2649](https://togithub.com/pre-commit/pre-commit/issues/2649) issue by [@​taoufik07](https://togithub.com/taoufik07). - `language: coursier` now supports `additional_dependencies` and `repo: local` - [#​2702](https://togithub.com/pre-commit/pre-commit/issues/2702) PR by [@​asottile](https://togithub.com/asottile). - Upgrade `ruby-build` to `20221225`. - [#​2718](https://togithub.com/pre-commit/pre-commit/issues/2718) PR by [@​jalessio](https://togithub.com/jalessio). ##### Fixes - Improve error message for invalid yaml for `pre-commit autoupdate`. - [#​2686](https://togithub.com/pre-commit/pre-commit/issues/2686) PR by [@​asottile](https://togithub.com/asottile). - [#​2685](https://togithub.com/pre-commit/pre-commit/issues/2685) issue by [@​CarstenGrohmann](https://togithub.com/CarstenGrohmann). - `repo: local` no longer provisions an empty `git` repo. - [#​2699](https://togithub.com/pre-commit/pre-commit/issues/2699) PR by [@​asottile](https://togithub.com/asottile). ##### Updating - Drop support for python<3.8 - [#​2655](https://togithub.com/pre-commit/pre-commit/issues/2655) PR by [@​asottile](https://togithub.com/asottile). - Drop support for top-level list, use `pre-commit migrate-config` to update. - [#​2656](https://togithub.com/pre-commit/pre-commit/issues/2656) PR by [@​asottile](https://togithub.com/asottile). - Drop support for `sha` to specify revision, use `pre-commit migrate-config` to update. - [#​2657](https://togithub.com/pre-commit/pre-commit/issues/2657) PR by [@​asottile](https://togithub.com/asottile). - Remove `pre-commit-validate-config` and `pre-commit-validate-manifest`, use `pre-commit validate-config` and `pre-commit validate-manifest` instead. - [#​2658](https://togithub.com/pre-commit/pre-commit/issues/2658) PR by [@​asottile](https://togithub.com/asottile). - `language: golang` hooks must use `go.mod` to specify dependencies - [#​2672](https://togithub.com/pre-commit/pre-commit/issues/2672) PR by [@​taoufik07](https://togithub.com/taoufik07). </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 👻 **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://togithub.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/RobertCraigie/prisma-client-py). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNC42Mi4xIiwidXBkYXRlZEluVmVyIjoiMzQuMTE5LjAifQ==--> --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Robert Craigie <[email protected]>
allenporter
referenced
this pull request
in allenporter/flux-local
Feb 6, 2023
[](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [coverage](https://togithub.com/nedbat/coveragepy) | `==6.4.2` -> `==7.1.0` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes <details> <summary>nedbat/coveragepy</summary> ### [`v7.1.0`](https://togithub.com/nedbat/coveragepy/blob/HEAD/CHANGES.rst#Version-710--2023-01-24) [Compare Source](https://togithub.com/nedbat/coveragepy/compare/7.0.5...7.1.0) - Added: the debug output file can now be specified with `[run] debug_file` in the configuration file. Closes `issue 1319`\_. - Performance: fixed a slowdown with dynamic contexts that's been around since 6.4.3. The fix closes `issue 1538`*. Thankfully this doesn't break the `Cython change`* that fixed `issue 972`\_. Thanks to Mathieu Kniewallner for the deep investigative work and comprehensive issue report. - Typing: all product and test code has type annotations. .. \_Cython change:[https://github.com/nedbat/coveragepy/pull/1347](https://togithub.com/nedbat/coveragepy/pull/1347)7 .. \_issue 972[https://github.com/nedbat/coveragepy/issues/972](https://togithub.com/nedbat/coveragepy/issues/972)72 .. \_issue 131[https://github.com/nedbat/coveragepy/issues/1319](https://togithub.com/nedbat/coveragepy/issues/1319)319 .. \_issue 15[https://github.com/nedbat/coveragepy/issues/1538](https://togithub.com/nedbat/coveragepy/issues/1538)1538 .. \_changes\_7-0-5: ### [`v7.0.5`](https://togithub.com/nedbat/coveragepy/blob/HEAD/CHANGES.rst#Version-705--2023-01-10) [Compare Source](https://togithub.com/nedbat/coveragepy/compare/7.0.4...7.0.5) - Fix: On Python 3.7, a file with type annotations but no `from __future__ import annotations` would be missing statements in the coverage report. This is now fixed, closing `issue 1524`\_. .. \_issue 1524:[https://github.com/nedbat/coveragepy/issues/1524](https://togithub.com/nedbat/coveragepy/issues/1524)4 .. \_changes\_7-0-4: ### [`v7.0.4`](https://togithub.com/nedbat/coveragepy/blob/HEAD/CHANGES.rst#Version-704--2023-01-07) [Compare Source](https://togithub.com/nedbat/coveragepy/compare/7.0.3...7.0.4) - Performance: an internal cache of file names was accidentally disabled, resulting in sometimes drastic reductions in performance. This is now fixed, closing `issue 1527`\_. Thanks to Ivan Ciuvalschii for the reproducible test case. .. \_issue 1527:[https://github.com/nedbat/coveragepy/issues/1527](https://togithub.com/nedbat/coveragepy/issues/1527)7 .. \_changes\_7-0-3: ### [`v7.0.3`](https://togithub.com/nedbat/coveragepy/blob/HEAD/CHANGES.rst#Version-703--2023-01-03) [Compare Source](https://togithub.com/nedbat/coveragepy/compare/7.0.2...7.0.3) - Fix: when using pytest-cov or pytest-xdist, or perhaps both, the combining step could fail with `assert row is not None` using 7.0.2. This was due to a race condition that has always been possible and is still possible. In 7.0.1 and before, the error was silently swallowed by the combining code. Now it will produce a message "Couldn't combine data file" and ignore the data file as it used to do before 7.0.2. Closes `issue 1522`\_. .. \_issue 1522:[https://github.com/nedbat/coveragepy/issues/1522](https://togithub.com/nedbat/coveragepy/issues/1522)2 .. \_changes\_7-0-2: ### [`v7.0.2`](https://togithub.com/nedbat/coveragepy/blob/HEAD/CHANGES.rst#Version-702--2023-01-02) [Compare Source](https://togithub.com/nedbat/coveragepy/compare/7.0.1...7.0.2) - Fix: when using the `[run] relative_files = True` setting, a relative `[paths]` pattern was still being made absolute. This is now fixed, closing `issue 1519`\_. - Fix: if Python doesn't provide tomllib, then TOML configuration files can only be read if coverage.py is installed with the `[toml]` extra. Coverage.py will raise an error if TOML support is not installed when it sees your settings are in a .toml file. But it didn't understand that `[tools.coverage]` was a valid section header, so the error wasn't reported if you used that header, and settings were silently ignored. This is now fixed, closing `issue 1516`\_. - Fix: adjusted how decorators are traced on PyPy 7.3.10, fixing `issue 1515`\_. - Fix: the `coverage lcov` report did not properly implement the `--fail-under=MIN` option. This has been fixed. - Refactor: added many type annotations, including a number of refactorings. This should not affect outward behavior, but they were a bit invasive in some places, so keep your eyes peeled for oddities. - Refactor: removed the vestigial and long untested support for Jython and IronPython. .. \_issue 1515:[https://github.com/nedbat/coveragepy/issues/1515](https://togithub.com/nedbat/coveragepy/issues/1515)5 .. \_issue 1516[https://github.com/nedbat/coveragepy/issues/1516](https://togithub.com/nedbat/coveragepy/issues/1516)16 .. \_issue 151[https://github.com/nedbat/coveragepy/issues/1519](https://togithub.com/nedbat/coveragepy/issues/1519)519 .. \_changes\_7-0-1: ### [`v7.0.1`](https://togithub.com/nedbat/coveragepy/blob/HEAD/CHANGES.rst#Version-701--2022-12-23) [Compare Source](https://togithub.com/nedbat/coveragepy/compare/7.0.0...7.0.1) - When checking if a file mapping resolved to a file that exists, we weren't considering files in .whl files. This is now fixed, closing `issue 1511`\_. - File pattern rules were too strict, forbidding plus signs and curly braces in directory and file names. This is now fixed, closing `issue 1513`\_. - Unusual Unicode or control characters in source files could prevent reporting. This is now fixed, closing `issue 1512`\_. - The PyPy wheel now installs on PyPy 3.7, 3.8, and 3.9, closing `issue 1510`\_. .. \_issue 1510:[https://github.com/nedbat/coveragepy/issues/1510](https://togithub.com/nedbat/coveragepy/issues/1510)0 .. \_issue 1511[https://github.com/nedbat/coveragepy/issues/1511](https://togithub.com/nedbat/coveragepy/issues/1511)11 .. \_issue 151[https://github.com/nedbat/coveragepy/issues/1512](https://togithub.com/nedbat/coveragepy/issues/1512)512 .. \_issue 15[https://github.com/nedbat/coveragepy/issues/1513](https://togithub.com/nedbat/coveragepy/issues/1513)1513 .. \_changes\_7-0-0: ### [`v7.0.0`](https://togithub.com/nedbat/coveragepy/blob/HEAD/CHANGES.rst#Version-700--2022-12-18) [Compare Source](https://togithub.com/nedbat/coveragepy/compare/6.5.0...7.0.0) Nothing new beyond 7.0.0b1. .. \_changes\_7-0-0b1: ### [`v6.5.0`](https://togithub.com/nedbat/coveragepy/blob/HEAD/CHANGES.rst#Version-650--2022-09-29) [Compare Source](https://togithub.com/nedbat/coveragepy/compare/6.4.4...6.5.0) - The JSON report now includes details of which branches were taken, and which are missing for each file. Thanks, `Christoph Blessing <pull 1438_>`*. Closes `issue 1425`*. - Starting with coverage.py 6.2, `class` statements were marked as a branch. This wasn't right, and has been reverted, fixing `issue 1449`\_. Note this will very slightly reduce your coverage total if you are measuring branch coverage. - Packaging is now compliant with `PEP 517`*, closing `issue 1395`*. - A new debug option `--debug=pathmap` shows details of the remapping of paths that happens during combine due to the `[paths]` setting. - Fix an internal problem with caching of invalid Python parsing. Found by OSS-Fuzz, fixing their `bug 50381`\_. .. \_bug 50381: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=50381 .. \_PEP 517: https://peps.python.org/pep-0517/ .. \_issue 139[https://github.com/nedbat/coveragepy/issues/1395](https://togithub.com/nedbat/coveragepy/issues/1395)395 .. \_issue 14[https://github.com/nedbat/coveragepy/issues/1425](https://togithub.com/nedbat/coveragepy/issues/1425)1425 .. \_issue 1[https://github.com/nedbat/coveragepy/issues/1449](https://togithub.com/nedbat/coveragepy/issues/1449)/1449 .. \_pull [https://github.com/nedbat/coveragepy/pull/1438](https://togithub.com/nedbat/coveragepy/pull/1438)l/1438 .. \_changes\_6-4-4: ### [`v6.4.4`](https://togithub.com/nedbat/coveragepy/blob/HEAD/CHANGES.rst#Version-644--2022-08-16) [Compare Source](https://togithub.com/nedbat/coveragepy/compare/6.4.3...6.4.4) - Wheels are now provided for Python 3.11. .. \_changes\_6-4-3: ### [`v6.4.3`](https://togithub.com/nedbat/coveragepy/blob/HEAD/CHANGES.rst#Version-643--2022-08-06) [Compare Source](https://togithub.com/nedbat/coveragepy/compare/6.4.2...6.4.3) - Fix a failure when combining data files if the file names contained glob-like patterns. Thanks, `Michael Krebs and Benjamin Schubert <pull 1405_>`\_. - Fix a messaging failure when combining Windows data files on a different drive than the current directory, closing `issue 1428`*. Thanks, `Lorenzo Micò <pull 1430_>`*. - Fix path calculations when running in the root directory, as you might do in a Docker container. Thanks `Arthur Rio <pull 1403_>`\_. - Filtering in the HTML report wouldn't work when reloading the index page. This is now fixed. Thanks, `Marc Legendre <pull 1413_>`\_. - Fix a problem with Cython code measurement, closing `issue 972`*. Thanks, `Matus Valo <pull 1347_>`*. .. \_issue 972:[https://github.com/nedbat/coveragepy/issues/972](https://togithub.com/nedbat/coveragepy/issues/972)2 .. \_issue 1428[https://github.com/nedbat/coveragepy/issues/1428](https://togithub.com/nedbat/coveragepy/issues/1428)28 .. \_pull 134[https://github.com/nedbat/coveragepy/pull/1347](https://togithub.com/nedbat/coveragepy/pull/1347)347 .. \_pull 14[https://github.com/nedbat/coveragepy/issues/1403](https://togithub.com/nedbat/coveragepy/issues/1403)1403 .. \_pull 1[https://github.com/nedbat/coveragepy/issues/1405](https://togithub.com/nedbat/coveragepy/issues/1405)/1405 .. \_pull [https://github.com/nedbat/coveragepy/issues/1413](https://togithub.com/nedbat/coveragepy/issues/1413)s/1413 .. \_pull[https://github.com/nedbat/coveragepy/pull/1430](https://togithub.com/nedbat/coveragepy/pull/1430)ll/1430 .. \_changes\_6-4-2: </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/allenporter/flux-local). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNC4xMjQuMiIsInVwZGF0ZWRJblZlciI6IjM0LjEyNC4yIn0=--> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
netbsd-srcmastr
pushed a commit
to NetBSD/pkgsrc
that referenced
this pull request
May 5, 2023
Version 7.2.5 — 2023-04-30 -------------------------- - Fix: ``html_report()`` could fail with an AttributeError on ``isatty`` if run in an unusual environment where sys.stdout had been replaced. This is now fixed. Version 7.2.4 — 2023-04-28 -------------------------- PyCon 2023 sprint fixes! - Fix: with ``relative_files = true``, specifying a specific file to include or omit wouldn't work correctly (`issue 1604`_). This is now fixed, with testing help by `Marc Gibbons <pull 1608_>`_. - Fix: the XML report would have an incorrect ``<source>`` element when using relative files and the source option ended with a slash (`issue 1541`_). This is now fixed, thanks to `Kevin Brown-Silva <pull 1608_>`_. - When the HTML report location is printed to the terminal, it's now a terminal-compatible URL, so that you can click the location to open the HTML file in your browser. Finishes `issue 1523`_ thanks to `Ricardo Newbery <pull 1613_>`_. - Docs: a new :ref:`Migrating page <migrating>` with details about how to migrate between major versions of coverage.py. It currently covers the wildcard changes in 7.x. Thanks, `Brian Grohe <pull 1610_>`_. .. _issue 1523: nedbat/coveragepy#1523 .. _issue 1541: nedbat/coveragepy#1541 .. _issue 1604: nedbat/coveragepy#1604 .. _pull 1608: nedbat/coveragepy#1608 .. _pull 1609: nedbat/coveragepy#1609 .. _pull 1610: nedbat/coveragepy#1610 .. _pull 1613: nedbat/coveragepy#1613 Version 7.2.3 — 2023-04-06 -------------------------- - Fix: the :ref:`config_run_sigterm` setting was meant to capture data if a process was terminated with a SIGTERM signal, but it didn't always. This was fixed thanks to `Lewis Gaul <pull 1600_>`_, closing `issue 1599`_. - Performance: HTML reports with context information are now much more compact. File sizes are typically as small as one-third the previous size, but can be dramatically smaller. This closes `issue 1584`_ thanks to `Oleh Krehel <pull 1587_>`_. - Development dependencies no longer use hashed pins, closing `issue 1592`_. .. _issue 1584: nedbat/coveragepy#1584 .. _pull 1587: nedbat/coveragepy#1587 .. _issue 1592: nedbat/coveragepy#1592 .. _issue 1599: nedbat/coveragepy#1599 .. _pull 1600: nedbat/coveragepy#1600 Version 7.2.2 — 2023-03-16 -------------------------- - Fix: if a virtualenv was created inside a source directory, and a sourced package was installed inside the virtualenv, then all of the third-party packages inside the virtualenv would be measured. This was incorrect, but has now been fixed: only the specified packages will be measured, thanks to `Manuel Jacob <pull 1560_>`_. - Fix: the ``coverage lcov`` command could create a .lcov file with incorrect LF (lines found) and LH (lines hit) totals. This is now fixed, thanks to `Ian Moore <pull 1583_>`_. - Fix: the ``coverage xml`` command on Windows could create a .xml file with duplicate ``<package>`` elements. This is now fixed, thanks to `Benjamin Parzella <pull 1574_>`_, closing `issue 1573`_. .. _pull 1560: nedbat/coveragepy#1560 .. _issue 1573: nedbat/coveragepy#1573 .. _pull 1574: nedbat/coveragepy#1574 .. _pull 1583: nedbat/coveragepy#1583 Version 7.2.1 — 2023-02-26 -------------------------- - Fix: the PyPI page had broken links to documentation pages, but no longer does, closing `issue 1566`_. - Fix: public members of the coverage module are now properly indicated so that mypy will find them, fixing `issue 1564`_. .. _issue 1564: nedbat/coveragepy#1564 .. _issue 1566: nedbat/coveragepy#1566 Version 7.2.0 — 2023-02-22 -------------------------- - Added a new setting ``[report] exclude_also`` to let you add more exclusions without overwriting the defaults. Thanks, `Alpha Chen <pull 1557_>`_, closing `issue 1391`_. - Added a :meth:`.CoverageData.purge_files` method to remove recorded data for a particular file. Contributed by `Stephan Deibel <pull 1547_>`_. - Fix: when reporting commands fail, they will no longer congratulate themselves with messages like "Wrote XML report to file.xml" before spewing a traceback about their failure. - Fix: arguments in the public API that name file paths now accept pathlib.Path objects. This includes the ``data_file`` and ``config_file`` arguments to the Coverage constructor and the ``basename`` argument to CoverageData. Closes `issue 1552`_. - Fix: In some embedded environments, an IndexError could occur on stop() when the originating thread exits before completion. This is now fixed, thanks to `Russell Keith-Magee <pull 1543_>`_, closing `issue 1542`_. - Added a ``py.typed`` file to announce our type-hintedness. Thanks, `KotlinIsland <pull 1550_>`_. .. _issue 1391: nedbat/coveragepy#1391 .. _issue 1542: nedbat/coveragepy#1542 .. _pull 1543: nedbat/coveragepy#1543 .. _pull 1547: nedbat/coveragepy#1547 .. _pull 1550: nedbat/coveragepy#1550 .. _issue 1552: nedbat/coveragepy#1552 .. _pull 1557: nedbat/coveragepy#1557 Version 7.1.0 — 2023-01-24 -------------------------- - Added: the debug output file can now be specified with ``[run] debug_file`` in the configuration file. Closes `issue 1319`_. - Performance: fixed a slowdown with dynamic contexts that's been around since 6.4.3. The fix closes `issue 1538`_. Thankfully this doesn't break the `Cython change`_ that fixed `issue 972`_. Thanks to Mathieu Kniewallner for the deep investigative work and comprehensive issue report. - Typing: all product and test code has type annotations. .. _Cython change: nedbat/coveragepy#1347 .. _issue 972: nedbat/coveragepy#972 .. _issue 1319: nedbat/coveragepy#1319 .. _issue 1538: nedbat/coveragepy#1538 Version 7.0.5 — 2023-01-10 -------------------------- - Fix: On Python 3.7, a file with type annotations but no ``from __future__ import annotations`` would be missing statements in the coverage report. This is now fixed, closing `issue 1524`_. .. _issue 1524: nedbat/coveragepy#1524 Version 7.0.4 — 2023-01-07 -------------------------- - Performance: an internal cache of file names was accidentally disabled, resulting in sometimes drastic reductions in performance. This is now fixed, closing `issue 1527`_. Thanks to Ivan Ciuvalschii for the reproducible test case. .. _issue 1527: nedbat/coveragepy#1527 Version 7.0.3 — 2023-01-03 -------------------------- - Fix: when using pytest-cov or pytest-xdist, or perhaps both, the combining step could fail with ``assert row is not None`` using 7.0.2. This was due to a race condition that has always been possible and is still possible. In 7.0.1 and before, the error was silently swallowed by the combining code. Now it will produce a message "Couldn't combine data file" and ignore the data file as it used to do before 7.0.2. Closes `issue 1522`_. .. _issue 1522: nedbat/coveragepy#1522 Version 7.0.2 — 2023-01-02 -------------------------- - Fix: when using the ``[run] relative_files = True`` setting, a relative ``[paths]`` pattern was still being made absolute. This is now fixed, closing `issue 1519`_. - Fix: if Python doesn't provide tomllib, then TOML configuration files can only be read if coverage.py is installed with the ``[toml]`` extra. Coverage.py will raise an error if TOML support is not installed when it sees your settings are in a .toml file. But it didn't understand that ``[tools.coverage]`` was a valid section header, so the error wasn't reported if you used that header, and settings were silently ignored. This is now fixed, closing `issue 1516`_. - Fix: adjusted how decorators are traced on PyPy 7.3.10, fixing `issue 1515`_. - Fix: the ``coverage lcov`` report did not properly implement the ``--fail-under=MIN`` option. This has been fixed. - Refactor: added many type annotations, including a number of refactorings. This should not affect outward behavior, but they were a bit invasive in some places, so keep your eyes peeled for oddities. - Refactor: removed the vestigial and long untested support for Jython and IronPython. .. _issue 1515: nedbat/coveragepy#1515 .. _issue 1516: nedbat/coveragepy#1516 .. _issue 1519: nedbat/coveragepy#1519 Version 7.0.1 — 2022-12-23 -------------------------- - When checking if a file mapping resolved to a file that exists, we weren't considering files in .whl files. This is now fixed, closing `issue 1511`_. - File pattern rules were too strict, forbidding plus signs and curly braces in directory and file names. This is now fixed, closing `issue 1513`_. - Unusual Unicode or control characters in source files could prevent reporting. This is now fixed, closing `issue 1512`_. - The PyPy wheel now installs on PyPy 3.7, 3.8, and 3.9, closing `issue 1510`_. .. _issue 1510: nedbat/coveragepy#1510 .. _issue 1511: nedbat/coveragepy#1511 .. _issue 1512: nedbat/coveragepy#1512 .. _issue 1513: nedbat/coveragepy#1513 Version 7.0.0 — 2022-12-18 -------------------------- Nothing new beyond 7.0.0b1. Version 7.0.0b1 — 2022-12-03 ---------------------------- A number of changes have been made to file path handling, including pattern matching and path remapping with the ``[paths]`` setting (see :ref:`config_paths`). These changes might affect you, and require you to update your settings. (This release includes the changes from `6.6.0b1 <changes_6-6-0b1_>`_, since 6.6.0 was never released.) - Changes to file pattern matching, which might require updating your configuration: - Previously, ``*`` would incorrectly match directory separators, making precise matching difficult. This is now fixed, closing `issue 1407`_. - Now ``**`` matches any number of nested directories, including none. - Improvements to combining data files when using the :ref:`config_run_relative_files` setting, which might require updating your configuration: - During ``coverage combine``, relative file paths are implicitly combined without needing a ``[paths]`` configuration setting. This also fixed `issue 991`_. - A ``[paths]`` setting like ``*/foo`` will now match ``foo/bar.py`` so that relative file paths can be combined more easily. - The :ref:`config_run_relative_files` setting is properly interpreted in more places, fixing `issue 1280`_. - When remapping file paths with ``[paths]``, a path will be remapped only if the resulting path exists. The documentation has long said the prefix had to exist, but it was never enforced. This fixes `issue 608`_, improves `issue 649`_, and closes `issue 757`_. - Reporting operations now implicitly use the ``[paths]`` setting to remap file paths within a single data file. Combining multiple files still requires the ``coverage combine`` step, but this simplifies some single-file situations. Closes `issue 1212`_ and `issue 713`_. - The ``coverage report`` command now has a ``--format=`` option. The original style is now ``--format=text``, and is the default. - Using ``--format=markdown`` will write the table in Markdown format, thanks to `Steve Oswald <pull 1479_>`_, closing `issue 1418`_. - Using ``--format=total`` will write a single total number to the output. This can be useful for making badges or writing status updates. - Combining data files with ``coverage combine`` now hashes the data files to skip files that add no new information. This can reduce the time needed. Many details affect the speed-up, but for coverage.py's own test suite, combining is about 40% faster. Closes `issue 1483`_. - When searching for completely un-executed files, coverage.py uses the presence of ``__init__.py`` files to determine which directories have source that could have been imported. However, `implicit namespace packages`_ don't require ``__init__.py``. A new setting ``[report] include_namespace_packages`` tells coverage.py to consider these directories during reporting. Thanks to `Felix Horvat <pull 1387_>`_ for the contribution. Closes `issue 1383`_ and `issue 1024`_. - Fixed environment variable expansion in pyproject.toml files. It was overly broad, causing errors outside of coverage.py settings, as described in `issue 1481`_ and `issue 1345`_. This is now fixed, but in rare cases will require changing your pyproject.toml to quote non-string values that use environment substitution. - An empty file has a coverage total of 100%, but used to fail with ``--fail-under``. This has been fixed, closing `issue 1470`_. - The text report table no longer writes out two separator lines if there are no files listed in the table. One is plenty. - Fixed a mis-measurement of a strange use of wildcard alternatives in match/case statements, closing `issue 1421`_. - Fixed internal logic that prevented coverage.py from running on implementations other than CPython or PyPy (`issue 1474`_). - The deprecated ``[run] note`` setting has been completely removed. .. _implicit namespace packages: https://peps.python.org/pep-0420/ .. _issue 608: nedbat/coveragepy#608 .. _issue 649: nedbat/coveragepy#649 .. _issue 713: nedbat/coveragepy#713 .. _issue 757: nedbat/coveragepy#757 .. _issue 991: nedbat/coveragepy#991 .. _issue 1024: nedbat/coveragepy#1024 .. _issue 1212: nedbat/coveragepy#1212 .. _issue 1280: nedbat/coveragepy#1280 .. _issue 1345: nedbat/coveragepy#1345 .. _issue 1383: nedbat/coveragepy#1383 .. _issue 1407: nedbat/coveragepy#1407 .. _issue 1418: nedbat/coveragepy#1418 .. _issue 1421: nedbat/coveragepy#1421 .. _issue 1470: nedbat/coveragepy#1470 .. _issue 1474: nedbat/coveragepy#1474 .. _issue 1481: nedbat/coveragepy#1481 .. _issue 1483: nedbat/coveragepy#1483 .. _pull 1387: nedbat/coveragepy#1387 .. _pull 1479: nedbat/coveragepy#1479 Version 6.6.0b1 — 2022-10-31 ---------------------------- (Note: 6.6.0 final was never released. These changes are part of `7.0.0b1 <changes_7-0-0b1_>`_.) - Changes to file pattern matching, which might require updating your configuration: - Previously, ``*`` would incorrectly match directory separators, making precise matching difficult. This is now fixed, closing `issue 1407`_. - Now ``**`` matches any number of nested directories, including none. - Improvements to combining data files when using the :ref:`config_run_relative_files` setting: - During ``coverage combine``, relative file paths are implicitly combined without needing a ``[paths]`` configuration setting. This also fixed `issue 991`_. - A ``[paths]`` setting like ``*/foo`` will now match ``foo/bar.py`` so that relative file paths can be combined more easily. - The setting is properly interpreted in more places, fixing `issue 1280`_. - Fixed environment variable expansion in pyproject.toml files. It was overly broad, causing errors outside of coverage.py settings, as described in `issue 1481`_ and `issue 1345`_. This is now fixed, but in rare cases will require changing your pyproject.toml to quote non-string values that use environment substitution. - Fixed internal logic that prevented coverage.py from running on implementations other than CPython or PyPy (`issue 1474`_). .. _issue 991: nedbat/coveragepy#991 .. _issue 1280: nedbat/coveragepy#1280 .. _issue 1345: nedbat/coveragepy#1345 .. _issue 1407: nedbat/coveragepy#1407 .. _issue 1474: nedbat/coveragepy#1474 .. _issue 1481: nedbat/coveragepy#1481
andersk
added a commit
to andersk/coveragepy
that referenced
this pull request
May 23, 2023
This reverts commit f54428f (nedbat#1347), which was a big regression in performance and file sizes when using dynamic_context, and is no longer needed for nedbat#972 as of 4cc3292 (nedbat#1538). Fixes nedbat#1586. Signed-off-by: Anders Kaseorg <[email protected]>
nedbat
pushed a commit
to andersk/coveragepy
that referenced
this pull request
May 29, 2023
](https://renovatebot.com){kind=link}
This reverts commit f54428f (nedbat#1347), which was a big regression in performance and file sizes when using dynamic_context, and is no longer needed for nedbat#972 as of 4cc3292 (nedbat#1538). Fixes nedbat#1586. Signed-off-by: Anders Kaseorg <[email protected]>
nedbat
added a commit
that referenced
this pull request
May 29, 2023
* Revert "Map also empty dictionaries to file" This reverts commit f54428f (#1347), which was a big regression in performance and file sizes when using dynamic_context, and is no longer needed for #972 as of 4cc3292 (#1538). Fixes #1586. Signed-off-by: Anders Kaseorg <[email protected]> * docs: details of the fix in pull #1629, fixing #1586. --------- Signed-off-by: Anders Kaseorg <[email protected]> Co-authored-by: Ned Batchelder <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR fixes issues with Cython coverage plugin - see cython/cython#3515.
This PR partialy reverts commit 106828c which introduces this issue.
Fixes #972