From 1684e2f4d37cccb8ae3f406e52e90a7618f9d573 Mon Sep 17 00:00:00 2001 From: David Anthoff Date: Tue, 5 Mar 2019 21:10:28 -0800 Subject: [PATCH] Remove JULIA_HOME env var for julia 1.0+ --- repo2docker/buildpacks/julia/julia_project.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/repo2docker/buildpacks/julia/julia_project.py b/repo2docker/buildpacks/julia/julia_project.py index 0cc058cc..67d96b8a 100644 --- a/repo2docker/buildpacks/julia/julia_project.py +++ b/repo2docker/buildpacks/julia/julia_project.py @@ -49,7 +49,7 @@ class JuliaProjectTomlBuildPack(PythonBuildPack): a string of the environment setting: - `JULIA_PATH`: base path where all Julia Binaries and libraries will be installed - - `JULIA_HOME`: path where all Julia Binaries will be installed + - `JULIA_BINDIR`: path where all Julia Binaries will be installed - `JULIA_PKGDIR`: path where all Julia libraries will be installed - `JULIA_DEPOT_PATH`: path where Julia libraries are installed. Similar to JULIA_PKGDIR, used in 1.0. @@ -62,10 +62,9 @@ class JuliaProjectTomlBuildPack(PythonBuildPack): """ return super().get_build_env() + [ ('JULIA_PATH', '${APP_BASE}/julia'), - ('JULIA_HOME', '${JULIA_PATH}/bin'), # julia <= 0.6 - ('JULIA_BINDIR', '${JULIA_HOME}'), # julia >= 0.7 + ('JULIA_BINDIR', '${JULIA_PATH}/bin'), ('JULIA_PKGDIR', '${JULIA_PATH}/pkg'), - ('JULIA_DEPOT_PATH', '${JULIA_PKGDIR}'), # julia >= 0.7 + ('JULIA_DEPOT_PATH', '${JULIA_PKGDIR}'), ('JULIA_VERSION', self.julia_version), ('JUPYTER', '${NB_PYTHON_PREFIX}/bin/jupyter') ] @@ -78,7 +77,7 @@ class JuliaProjectTomlBuildPack(PythonBuildPack): executable is added to the list. """ - return super().get_path() + ['${JULIA_HOME}'] + return super().get_path() + ['${JULIA_BINDIR}'] def get_build_scripts(self): """