diff --git a/tests/julia/README.md b/tests/julia/README.md index f6d2996f..be3277c3 100644 --- a/tests/julia/README.md +++ b/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 diff --git a/tests/julia/project-1.0.2/Project.toml b/tests/julia/project-1.0.2-binder-dir/.binder/Project.toml similarity index 100% rename from tests/julia/project-1.0.2/Project.toml rename to tests/julia/project-1.0.2-binder-dir/.binder/Project.toml diff --git a/tests/julia/project-1.0.2-binder-dir/Project.toml b/tests/julia/project-1.0.2-binder-dir/Project.toml new file mode 100644 index 00000000..6fdcca7f --- /dev/null +++ b/tests/julia/project-1.0.2-binder-dir/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" diff --git a/tests/julia/project-1.0.2/verify b/tests/julia/project-1.0.2-binder-dir/verify similarity index 100% rename from tests/julia/project-1.0.2/verify rename to tests/julia/project-1.0.2-binder-dir/verify diff --git a/tests/julia/project-binder-dir/Manifest.toml b/tests/julia/project-binder-dir/Manifest.toml deleted file mode 100644 index 1b72c7cd..00000000 --- a/tests/julia/project-binder-dir/Manifest.toml +++ /dev/null @@ -1,10 +0,0 @@ -# This file is machine-generated - editing it directly is not advised - -julia_version = "1.8.2" -manifest_format = "2.0" -project_hash = "8a6b9faef104dfa92a55997106baee3560dc25bc" - -[[deps.IteratorInterfaceExtensions]] -git-tree-sha1 = "a3f24677c21f5bbe9d2a714f95dcd58337fb2856" -uuid = "82899510-4779-5014-852e-03e436cf321d" -version = "1.0.0" diff --git a/tests/julia/project-binder-dir/Project.toml b/tests/julia/project-binder-dir/Project.toml deleted file mode 100644 index ee7dad5c..00000000 --- a/tests/julia/project-binder-dir/Project.toml +++ /dev/null @@ -1,2 +0,0 @@ -[deps] -IteratorInterfaceExtensions = "82899510-4779-5014-852e-03e436cf321d" diff --git a/tests/julia/project-binder-dir/binder/Manifest.toml b/tests/julia/project-binder-dir/binder/Manifest.toml deleted file mode 100644 index 7e4afe01..00000000 --- a/tests/julia/project-binder-dir/binder/Manifest.toml +++ /dev/null @@ -1,36 +0,0 @@ -# This file is machine-generated - editing it directly is not advised - -julia_version = "1.8.2" -manifest_format = "2.0" -project_hash = "663bcf2fe6af67425c484706d7562ccb3a370117" - -[[deps.Adapt]] -deps = ["LinearAlgebra"] -git-tree-sha1 = "195c5505521008abea5aee4f96930717958eac6f" -uuid = "79e6a3ab-5dfb-504d-930d-738a2a938a0e" -version = "3.4.0" - -[[deps.Artifacts]] -uuid = "56f22d72-fd6d-98f1-02f0-08ddc0907c33" - -[[deps.CompilerSupportLibraries_jll]] -deps = ["Artifacts", "Libdl"] -uuid = "e66e0078-7015-5450-92f7-15fbd957f2ae" -version = "0.5.2+0" - -[[deps.Libdl]] -uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb" - -[[deps.LinearAlgebra]] -deps = ["Libdl", "libblastrampoline_jll"] -uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" - -[[deps.OpenBLAS_jll]] -deps = ["Artifacts", "CompilerSupportLibraries_jll", "Libdl"] -uuid = "4536629a-c528-5b80-bd46-f80d51c5b363" -version = "0.3.20+0" - -[[deps.libblastrampoline_jll]] -deps = ["Artifacts", "Libdl", "OpenBLAS_jll"] -uuid = "8e850b90-86db-534c-a0d3-1478176c7d93" -version = "5.1.1+0" diff --git a/tests/julia/project-binder-dir/binder/Project.toml b/tests/julia/project-binder-dir/binder/Project.toml deleted file mode 100644 index b14e0e60..00000000 --- a/tests/julia/project-binder-dir/binder/Project.toml +++ /dev/null @@ -1,2 +0,0 @@ -[deps] -Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e" diff --git a/tests/julia/project-binder-dir/verify b/tests/julia/project-binder-dir/verify deleted file mode 100755 index 32ce2c44..00000000 --- a/tests/julia/project-binder-dir/verify +++ /dev/null @@ -1,27 +0,0 @@ -#!/usr/bin/env julia - -if VERSION != v"1.8.2" - println("Julia version should be 1.8.2") - exit(1) -end - -# Verify that the environment variables are set correctly for julia 1.0+ -@assert "julia" ∈ readdir(Sys.BINDIR) - -try - # Test that the package was installed. - using Adapt -catch - println("Should be able to load Adapt") - exit(1) -end - -try - using IteratorInterfaceExtensions - # Test that the package was not installed. - println("Should not be able to load IteratorInterfaceExtensions") - exit(1) -catch -end - -exit(0)