Skip to content

Commit

Permalink
fix: Use shutil.copytree over setuptools._distutils (#2518)
Browse files Browse the repository at this point in the history
* As setuptools is not the build backend there should be no reliance on
  setuptools or distutils for use. This exchanges
  setuptools._distutils.dir_util.copy_tree for shutil.copytree with
  dirs_exist_ok=True as pyhf supports Python 3.8+.
  • Loading branch information
matthewfeickert authored Jun 17, 2024
1 parent e8789a2 commit a0caf31
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions tests/conftest.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import json
import pathlib
import shutil
import sys
import tarfile

import pytest
from setuptools._distutils import dir_util

import pyhf

Expand Down Expand Up @@ -164,9 +164,6 @@ def datadir(tmp_path, request):
test_dir = pathlib.Path(request.module.__file__).with_suffix('')

if test_dir.is_dir():
dir_util.copy_tree(test_dir, str(tmp_path))
# shutil is nicer, but doesn't work: https://bugs.python.org/issue20849
# Once pyhf is Python 3.8+ only then the below can be used.
# shutil.copytree(test_dir, tmp_path)
shutil.copytree(test_dir, tmp_path, dirs_exist_ok=True)

return tmp_path

0 comments on commit a0caf31

Please sign in to comment.