ci: refactor julia tests, from 5 to 4 (~5 min saved)

jupyterhub · Oct 9, 2022 · 7573682 · 7573682
1 parent 7eeb9c1
commit 7573682
Show file tree

Hide file tree

Showing 22 changed files with 24 additions and 76 deletions.
diff --git a/repo2docker/buildpacks/julia/julia_project.py b/repo2docker/buildpacks/julia/julia_project.py
@@ -50,6 +50,10 @@ def julia_version(self):
             compat = project_toml["compat"]["julia"]
         except:
             # Default version which needs to be manually updated with new major.minor releases
+            #
+            # NOTE: Updates to the default version should go hand in hand with
+            #       updates to tests/julia/project-unspecified/verify.
+            #
             compat = "1.6"
 
         match = find_semver_match(compat, self.all_julias)

diff --git a/tests/julia/julia_version-1.0.2/README.rst b/tests/julia/julia_version-1.0.2/README.rst
diff --git a/tests/julia/julia_version-default/Project.toml b/tests/julia/julia_version-default/Project.toml
diff --git a/tests/julia/julia_version-default/README.rst b/tests/julia/julia_version-default/README.rst
diff --git a/tests/julia/julialegacy_version-0.6.3/README.rst b/tests/julia/julialegacy_version-0.6.3/README.rst
diff --git a/tests/julia/julialegacy_version-1.0/README.rst b/tests/julia/julialegacy_version-1.0/README.rst
diff --git a/tests/julia/julialegacy_version-1.0/REQUIRE b/tests/julia/julialegacy_version-1.0/REQUIRE
diff --git a/tests/julia/julialegacy_version-1.0/verify b/tests/julia/julialegacy_version-1.0/verify
diff --git a/tests/julia/julia_version-1.0.2/Project.toml → tests/julia/project-1.0.2/Project.toml b/tests/julia/julia_version-1.0.2/Project.toml → tests/julia/project-1.0.2/Project.toml
diff --git a/tests/julia/project-1.0.2/README.rst b/tests/julia/project-1.0.2/README.rst
@@ -0,0 +1,4 @@
+Julia - Project.toml
+--------------------
+
+Test a Project.toml file with a specified version for julia.
diff --git a/tests/julia/julia_version-1.0.2/verify → tests/julia/project-1.0.2/verify b/tests/julia/julia_version-1.0.2/verify → tests/julia/project-1.0.2/verify
diff --git a/tests/julia/project-unspecified/Project.toml b/tests/julia/project-unspecified/Project.toml
diff --git a/tests/julia/project-unspecified/README.rst b/tests/julia/project-unspecified/README.rst
@@ -0,0 +1,5 @@
+Julia - Project.toml
+--------------------
+
+Test a Project.toml file for julia, using the repo2docker default version of
+julia as specified in ``julia_project.py``.
diff --git a/tests/julia/julia_version-default/verify → tests/julia/project-unspecified/verify b/tests/julia/julia_version-default/verify → tests/julia/project-unspecified/verify
@@ -1,6 +1,6 @@
 #!/usr/bin/env julia
 # Verify the version:
-if VERSION < v"1.1.0"
+if VERSION > v"1.6.0"
     exit(1)
 end
 

diff --git a/tests/julia/pyplot-requirements/README.rst b/tests/julia/pyplot-requirements/README.rst
diff --git a/tests/julia/require-0.6.3/README.rst b/tests/julia/require-0.6.3/README.rst
@@ -0,0 +1,5 @@
+Julia - REQUIRE
+---------------
+
+Starting with julia v0.7 and up, the package manager has changed, so this tests
+that the julia version below that can be installed correctly.
diff --git a/...s/julia/julialegacy_version-0.6.3/REQUIRE → tests/julia/require-0.6.3/REQUIRE b/...s/julia/julialegacy_version-0.6.3/REQUIRE → tests/julia/require-0.6.3/REQUIRE
diff --git a/tests/julia/julialegacy_version-0.6.3/verify → tests/julia/require-0.6.3/verify b/tests/julia/julialegacy_version-0.6.3/verify → tests/julia/require-0.6.3/verify
diff --git a/tests/julia/require-requirements/README.rst b/tests/julia/require-requirements/README.rst
@@ -0,0 +1,5 @@
+Julia - REQUIRE
+---------------
+
+Note that this example also specifies Python dependencies with an
+``requirements.txt`` file.
diff --git a/tests/julia/pyplot-requirements/REQUIRE → tests/julia/require-requirements/REQUIRE b/tests/julia/pyplot-requirements/REQUIRE → tests/julia/require-requirements/REQUIRE
diff --git a/...ulia/pyplot-requirements/requirements.txt → ...lia/require-requirements/requirements.txt b/...ulia/pyplot-requirements/requirements.txt → ...lia/require-requirements/requirements.txt
diff --git a/tests/julia/pyplot-requirements/verify → tests/julia/require-requirements/verify b/tests/julia/pyplot-requirements/verify → tests/julia/require-requirements/verify