Skip to content

Commit

Permalink
Merge branch 'main' into compathelper/new_version/2022-12-15-16-33-28…
Browse files Browse the repository at this point in the history
…-105-03256689419
  • Loading branch information
claireh93 authored Sep 28, 2023
2 parents c7f7bab + ec6b865 commit 484f11f
Show file tree
Hide file tree
Showing 22 changed files with 1,802 additions and 981 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/testing.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,10 @@ jobs:
matrix:
julia-version:
- '1.8'
- '1.9'
os:
- ubuntu-latest
- macOS-10.15
- macOS-latest
- windows-latest
R-version:
- 'release'
Expand Down
13 changes: 12 additions & 1 deletion Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ ArchGDAL = "c9ce4bd3-c3d5-55b8-8973-c0e20141b8c3"
AxisArrays = "39de3d68-74b9-583c-8d2d-e117c070f3a9"
Calculus = "49dc2e85-a5d0-5ad3-a950-438e2897f1b9"
DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
DataPipeline = "9ced6f0a-eb77-43a8-bbd1-bbf3031b0d12"
Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
Distributions = "31c24e10-a181-5473-b8eb-7969acd0382f"
Diversity = "d3d5718d-52de-57ab-b67a-eca7fd6175a4"
Expand All @@ -32,6 +33,7 @@ Phylo = "aea672f4-3940-5932-aa44-993d1c3ff149"
Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
Pluto = "c3e4b0f8-55cb-11ea-2926-15256bba5781"
Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
PyCall = "438e738f-606a-5dbb-bf0a-cddfbfd45ab0"
REPL = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
RasterDataSources = "3cb90ccd-e1b6-4867-9617-4276c8b2ca36"
Expand All @@ -43,11 +45,20 @@ StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
Unitful = "1986cc42-f94f-5a68-af5c-568840ba703d"

[weakdeps]
DataPipeline = "9ced6f0a-eb77-43a8-bbd1-bbf3031b0d12"
PyCall = "438e738f-606a-5dbb-bf0a-cddfbfd45ab0"

[extensions]
DataTools = "DataPipeline"
ERATools = "PyCall"

[compat]
ArchGDAL = "0.6, 0.7, 0.8, 0.9, 0.10"
AxisArrays = "0.4.3"
Calculus = "0.4.1, 0.5"
DataFrames = "0.21.8, 0.22, 1.0"
DataPipeline = "0.53"
Distributions = "0.24.15, 0.25"
Diversity = "0.5.6"
EcoBase = "0.1.3"
Expand All @@ -70,7 +81,7 @@ Requires = "1"
SpatialEcology = "0.9"
StatsBase = "0.32.2, 0.33"
Unitful = "1.7"
julia = "1.6, 1.8"
julia = "1.9"

[extras]
MPI = "da04e1cc-30fd-572f-bb4f-1f8673147195"
Expand Down
Loading

0 comments on commit 484f11f

Please sign in to comment.