diff --git a/batch/Makefile b/batch/Makefile index c024438bde4..8c55d350ef8 100644 --- a/batch/Makefile +++ b/batch/Makefile @@ -9,7 +9,7 @@ BATCH_DRIVER_NGINX_IMAGE := $(DOCKER_PREFIX)/batch-driver-nginx:$(TOKEN) EXTRA_PYTHONPATH := ../hail/python:../gear:../web_common PYTHON := PYTHONPATH=$${PYTHONPATH:+$${PYTHONPATH}:}$(EXTRA_PYTHONPATH) python3 -CLOUD := $(shell kubectl get secret global-config --template={{.data.cloud}} | base64 --decode) +CLOUD := azure BLACK := $(PYTHON) -m black . --line-length=120 --skip-string-normalization diff --git a/config.mk b/config.mk index e09f35bde89..6a899166b21 100644 --- a/config.mk +++ b/config.mk @@ -1,5 +1,5 @@ -DOCKER_PREFIX := $(shell kubectl get secret global-config --template={{.data.docker_prefix}} | base64 --decode) -DOMAIN := $(shell kubectl get secret global-config --template={{.data.domain}} | base64 --decode) +DOCKER_PREFIX := hailazureterradev.azurecr.io +DOMAIN := hail.fake ifeq ($(NAMESPACE),default) SCOPE = deploy diff --git a/hail/python/hail/backend/service_backend.py b/hail/python/hail/backend/service_backend.py index 1a2c33a51f2..eb7c84eacaa 100644 --- a/hail/python/hail/backend/service_backend.py +++ b/hail/python/hail/backend/service_backend.py @@ -34,7 +34,6 @@ from ..fs.router_fs import RouterFS from ..ir import BaseIR from ..context import version -from ..utils import frozendict log = logging.getLogger('backend.service_backend') @@ -727,7 +726,7 @@ def set_flags(self, **flags: str): self.flags.update(flags) def get_flags(self, *flags) -> Mapping[str, str]: - return frozendict(self.flags) + return {flag: self.flags.get(flag) for flag in flags} @property def requires_lowering(self): diff --git a/hail/python/test/hail/test_context.py b/hail/python/test/hail/test_context.py index b2645ae9405..68e8200f546 100644 --- a/hail/python/test/hail/test_context.py +++ b/hail/python/test/hail/test_context.py @@ -29,3 +29,7 @@ def test_top_level_functions_are_do_not_error(self): def test_tmpdir_runs(self): isinstance(hl.tmp_dir(), str) + + def test_get_flags(self): + assert hl._get_flags() == {} + assert list(hl._get_flags('use_new_shuffle')) == ['use_new_shuffle']