Skip to content

Commit

Permalink
Merge pull request #104 from sot/use_github_latest
Browse files Browse the repository at this point in the history
Use github's 'latest' release link for latest version
  • Loading branch information
taldcroft authored Nov 13, 2020
2 parents 175ec9c + bec0321 commit 31d66ad
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions xija/get_model_spec.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

REPO_PATH = Path(os.environ['SKA'], 'data', 'chandra_models')
MODELS_PATH = REPO_PATH / 'chandra_models' / 'xija'
CHANDRA_MODELS_URL = 'https://api.github.com/repos/sot/chandra_models/releases'
CHANDRA_MODELS_LATEST_URL = 'https://api.github.com/repos/sot/chandra_models/releases/latest'


def _models_path(repo_path=REPO_PATH) -> Path:
Expand Down Expand Up @@ -205,7 +205,7 @@ def get_repo_version(repo_path: Path = REPO_PATH) -> str:
return tag_repo.name


def get_github_version(url: str = CHANDRA_MODELS_URL,
def get_github_version(url: str = CHANDRA_MODELS_LATEST_URL,
timeout: Union[int, float] = 5) -> Optional[bool]:
"""Get latest chandra_models GitHub repo release tag (version).
Expand All @@ -214,7 +214,7 @@ def get_github_version(url: str = CHANDRA_MODELS_URL,
Parameters
----------
url : str
URL for chandra_models releases on GitHub API
URL for latest chandra_models release on GitHub API
timeout : int, float
Request timeout (sec, default=5)
Expand All @@ -232,7 +232,6 @@ def get_github_version(url: str = CHANDRA_MODELS_URL,
if req.status_code != requests.codes.ok:
req.raise_for_status()

tags_gh = sorted(req.json(), key=lambda tag: tag['published_at'])
tag_gh_name = tags_gh[-1]['tag_name']
page_json = req.json()
return page_json['tag_name']

return tag_gh_name

0 comments on commit 31d66ad

Please sign in to comment.