Skip to content

feat(data-pipelines): allow pinning of hail in requirements #1554

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.

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

Merged
merged 3 commits into from
May 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/deploy-scripts-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- name: Setup Python
uses: actions/setup-python@v2
with:
python-version: 3.7
python-version: 3.9
- name: Use pip cache
uses: actions/cache@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion data-pipeline/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
elasticsearch~=7.17
hail
hail==0.2.127
tqdm
loguru
attrs
Expand Down
17 changes: 17 additions & 0 deletions deploy/deployctl/subcommands/dataproc_cluster.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import subprocess
import sys
import typing
import importlib.metadata

from deployctl.config import config

Expand All @@ -24,6 +25,22 @@ def start_cluster(name: str, cluster_args: typing.List[str]) -> None:
raise RuntimeError("project configuration is required")

with open(os.path.join(DATA_PIPELINE_DIRECTORY, "requirements.txt")) as requirements_file:
requirements_hail_version = next(
(line.strip().split("==")[1] for line in requirements_file if line.strip().startswith("hail==")), None
)
try:
local_hail_version = importlib.metadata.version("hail")
except importlib.metadata.PackageNotFoundError as package_not_found:
raise RuntimeError("Hail must be installed locally") from package_not_found

if not requirements_hail_version:
raise RuntimeError("Hail must be pinned in data-pipeline/requirements.txt")
if requirements_hail_version != local_hail_version:
raise RuntimeError(
f"Local hail version differs from version pinned in data-pipeline/requirements.txt\nRequired version {requirements_hail_version}\nLocal version {local_hail_version}"
)

requirements_file.seek(0)
requirements = [line.strip() for line in requirements_file.readlines()]

subprocess.check_output(
Expand Down
2 changes: 1 addition & 1 deletion requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
black==22.3.0 # This should be kept in sync with the version in .pre-commit-config.yaml
pylint==2.6.0
pylint==2.7.1
Loading