Skip to content

Commit

Permalink
updates across the board including updating isis to 8.3
Browse files Browse the repository at this point in the history
  • Loading branch information
@AndrewAnnex
AndrewAnnex authored Nov 22, 2024
1 parent ccbcfc2 commit 4f7d878
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 32 deletions.
56 changes: 28 additions & 28 deletions .github/workflows/ci-test-ctx.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ on:
- main
env:
# Increase this value to reset cache
ISIS_CACHE_NUMBER: 34
ASAP_CACHE_NUMBER: 7
ASP_CACHE_NUMBER: 4
ISIS_CACHE_NUMBER: 35
ASAP_CACHE_NUMBER: 8
ASP_CACHE_NUMBER: 5
jobs:
cache_asp:
name: Cache ASP distribution
Expand All @@ -17,10 +17,10 @@ jobs:
run:
shell: bash -l {0}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Cache ASP tarball
id: cache-asap
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: "/tmp/sp.tar.bz2"
key: asp-env-${{ runner.os }}-${{ env.ASP_CACHE_NUMBER }}-${{ hashFiles('asap.yml') }}
Expand All @@ -35,10 +35,10 @@ jobs:
run:
shell: bash -l {0}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Cache ISIS conda env
id: cache-isis
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: "isis-env.tar.gz"
key: isis-env-${{ runner.os }}-${{ env.ISIS_CACHE_NUMBER }}-${{ hashFiles('isis.yml') }}
Expand Down Expand Up @@ -134,16 +134,16 @@ jobs:
run:
shell: bash -l {0}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Cache ASAP conda env
id: cache-asap
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: "asap-env.tar.gz"
key: asap-env-${{ runner.os }}-${{ env.ASAP_CACHE_NUMBER }}-${{ hashFiles('asap.yml') }}
- name: setup asap conda env
if: steps.cache-asap.outputs.cache-hit != 'true'
uses: conda-incubator/setup-miniconda@v2.2.0
uses: conda-incubator/setup-miniconda@v3
with:
activate-environment: asap
miniforge-variant: Mambaforge
Expand Down Expand Up @@ -180,13 +180,13 @@ jobs:
run:
shell: bash -l {0}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Setup default miniconda
uses: conda-incubator/setup-miniconda@v2.2.0
uses: conda-incubator/setup-miniconda@v3
with:
miniforge-variant: Mambaforge
- name: Get ASP from cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: "/tmp/sp.tar.bz2"
key: asp-env-${{ runner.os }}-${{ env.ASP_CACHE_NUMBER }}-${{ hashFiles('asap.yml') }}
Expand All @@ -197,7 +197,7 @@ jobs:
rm /tmp/sp.tar.bz2
ls /tmp/sp
- name: Get ISIS Conda environment from cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: "isis-env.tar.gz"
key: isis-env-${{ runner.os }}-${{ env.ISIS_CACHE_NUMBER }}-${{ hashFiles('isis.yml') }}
Expand All @@ -207,7 +207,7 @@ jobs:
tar -xvf isis-env.tar.gz -C /
rm isis-env.tar.gz
- name: Get ASAP Conda environment from cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: "asap-env.tar.gz"
key: asap-env-${{ runner.os }}-${{ env.ASAP_CACHE_NUMBER }}-${{ hashFiles('asap.yml') }}
Expand Down Expand Up @@ -261,13 +261,13 @@ jobs:
run:
shell: bash -l {0}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Setup default miniconda
uses: conda-incubator/setup-miniconda@v2.2.0
uses: conda-incubator/setup-miniconda@v3
with:
miniforge-variant: Mambaforge
- name: Get ASP from cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: "/tmp/sp.tar.bz2"
key: asp-env-${{ runner.os }}-${{ env.ASP_CACHE_NUMBER }}-${{ hashFiles('asap.yml') }}
Expand All @@ -278,7 +278,7 @@ jobs:
rm /tmp/sp.tar.bz2
ls /tmp/sp
- name: Get ISIS Conda environment from cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: "isis-env.tar.gz"
key: isis-env-${{ runner.os }}-${{ env.ISIS_CACHE_NUMBER }}-${{ hashFiles('isis.yml') }}
Expand All @@ -288,7 +288,7 @@ jobs:
tar -xzf "isis-env.tar.gz" -C /
rm isis-env.tar.gz
- name: Get ASAP Conda environment from cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: "asap-env.tar.gz"
key: asap-env-${{ runner.os }}-${{ env.ASAP_CACHE_NUMBER }}-${{ hashFiles('asap.yml') }}
Expand Down Expand Up @@ -381,7 +381,7 @@ jobs:
ls -lahtr $(pwd)/B03_010644_1889_XN_08N001W_P02_001902_1889_XI_08N001W/results_ba/dem/
gdal_translate -of PNG $(pwd)/B03_010644_1889_XN_08N001W_P02_001902_1889_XI_08N001W/results_ba/dem/B03_010644_1889_XN_08N001W_P02_001902_1889_XI_08N001W_ba_100_0-DEM-hillshade.tif ./hillshade_1.png
- name: Archive First Round Previews
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: first-round
path: |
Expand All @@ -408,7 +408,7 @@ jobs:
gdal_translate -of PNG $(pwd)/B03_010644_1889_XN_08N001W_P02_001902_1889_XI_08N001W/results_map_ba/B03_010644_1889_XN_08N001W_P02_001902_1889_XI_08N001W_ba-GoodPixelMap.tif ./good_pixel_map_2.png
gdal_translate -of PNG $(pwd)/B03_010644_1889_XN_08N001W_P02_001902_1889_XI_08N001W/results_map_ba/dem/B03_010644_1889_XN_08N001W_P02_001902_1889_XI_08N001W_ba_50_0-DEM-hillshade.tif ./hillshade_2.png
- name: Archive 2nd Round Previews
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: second-round
path: |
Expand Down Expand Up @@ -438,7 +438,7 @@ jobs:
ls ./B03_010644_1889_XN_08N001W_P02_001902_1889_XI_08N001W/* -lahtr
ls ./*/*/* -lahtr
- name: Archive Final Previews
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: always()
with:
name: final_ctx
Expand All @@ -455,13 +455,13 @@ jobs:
run:
shell: bash -l {0}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Setup default miniconda
uses: conda-incubator/[email protected]
with:
miniforge-variant: Mambaforge
- name: Get ASP from cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: "/tmp/sp.tar.bz2"
key: asp-env-${{ runner.os }}-${{ env.ASP_CACHE_NUMBER }}-${{ hashFiles('asap.yml') }}
Expand All @@ -472,7 +472,7 @@ jobs:
rm /tmp/sp.tar.bz2
ls /tmp/sp
- name: Get ISIS Conda environment from cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: "isis-env.tar.gz"
key: isis-env-${{ runner.os }}-${{ env.ISIS_CACHE_NUMBER }}-${{ hashFiles('isis.yml') }}
Expand All @@ -482,7 +482,7 @@ jobs:
tar -xvf isis-env.tar.gz -C /
rm isis-env.tar.gz
- name: Get ASAP Conda environment from cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: "asap-env.tar.gz"
key: asap-env-${{ runner.os }}-${{ env.ASAP_CACHE_NUMBER }}-${{ hashFiles('asap.yml') }}
Expand Down Expand Up @@ -538,7 +538,7 @@ jobs:
ls ./B03_010644_1889_XN_08N001W_P02_001902_1889_XI_08N001W/* -lahtr
ls ./*/*/* -lahtr
- name: Archive Final Notebook from Papermill
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: always()
with:
name: final_notebook
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/python-publish.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ jobs:
deploy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@5
with:
python-version: '3.11'
python-version: '3.13'
- name: Install dependencies
run: |
python -m pip install --upgrade pip
Expand Down
2 changes: 1 addition & 1 deletion isis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ channels:
- conda-forge
- defaults
dependencies:
- isis==7.1.0
- isis==8.3.0
- cspice
- rclone

0 comments on commit 4f7d878

Please sign in to comment.