pool/python-coverage
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Add change__file__report-dir.patch to fix another issue repored

Browse Source 
in gh#nedbat/coveragepy#1161.

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-coverage?expand=0&rev=94
This commit is contained in:
Matej Cepl 2021-05-12 09:30:53 +00:00 committed by Git OBS Bridge
parent 84b70b73d2
commit 8196418c29
3 changed files with 47 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
change__file__report-dir.patch Normal file
View File

@ -0,0 +1,36 @@
From 01cbb8751f98e5a7de79699444cbc03647691616 Mon Sep 17 00:00:00 2001
From: Ned Batchelder <ned@nedbatchelder.com>
Date: Tue, 11 May 2021 19:32:32 -0400
Subject: [PATCH] fix: Python 3.8.10 changed how __file__ is reported when
running directories
---
coverage/execfile.py | 5 +++++
tests/test_process.py | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
--- a/coverage/execfile.py
+++ b/coverage/execfile.py
@@ -176,6 +176,11 @@ class PyRunner(object):
# directory.
for ext in [".py", ".pyc", ".pyo"]:
try_filename = os.path.join(self.arg0, "__main__" + ext)
+ # 3.8.10 changed how files are reported when running a
+ # directory. But I'm not sure how far this change is going to
+ # spread, so I'll just hard-code it here for now.
+ if env.PYVERSION >= (3, 8, 10):
+ try_filename = os.path.abspath(try_filename)
if os.path.exists(try_filename):
self.arg0 = try_filename
break
--- a/tests/test_process.py
+++ b/tests/test_process.py
@@ -852,7 +852,7 @@ class EnvironmentTest(CoverageTest):
expected = re_lines(expected, r'\s+"argv0":', match=False)
actual = re_lines(actual, r'\s+"argv0":', match=False)
- assert expected == actual
+ assert actual == expected
def test_coverage_run_is_like_python(self):
with open(TRY_EXECFILE) as f:

6
python-coverage.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed May 12 09:29:03 UTC 2021 - Matej Cepl <mcepl@suse.com>
- Add change__file__report-dir.patch to fix another issue repored
in gh#nedbat/coveragepy#1161.
-------------------------------------------------------------------
Tue May 11 10:44:16 UTC 2021 - Antonio Larrosa <alarrosa@suse.com>

6
python-coverage.spec
View File

@ -27,8 +27,12 @@ Source: https://files.pythonhosted.org/packages/source/c/coverage/covera
# PATCH-FIX-UPSTREAM traced_file_absolute.patch gh#nedbat/coveragepy#1161 mcepl@suse.com
# traced file names seem to be absolute now?
Patch0: traced_file_absolute.patch
# PATCH-FIX-UPSTREAM 0001-make-data-collection-operations-thread-safe.patch alarrosa@suse.com -- Make data collection operations thread safe
# PATCH-FIX-UPSTREAM 0001-make-data-collection-operations-thread-safe.patch gh#nedbat/coveragepy#commit-e36b42e2db46 alarrosa@suse.com
# Make data collection operations thread safe
Patch1: 0001-make-data-collection-operations-thread-safe.patch
# PATCH-FIX-UPSTREAM change__file__report-dir.patch gh#nedbat/coveragepy#1161 mcepl@suse.com
# Fix yet another regression in Python 3.8.10, this time about __file__ value for directories.
Patch0: change__file__report-dir.patch
BuildRequires: %{python_module devel}
BuildRequires: %{python_module flaky}
BuildRequires: %{python_module hypothesis >= 4.57}