explosion/spaCy
1
1
Fork 0
mirror of https://github.com/explosion/spaCy.git synced 2025-08-02 19:30:19 +03:00
Code Issues Packages Projects Releases Wiki Activity

Move permissions fixes to general make_tempdir implementation

Browse Source
This commit is contained in:
Paul O'Leary McCann 2023-01-24 19:04:31 +09:00
parent 7268c4b94d
commit 13fe001b15
2 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
spacy/tests/test_cli_app.py
View File

@ -1,11 +1,8 @@
import os import os
from pathlib import Path from pathlib import Path
import pytest import pytest
import shutil
import srsly import srsly
import stat
from typer.testing import CliRunner from typer.testing import CliRunner
import tempfile
from spacy.cli._util import app from spacy.cli._util import app
from .util import make_tempdir from .util import make_tempdir
@ -104,23 +101,12 @@ def test_project_run(project_dir):
def test_project_clone(): def test_project_clone():
# Git clones create some readonly/hidden files. On Windows, trying to with make_tempdir() as workspace:
# delete these gives an error, so we have to handle that specially.
workspace = Path(tempfile.mkdtemp())
def _fix_perms(func, path, exc_info):
os.chmod(path, stat.S_IWUSR)
func(path)
try:
out = workspace / "project" out = workspace / "project"
target = "benchmarks/ner_conll03" target = "benchmarks/ner_conll03"
result = CliRunner().invoke(app, ["project", "clone", target, str(out)]) result = CliRunner().invoke(app, ["project", "clone", target, str(out)])
assert result.exit_code == 0 assert result.exit_code == 0
assert (out / "README.md").is_file() assert (out / "README.md").is_file()
finally:
shutil.rmtree(str(workspace), ignore_errors=False, onerror=_fix_perms)
def test_project_push_pull(project_dir): def test_project_push_pull(project_dir):

12
spacy/util.py
View File

@ -32,6 +32,7 @@ import inspect
import pkgutil import pkgutil
import logging import logging
import socket import socket
import stat
try: try:
import cupy.random import cupy.random
@ -1032,9 +1033,18 @@ def make_tempdir() -> Generator[Path, None, None]:
YIELDS (Path): The path of the temp directory. YIELDS (Path): The path of the temp directory.
""" """
d = Path(tempfile.mkdtemp()) d = Path(tempfile.mkdtemp())
# On Windows, attempts to delete a git directory fail with permissions
# errors due to read only / hidden files. This mainly addresses that issue.
def _fix_perms(func, path, exc_info):
# IWUSR = give user write permission
os.chmod(path, stat.S_IWUSR)
# func is the function that gave the error, so it behaves like rmtree.
func(path)
yield d yield d
try: try:
shutil.rmtree(str(d)) shutil.rmtree(str(d), ignore_errors=False, onerror=_fix_perms)
except PermissionError as e: except PermissionError as e:
warnings.warn(Warnings.W091.format(dir=d, msg=e)) warnings.warn(Warnings.W091.format(dir=d, msg=e))