Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix get_model_spec to work on Windows #102

Merged
merged 1 commit into from
Oct 30, 2020
Merged

Fix get_model_spec to work on Windows #102

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 30 additions & 10 deletions xija/get_model_spec.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
"""
import json
import tempfile
import contextlib
import shutil
import platform
import os
import re
import warnings
Expand All @@ -26,6 +29,19 @@ def _models_path(repo_path=REPO_PATH) -> Path:
return Path(repo_path) / 'chandra_models' / 'xija'


@contextlib.contextmanager
def temp_directory():
"""Get name of a temporary directory that is deleted at the end.

Like tempfile.TemporaryDirectory but without the bug that it fails to
remove read-only files within the temp dir. Git repos can have read-only
files. https://bugs.python.org/issue26660.
"""
tmpdir = tempfile.mkdtemp()
yield tmpdir
shutil.rmtree(tmpdir, ignore_errors=True)


def get_xija_model_spec(model_name, version=None, repo_path=REPO_PATH,
check_version=False, timeout=5) -> dict:
"""
Expand Down Expand Up @@ -79,7 +95,7 @@ def get_xija_model_spec(model_name, version=None, repo_path=REPO_PATH,
dict, str
Xija model specification dict, chandra_models version
"""
with tempfile.TemporaryDirectory() as repo_path_local:
with temp_directory() as repo_path_local:
repo = git.Repo.clone_from(repo_path, repo_path_local)
if version is not None:
repo.git.checkout(version)
Expand Down Expand Up @@ -172,15 +188,19 @@ def get_repo_version(repo_path: Path = REPO_PATH) -> str:
str
Version (most recent tag) of models repository
"""
repo = git.Repo(repo_path)

if repo.is_dirty():
raise ValueError('repo is dirty')

tags = sorted(repo.tags, key=lambda tag: tag.commit.committed_datetime)
tag_repo = tags[-1]
if tag_repo.commit != repo.head.commit:
raise ValueError(f'repo tip is not at tag {tag_repo}')
with temp_directory() as repo_path_local:
if platform.system() == 'Windows':
repo = git.Repo.clone_from(repo_path, repo_path_local)
else:
repo = git.Repo(repo_path)

if repo.is_dirty():
raise ValueError('repo is dirty')

tags = sorted(repo.tags, key=lambda tag: tag.commit.committed_datetime)
tag_repo = tags[-1]
if tag_repo.commit != repo.head.commit:
raise ValueError(f'repo tip is not at tag {tag_repo}')

return tag_repo.name

Expand Down