diff options
author | Ronny Pfannschmidt <opensource@ronnypfannschmidt.de> | 2020-01-25 15:55:38 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-01-25 15:55:38 +0100 |
commit | 01a245b3fd6df38bb37b906c32490089a167950c (patch) | |
tree | b1a3c9721d694fb20611a380521ee79d80826387 | |
parent | 0df34c7c3cecb8409d22a2a45d958457c30fbfde (diff) | |
parent | d6497906d52dc3ffd013c17114546a3a51be6bcd (diff) | |
download | setuptools-scm-01a245b3fd6df38bb37b906c32490089a167950c.tar.gz |
Merge pull request #404 from TheTripleV/fix-403
#Fix 403: Close file descriptor before terminating process
-rw-r--r-- | src/setuptools_scm/file_finder_git.py | 1 | ||||
-rw-r--r-- | testing/test_git.py | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/setuptools_scm/file_finder_git.py b/src/setuptools_scm/file_finder_git.py index 651e76c..8b81d2c 100644 --- a/src/setuptools_scm/file_finder_git.py +++ b/src/setuptools_scm/file_finder_git.py @@ -50,6 +50,7 @@ def _git_ls_files_and_dirs(toplevel): return _git_interpret_archive(proc.stdout, toplevel) finally: # ensure we avoid resource warnings by cleaning up the process + proc.stdout.close() proc.terminate() except Exception: if proc.wait() != 0: diff --git a/testing/test_git.py b/testing/test_git.py index 240415b..337efdd 100644 --- a/testing/test_git.py +++ b/testing/test_git.py @@ -46,6 +46,7 @@ setup(use_scm_version={"root": "../..", @pytest.mark.issue("https://github.com/pypa/setuptools_scm/issues/298") +@pytest.mark.issue(403) def test_file_finder_no_history(wd, caplog): file_list = git_find_files(str(wd.cwd)) assert file_list == [] |