diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 592ef8e..fcc957d 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -22,42 +22,14 @@ jobs: fail-fast: false matrix: version: - - '1.10' - python: [3.9] + - '1.11' os: - ubuntu-latest + - macos-latest arch: - x64 steps: - uses: actions/checkout@v2 - - name: Set up Python 🐍 ${{ matrix.python }} - uses: actions/setup-python@v2 - with: - python-version: ${{ matrix.python }} - - name: Create environment with micromamba 🐍🖤 - uses: mamba-org/setup-micromamba@v1 - with: - micromamba-version: '1.5.6-0' - environment-file: ./environment.yml - environment-name: oggm_env # it is recommendable to add both name and yml file. - init-shell: bash - cache-environment: true -# condarc-file: ./condarc.yml # If necessary, we can include .condarc to configure environment - - name: Test creation of environment with micromamba 🔧🐍🖤 - run: | - which python - conda env export - shell: bash -el {0} - - name: Update certifi - run: | - pip install --upgrade certifi - shell: bash -el {0} -# - name: Test OGGM installation 🔧🌎 -# run: pytest.oggm -# shell: bash -el {0} - - name: Set ENV Variables for PyCall.jl 🐍 📞 - run: export PYTHON=/home/runner/micromamba/envs/oggm_env/bin/python - shell: bash -el {0} - uses: julia-actions/setup-julia@v1 with: version: ${{ matrix.version }} @@ -67,17 +39,20 @@ jobs: shell: bash -el {0} - uses: julia-actions/cache@v1 with: - cache-registries: "true" + cache-registries: "false" cache-compiled: "true" - - uses: julia-actions/julia-buildpkg@v1 - env: - PYTHON : /home/runner/micromamba/envs/oggm_env/bin/python - # The SSL certificate path can be readed from the action "Check Julia SSL certifications" - SSL_CERT_FILE: /etc/ssl/certs/ca-certificates.crt - - uses: julia-actions/julia-runtest@v1 - env: - PYTHON : /home/runner/micromamba/envs/oggm_env/bin/python - SSL_CERT_FILE: /etc/ssl/certs/ca-certificates.crt + - name: Build Julia packages in Ubuntu + uses: julia-actions/julia-buildpkg@v1 + if: matrix.os == 'ubuntu-latest' + - name: Build Julia packages in MacOS + uses: julia-actions/julia-buildpkg@v1 + if: matrix.os == 'macos-latest' + - name: Run tests in Ubuntu + uses: julia-actions/julia-runtest@v1 + if: matrix.os == 'ubuntu-latest' + - name: Run tests in MacOS + uses: julia-actions/julia-runtest@v1 + if: matrix.os == 'macos-latest' - uses: julia-actions/julia-processcoverage@v1 - uses: codecov/codecov-action@v3 with: diff --git a/Project.toml b/Project.toml index dc59c9c..edcb1eb 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "Huginn" -uuid = "27dc1133-e8b5-410d-a8d9-970a215b0d0d" +uuid = "9cb796e9-d0ea-421b-b37d-eb97bc1add55" authors = ["Jordi Bolibar ", "Facundo Sapienza "] -version = "0.6.1" +version = "0.7.0" [deps] BenchmarkTools = "6e4b80f9-dd63-53aa-95a3-0cdb28fa8baf" @@ -9,7 +9,7 @@ CairoMakie = "13f3f980-e62b-5c42-98c6-ff1f3baf88f0" Distributed = "8ba89e20-285c-5b6f-9357-94700520ee1b" Infiltrator = "5903a43b-9cc3-4c30-8d17-598619ec4e9b" JLD2 = "033835bb-8acc-5ee8-8aae-3f567f8a3819" -Muninn = "b6044226-3b0b-478c-8efe-7760f499bf18" +Muninn = "4b816528-16ba-4e32-9a2e-3c1bc2049d3a" Optimization = "7f7a1694-90dd-40f0-9382-eb1efda571ba" OptimizationOptimJL = "36348300-93cb-4f02-beb5-3c3902f8871e" OrdinaryDiffEq = "1dea7af3-3e70-54e6-95c3-0bf5283fa5ed" @@ -19,16 +19,16 @@ Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80" ProgressMeter = "92933f4c-e287-5a05-a399-4b506db050ca" Reexport = "189a3867-3050-52da-a836-e630ba90ab69" Revise = "295af30f-e4ad-537b-8983-00126c2a3abe" -Sleipnir = "10baed72-45ec-4fdd-b59b-ebd9654d36be" +Sleipnir = "f5e6c550-199f-11ee-3608-394420200519" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" Tullio = "bc48ee85-29a4-5162-ae0b-a64e1601d4bc" [compat] BenchmarkTools = "1" CairoMakie = "0.11, 0.12" -Infiltrator = "1" +Infiltrator = "1.8" JLD2 = "0.4" -Muninn = "0.3.1" +Muninn = "0.4.0" Optimization = "3" OptimizationOptimJL = "0.3" OrdinaryDiffEq = "6" @@ -37,9 +37,9 @@ Plots = "1" ProgressMeter = "1" Reexport = "1" Revise = "3" -Sleipnir = "0.7.1" +Sleipnir = "0.7.0" Tullio = "0.3" -julia = "1.7" +julia = "1.9" [extras] Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"