From 84f6026d700757a3b267e6cebd768126bf0684ab Mon Sep 17 00:00:00 2001 From: Ned Batchelder Date: Sun, 30 Jan 2022 14:29:50 -0500 Subject: [PATCH 1/5] build: windows 3.11.0a4 started failing to save the pip cache --- .github/workflows/testsuite.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/testsuite.yml b/.github/workflows/testsuite.yml index 84d4fe39a..aaf52fa39 100644 --- a/.github/workflows/testsuite.yml +++ b/.github/workflows/testsuite.yml @@ -55,8 +55,8 @@ jobs: uses: "actions/setup-python@v2" with: python-version: "${{ matrix.python-version }}" - cache: pip - cache-dependency-path: 'requirements/*.pip' + #cache: pip + #cache-dependency-path: 'requirements/*.pip' - name: "Install dependencies" run: | From d20151cef484e731ca821868523d108c30b73fd3 Mon Sep 17 00:00:00 2001 From: Marcelo Trylesinski Date: Tue, 1 Feb 2022 14:21:50 +0100 Subject: [PATCH 2/5] Fix precision argument when using cmd --- coverage/cmdline.py | 11 ++++++----- tests/test_cmdline.py | 11 +++++++---- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/coverage/cmdline.py b/coverage/cmdline.py index d5f8e6f31..a6244ebd7 100644 --- a/coverage/cmdline.py +++ b/coverage/cmdline.py @@ -4,7 +4,7 @@ """Command-line support for coverage.py.""" import glob -import optparse # pylint: disable=deprecated-module +import optparse # pylint: disable=deprecated-module import os import os.path import shlex @@ -13,14 +13,13 @@ import traceback import coverage -from coverage import Coverage -from coverage import env +from coverage import Coverage, env from coverage.collector import CTracer from coverage.config import CoverageConfig from coverage.control import DEFAULT_DATAFILE from coverage.data import combinable_files, debug_data_file from coverage.debug import info_formatter, info_header, short_stack -from coverage.exceptions import _BaseCoverageException, _ExceptionDuringRun, NoSource +from coverage.exceptions import NoSource, _BaseCoverageException, _ExceptionDuringRun from coverage.execfile import PyRunner from coverage.results import Numbers, should_fail_under @@ -731,6 +730,8 @@ def command_line(self, argv): # value, so we can get fail_under from the config file. if options.fail_under is not None: self.coverage.set_option("report:fail_under", options.fail_under) + if options.precision is not None: + self.coverage.set_option("report:precision", options.precision) fail_under = self.coverage.get_option("report:fail_under") precision = self.coverage.get_option("report:precision") @@ -969,7 +970,7 @@ def main(argv=None): # $set_env.py: COVERAGE_PROFILE - Set to use ox_profile. _profile = os.environ.get("COVERAGE_PROFILE", "") if _profile: # pragma: debugging - from ox_profile.core.launchers import SimpleLauncher # pylint: disable=import-error + from ox_profile.core.launchers import SimpleLauncher # pylint: disable=import-error original_main = main def main(argv=None): # pylint: disable=function-redefined diff --git a/tests/test_cmdline.py b/tests/test_cmdline.py index a10bdc5f0..f2a54f3c9 100644 --- a/tests/test_cmdline.py +++ b/tests/test_cmdline.py @@ -7,19 +7,18 @@ import re import sys import textwrap - from unittest import mock + import pytest import coverage import coverage.cmdline from coverage import env -from coverage.control import DEFAULT_DATAFILE from coverage.config import CoverageConfig +from coverage.control import DEFAULT_DATAFILE from coverage.exceptions import _ExceptionDuringRun from coverage.version import __url__ - -from tests.coveragetest import CoverageTest, OK, ERR, command_line +from tests.coveragetest import ERR, OK, CoverageTest, command_line from tests.helpers import os_sep @@ -1136,9 +1135,13 @@ def lcov_report(self, *args_unused, **kwargs_unused): ((20, 30, 40, 50, 60), 61, "lcov", 2), # Command-line overrides configuration. ((20, 30, 40, 50, 60), 19, "report --fail-under=21", 2), + # Precision defined + ((20, 30, 40, 50, 60), None, "report --fail-under=20.1 --precision=1", 2), + ((20, 30, 40, 50, 60), None, "report --fail-under=19.9 --precision=1", 0), ]) def test_fail_under(results, fail_under, cmd, ret): cov = CoverageReportingFake(*results) + print(cov.report_result) if fail_under is not None: cov.set_option("report:fail_under", fail_under) with mock.patch("coverage.cmdline.Coverage", lambda *a,**kw: cov): From 34ac77fe0dfb0dbeef447e2878519c79ce2b7cf4 Mon Sep 17 00:00:00 2001 From: Marcelo Trylesinski Date: Tue, 1 Feb 2022 14:22:42 +0100 Subject: [PATCH 3/5] Remove print --- tests/test_cmdline.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/test_cmdline.py b/tests/test_cmdline.py index f2a54f3c9..5f92f93fb 100644 --- a/tests/test_cmdline.py +++ b/tests/test_cmdline.py @@ -1141,7 +1141,6 @@ def lcov_report(self, *args_unused, **kwargs_unused): ]) def test_fail_under(results, fail_under, cmd, ret): cov = CoverageReportingFake(*results) - print(cov.report_result) if fail_under is not None: cov.set_option("report:fail_under", fail_under) with mock.patch("coverage.cmdline.Coverage", lambda *a,**kw: cov): From b69b5ce6986c575030df788c90ae532035d06fed Mon Sep 17 00:00:00 2001 From: Marcelo Trylesinski Date: Tue, 1 Feb 2022 14:26:38 +0100 Subject: [PATCH 4/5] Remove isort things --- coverage/cmdline.py | 9 +++++---- tests/test_cmdline.py | 7 ++++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/coverage/cmdline.py b/coverage/cmdline.py index a6244ebd7..bc8d60c40 100644 --- a/coverage/cmdline.py +++ b/coverage/cmdline.py @@ -4,7 +4,7 @@ """Command-line support for coverage.py.""" import glob -import optparse # pylint: disable=deprecated-module +import optparse # pylint: disable=deprecated-module import os import os.path import shlex @@ -13,13 +13,14 @@ import traceback import coverage -from coverage import Coverage, env +from coverage import Coverage +from coverage import env from coverage.collector import CTracer from coverage.config import CoverageConfig from coverage.control import DEFAULT_DATAFILE from coverage.data import combinable_files, debug_data_file from coverage.debug import info_formatter, info_header, short_stack -from coverage.exceptions import NoSource, _BaseCoverageException, _ExceptionDuringRun +from coverage.exceptions import _BaseCoverageException, _ExceptionDuringRun, NoSource from coverage.execfile import PyRunner from coverage.results import Numbers, should_fail_under @@ -970,7 +971,7 @@ def main(argv=None): # $set_env.py: COVERAGE_PROFILE - Set to use ox_profile. _profile = os.environ.get("COVERAGE_PROFILE", "") if _profile: # pragma: debugging - from ox_profile.core.launchers import SimpleLauncher # pylint: disable=import-error + from ox_profile.core.launchers import SimpleLauncher # pylint: disable=import-error original_main = main def main(argv=None): # pylint: disable=function-redefined diff --git a/tests/test_cmdline.py b/tests/test_cmdline.py index 5f92f93fb..d4fe830a4 100644 --- a/tests/test_cmdline.py +++ b/tests/test_cmdline.py @@ -7,18 +7,19 @@ import re import sys import textwrap -from unittest import mock +from unittest import mock import pytest import coverage import coverage.cmdline from coverage import env -from coverage.config import CoverageConfig from coverage.control import DEFAULT_DATAFILE +from coverage.config import CoverageConfig from coverage.exceptions import _ExceptionDuringRun from coverage.version import __url__ -from tests.coveragetest import ERR, OK, CoverageTest, command_line + +from tests.coveragetest import CoverageTest, OK, ERR, command_line from tests.helpers import os_sep From 8a796d4569f58aa2c2806473f90794443e52eed7 Mon Sep 17 00:00:00 2001 From: Marcelo Trylesinski Date: Tue, 1 Feb 2022 14:27:07 +0100 Subject: [PATCH 5/5] last isort... --- coverage/cmdline.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coverage/cmdline.py b/coverage/cmdline.py index bc8d60c40..4c8508013 100644 --- a/coverage/cmdline.py +++ b/coverage/cmdline.py @@ -4,7 +4,7 @@ """Command-line support for coverage.py.""" import glob -import optparse # pylint: disable=deprecated-module +import optparse # pylint: disable=deprecated-module import os import os.path import shlex