Skip to content

Commit bffda9c

Browse files
committed
[query] remove references to HailContext.version
1 parent 482ee1a commit bffda9c

File tree

3 files changed

+4
-9
lines changed

3 files changed

+4
-9
lines changed

hail/hail/src/is/hail/HailContext.scala

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ object HailContext {
6262

6363
theContext = new HailContext(backend)
6464

65-
info(s"Running Hail version ${theContext.version}")
65+
info(s"Running Hail version $HAIL_PRETTY_VERSION")
6666

6767
theContext
6868
}
@@ -80,8 +80,6 @@ class HailContext private (
8080
) {
8181
def stop(): Unit = HailContext.stop()
8282

83-
def version: String = is.hail.HAIL_PRETTY_VERSION
84-
8583
private[this] def fileAndLineCounts(
8684
fs: FS,
8785
regex: String,

hail/hail/src/is/hail/utils/package.scala

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,7 @@ import java.security.SecureRandom
1919
import java.text.SimpleDateFormat
2020
import java.util
2121
import java.util.{Base64, Date}
22-
import java.util.concurrent.{
23-
AbstractExecutorService, Callable, CancellationException, ExecutorCompletionService,
24-
ExecutorService, RunnableFuture, TimeUnit,
25-
}
22+
import java.util.concurrent._
2623
import java.util.concurrent.atomic.AtomicBoolean
2724

2825
import com.google.common.util.concurrent.AbstractFuture
@@ -851,7 +848,7 @@ package object utils
851848
using(new OutputStreamWriter(fs.create(path + "/README.txt"))) { out =>
852849
out.write(
853850
s"""This folder comprises a Hail (www.hail.is) native Table or MatrixTable.
854-
| Written with version ${HailContext.get.version}
851+
| Written with version $HAIL_PRETTY_VERSION
855852
| Created at ${dateFormat.format(new Date())}""".stripMargin
856853
)
857854
}

hail/python/hail/backend/py4j_backend.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ def decode_bytearray(encoded):
210210
# Maybe it does its own patch?
211211
install_exception_handler()
212212

213-
jar_version = self._jhc.version()
213+
jar_version = scala_package_object(self._hail_package).HAIL_PRETTY_VERSION()
214214
if jar_version != __version__:
215215
raise RuntimeError(
216216
f"Hail version mismatch between JAR and Python library\n"

0 commit comments

Comments
 (0)