From 6578abfc62056a186f78dcd61409407b116e26b2 Mon Sep 17 00:00:00 2001 From: Gabriel Dansereau Date: Thu, 13 May 2021 09:18:11 -0400 Subject: [PATCH 1/6] =?UTF-8?q?=F0=9F=94=A7=20remove=20unnecessary=20compa?= =?UTF-8?q?t=20entry=20for=20Downloads=20v1.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As I understand from https://pkgdocs.julialang.org/v1/compatibility/, having both v1.4 and v1.5 is not necessary, as 1.4 already means [1.4.0 - 2.0.0[. This behaviour is different between 1.x and 0.x, hence the need for compat entries for minor releases in the 0.x series --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index a382ff61..60433615 100644 --- a/Project.toml +++ b/Project.toml @@ -13,7 +13,7 @@ ZipFile = "a5390f91-8eb1-5f08-bee0-b1d1ffed6cea" [compat] ArchGDAL = "0.4, 0.5, 0.6" -Downloads = "1.4, 1.5" +Downloads = "1.4" RecipesBase = "0.7, 0.8, 1.0" Requires = "1.0" ZipFile = "0.8, 0.9" From f93e339632fb38e4adab99ddad350e593970aaee Mon Sep 17 00:00:00 2001 From: Gabriel Dansereau Date: Thu, 13 May 2021 09:34:38 -0400 Subject: [PATCH 2/6] =?UTF-8?q?=F0=9F=94=A7=20add=20compat=20entry=20in=20?= =?UTF-8?q?tests=20for=20DataFrames=20v0.21?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is the DataFrames version I had when developing the DataFrames integration. Tests pass on my computer with this version --- test/Project.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/test/Project.toml b/test/Project.toml index 20026d62..0bd4dca4 100644 --- a/test/Project.toml +++ b/test/Project.toml @@ -6,4 +6,5 @@ Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" [compat] +DataFrames = "0.21" GBIF = "0.2, 0.3" From a7b7ece0941e70c37d50bfe472defd2be14618f7 Mon Sep 17 00:00:00 2001 From: Gabriel Dansereau Date: Thu, 13 May 2021 09:50:59 -0400 Subject: [PATCH 3/6] =?UTF-8?q?=F0=9F=94=A7=20add=20compat=20entry=20in=20?= =?UTF-8?q?tests=20for=20DataFrames=20v0.22?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Tests passed on my computer with v0.22.0 and v0.22.7 --- test/Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Project.toml b/test/Project.toml index 0bd4dca4..e4977735 100644 --- a/test/Project.toml +++ b/test/Project.toml @@ -6,5 +6,5 @@ Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" [compat] -DataFrames = "0.21" +DataFrames = "0.21, 0.22" GBIF = "0.2, 0.3" From a3c14e12bbae6b6c57b310b3b32f4dfccebc448d Mon Sep 17 00:00:00 2001 From: Gabriel Dansereau Date: Thu, 13 May 2021 10:03:38 -0400 Subject: [PATCH 4/6] =?UTF-8?q?=F0=9F=94=A7=20add=20compat=20entry=20to=20?= =?UTF-8?q?tests=20for=20DataFrames=20v1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit But of course tests don't pass for now, as expected --- test/Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Project.toml b/test/Project.toml index e4977735..7510e3d4 100644 --- a/test/Project.toml +++ b/test/Project.toml @@ -6,5 +6,5 @@ Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" [compat] -DataFrames = "0.21, 0.22" +DataFrames = "0.21, 0.22, 1.0" GBIF = "0.2, 0.3" From 590b83b9704eede9247eba45e5b1c980164b7264 Mon Sep 17 00:00:00 2001 From: Gabriel Dansereau Date: Thu, 13 May 2021 10:42:48 -0400 Subject: [PATCH 5/6] =?UTF-8?q?=F0=9F=94=A8=20fix=20DataFrames=20integrati?= =?UTF-8?q?on=20with=20v1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/integrations/DataFrames.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/integrations/DataFrames.jl b/src/integrations/DataFrames.jl index 73be82c0..fdbe199f 100644 --- a/src/integrations/DataFrames.jl +++ b/src/integrations/DataFrames.jl @@ -76,7 +76,7 @@ function DataFrames.DataFrame(layers::Array{T}; kw...) where {T <: SimpleSDMLaye lons = repeat(longitudes(l1), inner = size(l1, 1)) values = mapreduce(x -> vec(x.grid), hcat, layers) - df = DataFrames.DataFrame(values; kw...) + df = DataFrames.DataFrame(values, :auto; kw...) DataFrames.insertcols!(df, 1, :latitude => lats) DataFrames.insertcols!(df, 1, :longitude => lons) return df From a0eec8690f803bb9d77d151b540e6f8931664a33 Mon Sep 17 00:00:00 2001 From: Gabriel Dansereau Date: Thu, 13 May 2021 11:45:35 -0400 Subject: [PATCH 6/6] =?UTF-8?q?=F0=9F=94=A7=20remove=20compat=20entry=20in?= =?UTF-8?q?=20test=20for=20DataFrames=20v0.21?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Tests fail with the v0.21.x series, as the :auto keyword needed in v1.x.x is not supported. --- test/Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Project.toml b/test/Project.toml index 7510e3d4..3bd386f8 100644 --- a/test/Project.toml +++ b/test/Project.toml @@ -6,5 +6,5 @@ Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" [compat] -DataFrames = "0.21, 0.22, 1.0" +DataFrames = "0.22, 1.0" GBIF = "0.2, 0.3"