Merge pull request #1216 from frankier/julia-binder-dir-project-toml

Create Julia projects based on binder/Project.toml when found

Author: consideRatio

repo2docker/buildpacks/julia/julia_project.py

@@ -93,8 +93,15 @@ def get_build_env(self):
             ("JUPYTER_DATA_DIR", "${NB_PYTHON_PREFIX}/share/jupyter"),
         ]
 
+    @property
+    def project_dir(self):
+        if self.binder_dir:
+            return "${REPO_DIR}/" + self.binder_dir
+        else:
+            return "${REPO_DIR}"
+
     def get_env(self):
-        return super().get_env() + [("JULIA_PROJECT", "${REPO_DIR}")]
+        return super().get_env() + [("JULIA_PROJECT", self.project_dir)]
 
     def get_path(self):
         """Adds path to Julia binaries to user's PATH.
@@ -148,15 +155,19 @@ def get_assemble_scripts(self):
         The parent, CondaBuildPack, will add the build steps for
         any needed Python packages found in environment.yml.
         """
-        return super().get_assemble_scripts() + [
+        scripts = super().get_assemble_scripts()
+        scripts.append(
             (
                 "${NB_USER}",
                 r"""
-                JULIA_PROJECT="" julia -e "using Pkg; Pkg.add(\"IJulia\"); using IJulia; installkernel(\"Julia\", \"--project=${REPO_DIR}\");" && \
-                julia --project=${REPO_DIR} -e 'using Pkg; Pkg.instantiate(); Pkg.resolve(); pkg"precompile"'
-                """,
+            JULIA_PROJECT="" julia -e "using Pkg; Pkg.add(\"IJulia\"); using IJulia; installkernel(\"Julia\", \"--project={project}\");" && \
+            julia --project={project} -e 'using Pkg; Pkg.instantiate(); Pkg.resolve(); pkg"precompile"'
+            """.format(
+                    project=self.project_dir
+                ),
             )
-        ]
+        )
+        return scripts
 
     def detect(self):
         """

tests/julia/README.md

@@ -13,11 +13,13 @@
 - Tests use of a `Project.toml` file for Julia, using the repo2docker default
   version of Julia as specified in `julia_project.py`.
 
-### project-1.0.2
+### project-1.0.2-binder-dir
 
 - Tests use of a `Project.toml` file for Julia, using a version of Julia
   specified via `julia = "=1.0.2"` in `Project.toml`'s `[compat]` section.
 
+- Test use of a `.binder` directory.
+
 ### require
 
 - Tests use of a `REQUIRE` file for Julia, using the repo2docker default version

tests/julia/project-1.0.2/Project.toml renamed to tests/julia/project-1.0.2-binder-dir/.binder/Project.toml

@@ -0,0 +1,8 @@
+# A broken Project.toml, but the idea is that the test should ignore this file
+# anyhow as there is a .binder folder.
+#
+[deps]
+IteratorInterfaceExtensions = "invalid"
+
+[compat]
+julia = "=1.0.invalid"