diff options
| author | Matthieu Darbois <mayeut@users.noreply.github.com> | 2023-03-18 13:29:15 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-18 13:29:15 +0100 |
| commit | dc4f7f50e859144c1092a6c225949c536072ea64 (patch) | |
| tree | 56353e8be46193f84f1c13c081e8f51108aafe08 | |
| parent | 1aa9bc838a7dbc96c40d9ffef712308205caa7e8 (diff) | |
| download | psutil-dc4f7f50e859144c1092a6c225949c536072ea64.tar.gz | |
CI: fix TestScripts tests failing due to ambiguous SCRIPTS_DIR (#2211)
Tests are being run with psutil installed in a virtual environment
within cibuildwheel builds.
The scripts folder is not being found in this installation & thus,
those tests are skipped.
This commit allows to pass the path of the scripts folder through
an environment variable & re-enables those tests.
Signed-off-by: mayeut <mayeut@users.noreply.github.com>
| -rw-r--r-- | psutil/tests/__init__.py | 5 | ||||
| -rw-r--r-- | pyproject.toml | 13 |
2 files changed, 6 insertions, 12 deletions
diff --git a/psutil/tests/__init__.py b/psutil/tests/__init__.py index f66ff813..61a06e21 100644 --- a/psutil/tests/__init__.py +++ b/psutil/tests/__init__.py @@ -198,7 +198,10 @@ ASCII_FS = sys.getfilesystemencoding().lower() in ('ascii', 'us-ascii') ROOT_DIR = os.path.realpath( os.path.join(os.path.dirname(__file__), '..', '..')) -SCRIPTS_DIR = os.path.join(ROOT_DIR, 'scripts') +SCRIPTS_DIR = os.environ.get( + "PSUTIL_SCRIPTS_DIR", + os.path.join(ROOT_DIR, 'scripts') +) HERE = os.path.realpath(os.path.dirname(__file__)) # --- support diff --git a/pyproject.toml b/pyproject.toml index 7f3b43d5..435cc989 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -42,8 +42,8 @@ build-backend = "setuptools.build_meta" skip = ["pp*", "*-musllinux*"] test-extras = "test" test-command = [ - "PYTHONWARNINGS=always PYTHONUNBUFFERED=1 PSUTIL_DEBUG=1 python {project}/psutil/tests/runner.py", - "PYTHONWARNINGS=always PYTHONUNBUFFERED=1 PSUTIL_DEBUG=1 python {project}/psutil/tests/test_memleaks.py" + "env PYTHONWARNINGS=always PYTHONUNBUFFERED=1 PSUTIL_DEBUG=1 PSUTIL_SCRIPTS_DIR={project}/scripts python {project}/psutil/tests/runner.py", + "env PYTHONWARNINGS=always PYTHONUNBUFFERED=1 PSUTIL_DEBUG=1 PSUTIL_SCRIPTS_DIR={project}/scripts python {project}/psutil/tests/test_memleaks.py" ] [tool.cibuildwheel.macos] @@ -54,12 +54,3 @@ archs = ["x86_64", "arm64"] # restrict build & tests to cp36 # cp36-abi3 wheels will need to be tested outside cibuildwheel for python>=3.7 build = "cp36-*" -test-command = [ - "python {project}/psutil/tests/runner.py", - "python {project}/psutil/tests/test_memleaks.py" -] - -[tool.cibuildwheel.windows.environment] -PYTHONWARNINGS = "always" -PYTHONUNBUFFERED = "1" -PSUTIL_DEBUG = "1" |