Skip to content

Commit

Permalink
Merge pull request #41 from JuliaClimate/fix_dep
Browse files Browse the repository at this point in the history
Fix dep
  • Loading branch information
Balinus authored Jun 16, 2023
2 parents c2d0f6d + e881716 commit 0790725
Show file tree
Hide file tree
Showing 7 changed files with 92 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/CompatHelper.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
julia-version: [1.2.0]
julia-version: [1.9]
julia-arch: [x86]
os: [ubuntu-latest]
steps:
Expand Down
10 changes: 8 additions & 2 deletions .github/workflows/TagBot.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,17 @@
name: TagBot
on:
schedule:
- cron: 0 * * * *
issue_comment: # THIS BIT IS NEW
types:
- created
workflow_dispatch:
jobs:
TagBot:
# THIS 'if' LINE IS NEW
if: github.event_name == 'workflow_dispatch' || github.actor == 'JuliaTagBot'
# NOTHING BELOW HAS CHANGED
runs-on: ubuntu-latest
steps:
- uses: JuliaRegistries/TagBot@v1
with:
token: ${{ secrets.GITHUB_TOKEN }}
ssh: ${{ secrets.DOCUMENTER_KEY }}
47 changes: 47 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
name: CI
on:
pull_request:
branches:
- master
push:
branches:
- master
tags: '*'
jobs:
test:
name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }}
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
version:
- '1'
os:
- ubuntu-latest
- macos-latest
- windows-latest
arch:
- x64
steps:
- uses: actions/checkout@v2
- uses: julia-actions/setup-julia@v1
with:
version: ${{ matrix.version }}
arch: ${{ matrix.arch }}
- uses: actions/cache@v1
env:
cache-name: cache-artifacts
with:
path: ~/.julia/artifacts
key: ${{ runner.os }}-test-${{ env.cache-name }}-${{ hashFiles('**/Project.toml') }}
restore-keys: |
${{ runner.os }}-test-${{ env.cache-name }}-
${{ runner.os }}-test-
${{ runner.os }}-
- uses: julia-actions/julia-buildpkg@v1
- uses: julia-actions/julia-runtest@v1
- uses: julia-actions/julia-processcoverage@v1
- uses: codecov/codecov-action@v1
with:
file: lcov.info

23 changes: 23 additions & 0 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: Documentation
on:
push:
branches:
- master
tags: '*'
pull_request:

jobs:
docs:
name: Documenter
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: julia-actions/setup-julia@v1
with:
version: '1.9'
- run: pip3 install scipy
- uses: julia-actions/julia-buildpkg@v1
- uses: julia-actions/julia-docdeploy@releases/v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
DOCUMENTER_KEY: ${{ secrets.DOCUMENTER_KEY }}
20 changes: 10 additions & 10 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "ClimatePlots"
uuid = "b71d359b-899c-4fb1-b3ad-2de2d2cb8353"
authors = ["Philippe Roy <[email protected]>"]
version = "0.4.2"
version = "0.5.0"

[deps]
AxisArrays = "39de3d68-74b9-583c-8d2d-e117c070f3a9"
Expand All @@ -23,18 +23,18 @@ Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"

[compat]
AxisArrays = "0.3, 0.4"
BinDeps = "0.4, 0.5, 0.6, 0.7, 0.8, 1.0"
CFTime = "0.0.3, 0.1"
BinDeps = "0.4, 0.5, 0.6, 0.7, 0.8, 1"
CFTime = "0.1"
ClimateBase = "0.6"
ClimateTools = "0.20, 0.21, 0.22, 0.23"
ClimateTools = "0.20, 0.21, 0.22, 0.23, 0.24"
Conda = "1"
CondaBinDeps = "0.1, 0.2"
NetCDF = "0.8, 0.9, 0.10"
PyCall = "1.91"
PyPlot = "2.7, 2.8"
Reexport = "0.2"
Shapefile = "0.6"
julia = "1.3, 1.4, 1.5, 1.6"
NetCDF = "0.8, 0.9, 0.10, 0.11"
PyCall = "1.91, 1.92, 1.93, 1.94, 1.95"
PyPlot = "2"
Reexport = "1"
Shapefile = "0.6, 0.7, 0.8, 0.9, 0.10"
julia = "1.6, 1.7, 1.8, 1.9"

[extras]
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
Expand Down
2 changes: 1 addition & 1 deletion src/ClimatePlots.jl
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ using Dates
using CFTime
using AxisArrays
using Reexport
@reexport using ClimateBase
@reexport using ClimateTools
using PyCall
using PyPlot
using Statistics
Expand Down
4 changes: 2 additions & 2 deletions src/maps_definition.jl
Original file line number Diff line number Diff line change
Expand Up @@ -152,8 +152,8 @@ function mapclimgrid(PI)
end

ax = plt.axes(projection=projection)
if @isdefined extent
if @isdefined proj_extent
if ClimateTools.@isdefined extent
if ClimateTools.@isdefined proj_extent
ax.set_extent(extent, proj_extent)
else
ax.set_extent(extent)
Expand Down

0 comments on commit 0790725

Please sign in to comment.