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.

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 asp to 3.3.0 #37

Merged
merged 3 commits into from
Aug 22, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 4 additions & 9 deletions .github/workflows/ci-test-ctx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ on:
env:
# Increase this value to reset cache
ISIS_CACHE_NUMBER: 34
ASAP_CACHE_NUMBER: 6
ASP_CACHE_NUMBER: 3
ASAP_CACHE_NUMBER: 7
ASP_CACHE_NUMBER: 4
jobs:
cache_asp:
name: Cache ASP distribution
Expand All @@ -26,7 +26,7 @@ jobs:
key: asp-env-${{ runner.os }}-${{ env.ASP_CACHE_NUMBER }}-${{ hashFiles('asap.yml') }}
- name: Download ASP tarball to tmp
run: |
wget -c https://github.com/NeoGeographyToolkit/StereoPipeline/releases/download/3.2.0/StereoPipeline-3.2.0-2023-01-01-x86_64-Linux.tar.bz2 -O /tmp/sp.tar.bz2 --progress=dot:giga
wget -c https://github.com/NeoGeographyToolkit/StereoPipeline/releases/download/3.3.0/StereoPipeline-3.3.0-Linux.tar.bz2 -O /tmp/sp.tar.bz2 --progress=dot:giga
ls /tmp/sp.tar.bz2
cache_isis_env:
name: Cache ISIS conda environment
Expand Down Expand Up @@ -127,7 +127,6 @@ jobs:
tar -czf isis-env.tar.gz $CONDA/envs/isis_for_asp
pwd
ls -lahtr

cache_asap_env:
name: Cache ASAP conda environment
runs-on: ubuntu-latest
Expand Down Expand Up @@ -173,8 +172,6 @@ jobs:
tar -cvzf asap-env.tar.gz $CONDA/envs/asap
pwd
ls -lahtr


test_basic:
name: Basic ASAP Tests
needs: [ cache_asp, cache_isis_env, cache_asap_env ]
Expand Down Expand Up @@ -256,8 +253,6 @@ jobs:
run: |
conda activate asap
python -m readme_renderer README.rst


test_runner:
name: ASAP test CTX pipeline
needs: [cache_asp, cache_isis_env, cache_asap_env]
Expand Down Expand Up @@ -341,6 +336,7 @@ jobs:
run: |
conda activate asap
ls ./* -lahtr
head -n 20 ./*.IMG
env | grep ISIS
pwd
- name: asap step 2
Expand Down Expand Up @@ -451,7 +447,6 @@ jobs:
hillshade_f.png
vis_f.png
./B03_010644_1889_XN_08N001W_P02_001902_1889_XI_08N001W/*.json

test_notebook:
name: ASAP test Notebook CTX pipeline
needs: [cache_asp, cache_isis_env, cache_asap_env]
Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ASAP-Stereo (Ames Stereo Automated Pipeline)
.ASAP-Stereo (Ames Stereo Automated Pipeline)
=============================================

.. image:: https://readthedocs.org/projects/asap-stereo/badge/?version=main
Expand Down
2 changes: 1 addition & 1 deletion asap.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ dependencies:
- sh>=2.0.0
- pip
- pip:
- moody>=0.2.0
- moody>=0.2.3
- readme-renderer
Loading