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

Jump to bottom

[hailtop] Fix defaulting to hail.is when the user has no deploy-config #13585

Merged
merged 2 commits into from
Sep 7, 2023
Merged

[hailtop] Fix defaulting to hail.is when the user has no deploy-config #13585

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b3656c2
[hailtop] Fix defaulting to hail.is when the user has no deploy-confi…
daniel-goldstein Sep 7, 2023
6ab26dd
make changelog updates
daniel-goldstein Sep 7, 2023
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 hail/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ BRANCH := $(shell git rev-parse --abbrev-ref HEAD)
SCALA_VERSION ?= 2.12.15
SPARK_VERSION ?= 3.3.0
HAIL_MAJOR_MINOR_VERSION := 0.2
HAIL_PATCH_VERSION := 121
HAIL_PATCH_VERSION := 122
HAIL_PIP_VERSION := $(HAIL_MAJOR_MINOR_VERSION).$(HAIL_PATCH_VERSION)
HAIL_VERSION := $(HAIL_PIP_VERSION)-$(SHORT_REVISION)
ELASTIC_MAJOR_VERSION ?= 7
Expand Down
9 changes: 9 additions & 0 deletions hail/python/hail/docs/change_log.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,15 @@ supports.
policy. Their functionality or even existence may change without notice. Please contact us if you
critically depend on experimental functionality.**

## Version 0.2.122

Released 2023-09-07

### Bug Fixes
- (hail#13585) Fix bug introduced in 0.2.121 where Query-on-Batch
users could not make requests to `batch.hail.is` without a domain configuration
set.

## Version 0.2.121

Released 2023-08-31
Expand Down
5 changes: 5 additions & 0 deletions hail/python/hailtop/batch/docs/change_log.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@ versions. In particular, Hail officially supports:
Change Log
==========

**Version 0.2.122**

- (`#13565 <https://github.com/hail-is/hail/pull/13565>`__) Users can now use VEP images from the `hailgenetics` DockerHub
in Hail Batch.

**Version 0.2.121**

- (`#13396 <https://github.com/hail-is/hail/pull/13396>`__) Non-spot instances can be requested via the :meth:`.Job.spot` method.
Expand Down
4 changes: 1 addition & 3 deletions hail/python/hailtop/config/deploy_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ def env_var_or_default(name: str, defaults: Dict[str, str]) -> str:
class DeployConfig:
@staticmethod
def from_config(config: Dict[str, str]) -> 'DeployConfig':
if 'domain' not in config:
config['domain'] = 'hail.is'
return DeployConfig(
env_var_or_default('location', config),
env_var_or_default('default_namespace', config),
Expand Down Expand Up @@ -48,7 +46,7 @@ def from_config_file(config_file=None) -> 'DeployConfig':
config = {
'location': 'external',
'default_namespace': 'default',
'domain': get_user_config().get('global', 'domain', fallback=None),
'domain': get_user_config().get('global', 'domain', fallback='hail.is'),
}
return DeployConfig.from_config(config)

Expand Down