Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update compats, ArchGDAL, Circuitscape, and Julia #134

Merged
merged 3 commits into from
Sep 4, 2023
Merged

update compats, ArchGDAL, Circuitscape, and Julia #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9ddba04
update compats, ArchGDAL, Circuitscape, and Julia
vlandau Sep 4, 2023
295dda6
upate Julia version in GitHub actions
vlandau Sep 4, 2023
6caaa91
update Julia version in README
vlandau Sep 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ jobs:
fail-fast: false
matrix:
version:
- '1.6'
- '^1.7.0-0'
- '1.9'
- '1'
os:
- ubuntu-latest
- macos-latest
Expand Down
10 changes: 5 additions & 5 deletions Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "Omniscape"
uuid = "a38d70fc-99f5-11e9-1e3d-cbca093024c3"
authors = ["Vincent A. Landau <vincent@csp-inc.org>"]
version = "0.5.8"
authors = ["Vincent A. Landau <vincent@vibrantplanet.net>"]
version = "0.6.0"

[deps]
ArchGDAL = "c9ce4bd3-c3d5-55b8-8973-c0e20141b8c3"
Expand All @@ -15,8 +15,8 @@ StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[compat]
ArchGDAL = "0.8"
Circuitscape = "5.11"
ArchGDAL = "0.10"
Circuitscape = "^5.13.1"
ProgressMeter = "1.3"
StatsBase = "0.33"
julia = "^1.5.4"
julia = "1.9"
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Omniscape.jl is built on [Circuitscape.jl](https://github.com/Circuitscape/Circu

## Installation [![Omniscape Downloads](https://shields.io/endpoint?url=https://pkgs.genieframework.com/api/v1/badge/Omniscape)](https://pkgs.genieframework.com?packages=Omniscape)

**The latest version of Omniscape.jl requires Julia version 1.5.4 or greater**. You can install Julia [here](https://julialang.org/downloads/). Once installation is complete, open a Julia terminal and run the following code to install Omniscape.jl.
**The latest version of Omniscape.jl requires Julia version 1.9 or greater**. You can install Julia [here](https://julialang.org/downloads/). Once installation is complete, open a Julia terminal and run the following code to install Omniscape.jl.
```julia
using Pkg; Pkg.add("Omniscape")
```
Expand Down
6 changes: 3 additions & 3 deletions docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
FROM ubuntu:18.04
FROM ubuntu:20.04

RUN apt-get update && \
apt-get install -y --no-install-recommends \
ca-certificates \
curl

# Install julia
RUN curl -L https://julialang-s3.julialang.org/bin/linux/x64/1.6/julia-1.6.3-linux-x86_64.tar.gz > /tmp/julia.tar.gz
RUN curl -L https://julialang-s3.julialang.org/bin/linux/x64/1.9/julia-1.9.3-linux-x86_64.tar.gz > /tmp/julia.tar.gz
RUN tar -zxvf /tmp/julia.tar.gz
RUN ln -s /julia-1.6.3/bin/julia /usr/bin/julia
RUN ln -s /julia-1.9.3/bin/julia /usr/bin/julia

# Install Omniscape
RUN julia -e 'using Pkg; Pkg.add(["Omniscape", "Test", "BenchmarkTools"])'
Expand Down