From a8ebd72823f82a2f178a99e2f767573b09f3552b Mon Sep 17 00:00:00 2001 From: Alexey Stukalov Date: Mon, 15 Jul 2019 14:00:01 +0200 Subject: [PATCH 1/3] add Project.toml, remove REQUIRE Project.toml was generated by gen_project.jl script --- Project.toml | 31 +++++++++++++++++++++++++++++++ REQUIRE | 6 ------ test/REQUIRE | 1 - 3 files changed, 31 insertions(+), 7 deletions(-) create mode 100644 Project.toml delete mode 100644 REQUIRE delete mode 100644 test/REQUIRE diff --git a/Project.toml b/Project.toml new file mode 100644 index 00000000..934a395e --- /dev/null +++ b/Project.toml @@ -0,0 +1,31 @@ +name = "BlackBoxOptim" +uuid = "a134a8b2-14d6-55f6-9291-3336d3ab0209" +version = "0.5.0" + +[deps] +CPUTime = "a9c8d775-2e2e-55fc-8582-045d282d599e" +Compat = "34da2185-b29b-5c13-b0c7-acf172513d20" +Distributed = "8ba89e20-285c-5b6f-9357-94700520ee1b" +Distributions = "31c24e10-a181-5473-b8eb-7969acd0382f" +LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" +Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7" +Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" +SpatialIndexing = "d4ead438-fe20-5cc5-a293-4fd39a41b74c" +StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91" + +[compat] +SpatialIndexing = "≥ 0.1.0" +julia = "≥ 1.0.3" + +[extras] +CSV = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b" +Distributed = "8ba89e20-285c-5b6f-9357-94700520ee1b" +LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" +Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7" +Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" +SHA = "ea8e919c-243c-51af-8825-aaa63cd721ce" +Serialization = "9e88b42a-f829-5b0c-bbe9-9e923198166b" +Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" + +[targets] +test = ["CSV", "Serialization", "SHA", "LinearAlgebra", "Test", "Random", "Printf", "Distributed"] diff --git a/REQUIRE b/REQUIRE deleted file mode 100644 index 696545b7..00000000 --- a/REQUIRE +++ /dev/null @@ -1,6 +0,0 @@ -julia 1.0.3 -StatsBase -Distributions -SpatialIndexing 0.1 -Compat -CPUTime diff --git a/test/REQUIRE b/test/REQUIRE deleted file mode 100644 index 11b99844..00000000 --- a/test/REQUIRE +++ /dev/null @@ -1 +0,0 @@ -CSV \ No newline at end of file From 962df84f0a648e80a051ceb568f09e3f4b3ba6e9 Mon Sep 17 00:00:00 2001 From: Alexey Stukalov Date: Mon, 15 Jul 2019 14:46:22 +0200 Subject: [PATCH 2/3] add julia 1.2 to CI --- .travis.yml | 1 + appveyor.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index d53e3d11..b8e35c3e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,7 @@ os: julia: - 1.0 - 1.1 + - 1.2 - nightly matrix: allow_failures: diff --git a/appveyor.yml b/appveyor.yml index 4eeb818a..4af96449 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,6 +2,7 @@ environment: matrix: - julia_version: 1.0 - julia_version: 1.1 + - julia_version: 1.2 - julia_version: latest platform: From fb58af4fddf12a04c9f838c58f07fd68fecebfa2 Mon Sep 17 00:00:00 2001 From: Alexey Stukalov Date: Mon, 15 Jul 2019 14:47:12 +0200 Subject: [PATCH 3/3] fix julia nightly tests workaround Dict printing formatting changes --- test/test_parameters.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/test_parameters.jl b/test/test_parameters.jl index 9cda7873..72617a49 100644 --- a/test/test_parameters.jl +++ b/test/test_parameters.jl @@ -116,7 +116,7 @@ dc = DictChain(d1, d2, d3) iob = IOBuffer() show(iob, dc) - @test String(take!(iob)) == "BlackBoxOptim.DictChain{Symbol,$Int}[Dict(:a=>1),Dict(:a=>2,:b=>4),Dict(:a=>3,:b=>5)]" + @test replace(String(take!(iob)), ' '=>"") == "BlackBoxOptim.DictChain{Symbol,$Int}[Dict(:a=>1),Dict(:a=>2,:b=>4),Dict(:a=>3,:b=>5)]" end @testset "flatten" begin