From 462f723b84558f7b1b52ee882e97f69da5ecbbc0 Mon Sep 17 00:00:00 2001 From: David Anthoff Date: Thu, 20 Jun 2019 20:30:32 +0200 Subject: [PATCH 1/3] Add support for julia 1.0.4 and 1.1.1 --- repo2docker/buildpacks/julia/julia_project.py | 2 +- repo2docker/buildpacks/julia/julia_require.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/repo2docker/buildpacks/julia/julia_project.py b/repo2docker/buildpacks/julia/julia_project.py index 5bc6a82f..ff08a7c6 100644 --- a/repo2docker/buildpacks/julia/julia_project.py +++ b/repo2docker/buildpacks/julia/julia_project.py @@ -13,7 +13,7 @@ class JuliaProjectTomlBuildPack(PythonBuildPack): # ALL EXISTING JULIA VERSIONS # Note that these must remain ordered, in order for the find_semver_match() # function to behave correctly. - all_julias = ["0.7.0", "1.0.0", "1.0.1", "1.0.2", "1.0.3", "1.1.0"] + all_julias = ["0.7.0", "1.0.0", "1.0.1", "1.0.2", "1.0.3", "1.0.4", "1.1.0", "1.1.1"] @property def julia_version(self): diff --git a/repo2docker/buildpacks/julia/julia_require.py b/repo2docker/buildpacks/julia/julia_require.py index 75739216..a5bd6d05 100644 --- a/repo2docker/buildpacks/julia/julia_require.py +++ b/repo2docker/buildpacks/julia/julia_require.py @@ -8,8 +8,8 @@ class JuliaRequireBuildPack(PythonBuildPack): Julia build pack which uses conda and REQUIRE. """ - minor_julias = {"0.6": "0.6.4", "0.7": "0.7.0", "1.0": "1.0.3", "1.1": "1.1.0"} - major_julias = {"1": "1.1.0"} + minor_julias = {"0.6": "0.6.4", "0.7": "0.7.0", "1.0": "1.0.4", "1.1": "1.1.1"} + major_julias = {"1": "1.1.1"} @property def julia_version(self): From 4fa72f691b63bbc61f69cc2839eb57ef1dddbd87 Mon Sep 17 00:00:00 2001 From: David Anthoff Date: Fri, 21 Jun 2019 21:41:19 +0200 Subject: [PATCH 2/3] Reformat --- repo2docker/buildpacks/julia/julia_project.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/repo2docker/buildpacks/julia/julia_project.py b/repo2docker/buildpacks/julia/julia_project.py index ff08a7c6..9c7fe561 100644 --- a/repo2docker/buildpacks/julia/julia_project.py +++ b/repo2docker/buildpacks/julia/julia_project.py @@ -13,7 +13,16 @@ class JuliaProjectTomlBuildPack(PythonBuildPack): # ALL EXISTING JULIA VERSIONS # Note that these must remain ordered, in order for the find_semver_match() # function to behave correctly. - all_julias = ["0.7.0", "1.0.0", "1.0.1", "1.0.2", "1.0.3", "1.0.4", "1.1.0", "1.1.1"] + all_julias = [ + "0.7.0", + "1.0.0", + "1.0.1", + "1.0.2", + "1.0.3", + "1.0.4", + "1.1.0", + "1.1.1" + ] @property def julia_version(self): From 923f3acbeca8e8efa5e05d0f4442762ce9e203fe Mon Sep 17 00:00:00 2001 From: David Anthoff Date: Fri, 21 Jun 2019 22:38:25 +0200 Subject: [PATCH 3/3] Run black again --- repo2docker/buildpacks/julia/julia_project.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repo2docker/buildpacks/julia/julia_project.py b/repo2docker/buildpacks/julia/julia_project.py index 9c7fe561..af101dbc 100644 --- a/repo2docker/buildpacks/julia/julia_project.py +++ b/repo2docker/buildpacks/julia/julia_project.py @@ -21,7 +21,7 @@ class JuliaProjectTomlBuildPack(PythonBuildPack): "1.0.3", "1.0.4", "1.1.0", - "1.1.1" + "1.1.1", ] @property