Skip to content

Commit

Permalink
Merge branch 'main' into new_inv
Browse files Browse the repository at this point in the history
  • Loading branch information
Kelvinrr authored Jun 9, 2024
2 parents 5d4bf6e + 9b0e649 commit 676fa7a
Show file tree
Hide file tree
Showing 35 changed files with 2,593 additions and 3,239 deletions.
26 changes: 5 additions & 21 deletions .github/workflows/ci_testing.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: CMake
name: Build-And-Test

on: [push, pull_request]

Expand Down Expand Up @@ -98,7 +98,7 @@ jobs:
run: |
conda info
conda list
- name: Create Build Environment
# Some projects don't allow in-source building, so create separate build and install
# directorie; we'll use them as our working directories for subsequent commands.
Expand All @@ -109,32 +109,16 @@ jobs:
- name: Configure CMake
working-directory: ${{github.workspace}}/build
run: rm -rf /usr/bin/python* && cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DSPICEQL_BUILD_LIB=OFF -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/install

- name: Build
working-directory: ${{github.workspace}}/build
working-directory: ${{github.workspace}}/
# Execute the build.
run: |
cmake --build . --config $BUILD_TYPE
mkdocs build
- name: Check Build Docs
working-directory: ${{github.workspace}}/build/docs/sphinx
working-directory: ${{github.workspace}}/site
# Check for the built docs
run: |
test -e index.html
test -e reference/api.html
test -e reference/tutorials.html
- name: Install Docs
working-directory: ${{github.workspace}}/build
# Install the build.
run: |
cmake --install . --config $BUILD_TYPE
- name: Check Install Docs
working-directory: ${{github.workspace}}/install
# Check for the built docs
run: |
test -e share/doc/SpiceQL/sphinx/index.html
test -e share/doc/SpiceQL/sphinx/reference/api.html
test -e share/doc/SpiceQL/sphinx/reference/tutorials.html

23 changes: 5 additions & 18 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,33 +70,20 @@ jobs:
cmake -E make_directory ${{github.workspace}}/build
cmake -E make_directory ${{github.workspace}}/install
- name: Configure CMake
working-directory: ${{github.workspace}}/build
run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DSPICEQL_BUILD_LIB=OFF -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/install

- name: Build
working-directory: ${{github.workspace}}/build
working-directory: ${{github.workspace}}
# Execute the build.
run: |
cmake --build .
mkdocs build
- name: Check Build Docs
working-directory: ${{github.workspace}}/build/docs/sphinx
working-directory: ${{github.workspace}}/site/
# Check for the built docs
run: |
test -e index.html
test -e reference/api.html
test -e reference/tutorials.html
- name: Install Docs
working-directory: ${{github.workspace}}/build
# Install the build.
run: |
cmake --install .
- name: Upload to S3
working-directory: ${{github.workspace}}/install
working-directory: ${{github.workspace}}/
run: |
ls -l share/doc/SpiceQL/sphinx/
aws s3 sync --delete share/doc/SpiceQL/sphinx/ s3://asc-public-docs/software_manuals/spiceql/
aws s3 sync --delete site/ s3://asc-public-docs/software_manuals/spiceql/
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,11 @@ release.
### Added
- Adds support for LO [#11](https://github.com/DOI-USGS/SpiceQL/issues/11)
- Adds support for Smart1 [#16](https://github.com/DOI-USGS/SpiceQL/issues/16)
- Adds support for Hayabusa2 ONC [#12](https://github.com/DOI-USGS/SpiceQL/issues/12)
- Adds support for Voyager [#13](https://github.com/DOI-USGS/SpiceQL/issues/13)
- Adds support for LROC MiniRF [#10](https://github.com/DOI-USGS/SpiceQL/issues/10)
- Adds support for MSL [#15](https://github.com/DOI-USGS/SpiceQL/issues/15)
- Adds support for MER [#14](https://github.com/DOI-USGS/SpiceQL/issues/14)

### Fixed

Expand Down
20 changes: 8 additions & 12 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -89,19 +89,26 @@ if(SPICEQL_BUILD_LIB)
${CMAKE_CURRENT_SOURCE_DIR}/SpiceQL/db/cassini.json
${CMAKE_CURRENT_SOURCE_DIR}/SpiceQL/db/clem1.json
${CMAKE_CURRENT_SOURCE_DIR}/SpiceQL/db/galileo.json
${CMAKE_CURRENT_SOURCE_DIR}/SpiceQL/db/hayabusa2.json
${CMAKE_CURRENT_SOURCE_DIR}/SpiceQL/db/juno.json
${CMAKE_CURRENT_SOURCE_DIR}/SpiceQL/db/kaguya.json
${CMAKE_CURRENT_SOURCE_DIR}/SpiceQL/db/lro.json
${CMAKE_CURRENT_SOURCE_DIR}/SpiceQL/db/lo.json
${CMAKE_CURRENT_SOURCE_DIR}/SpiceQL/db/mer1.json
${CMAKE_CURRENT_SOURCE_DIR}/SpiceQL/db/mer2.json
${CMAKE_CURRENT_SOURCE_DIR}/SpiceQL/db/mess.json
${CMAKE_CURRENT_SOURCE_DIR}/SpiceQL/db/mex.json
${CMAKE_CURRENT_SOURCE_DIR}/SpiceQL/db/mgs.json
${CMAKE_CURRENT_SOURCE_DIR}/SpiceQL/db/mro.json
${CMAKE_CURRENT_SOURCE_DIR}/SpiceQL/db/msl.json
${CMAKE_CURRENT_SOURCE_DIR}/SpiceQL/db/odyssey.json
${CMAKE_CURRENT_SOURCE_DIR}/SpiceQL/db/smart1.json
${CMAKE_CURRENT_SOURCE_DIR}/SpiceQL/db/tgo.json
${CMAKE_CURRENT_SOURCE_DIR}/SpiceQL/db/viking1.json
${CMAKE_CURRENT_SOURCE_DIR}/SpiceQL/db/viking2.json)
${CMAKE_CURRENT_SOURCE_DIR}/SpiceQL/db/viking2.json
${CMAKE_CURRENT_SOURCE_DIR}/SpiceQL/db/voyager1.json
${CMAKE_CURRENT_SOURCE_DIR}/SpiceQL/db/voyager2.json
)

set(SPICEQL_KERNELS ${CMAKE_CURRENT_SOURCE_DIR}/SpiceQL/db/kernels/naif0011.tls)

Expand Down Expand Up @@ -201,14 +208,3 @@ else()
message(STATUS "Skipping Bindings")
endif()

##############
# Docs Build #
##############

option (SPICEQL_BUILD_DOCS "Build the SpiceQL Docs" ON)

if(SPICEQL_BUILD_DOCS)
add_subdirectory ("docs")
else()
message(STATUS "Skipping Docs")
endif()
4 changes: 2 additions & 2 deletions SpiceQL/db/hayabusa.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"ik": {
"kernels": ["amica31.ti"]
},
"deps" : ["hayabusa"]
"deps" : ["/hayabusa"]
},
"nirs": {
"spk" : {
Expand All @@ -47,6 +47,6 @@
"ik": {
"kernels": ["nirs10.ti"]
},
"deps" : ["hayabusa"]
"deps" : ["/hayabusa"]
}
}
42 changes: 12 additions & 30 deletions SpiceQL/db/hayabusa2.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,48 +2,30 @@
"hayabusa2" : {
"ck" : {
"reconstructed" : {
"kernels" : ["hayabusa_itokawarendezvous_v02n.bc$"]
"kernels" : ["hyb2_.*_[0-9]{4}_v[0-9]{2}.bc"]
}
},
"dsk" : {
"kernels" : ["hay_a_amica_5_itokawashape_v1_0_512q.bds$", "hay_a_amica_5_itokawashape_v1_0_64q.bds$"]
},
"fk" : {
"kernels" : ["itokawa_fixed.tf$", "hayabusa_hp.tf$"]
},
"pck" : {
"reconstructed" : {
"kernels" : ["itokawa_gaskell_n[0-9]{1}.tpc$"]
}
"kernels" : ["hyb2_v[0-9]{2}.tf$", "hyb2_ryugu_v[0-9]{2}.tf$", "hyb2_hp_v[0-9]{2}.tf$"]
},
"sclk" : {
"kernels" : ["hayabusa.tsc$"]
"kernels" : ["hyb2_20141203-[0-9]{4}1231_v01.tsc$"]
},
"tspk" : {
"kernels" : ["sb_25143_140.bsp$", "de403s.bsp$"]
"kernels" : ["de430.bsp$", "[0-9]{7}_ryugu_[0-9]{8}-[0-9]{8}_[0-9]{4}_[0-9]{8}.bsp$", "jup329.bsp", "sat375.bsp", "[0-9]{7}_Ryugu.bsp$", "[0-9]{7}_ryugu_[0-9]{8}-[0-9]{8}_[0-9]{4}_[0-9]{8}.bsp"]
}
},
"amica" : {
"ik" : {
"kernels" : ["amica[0-9]{2}.ti$"]
},
"iak" : {
"kernels" : ["amicaAddendum[0-9]{3}.ti$"]
"onc" : {
"ik" : {
"kernels" : ["hyb2_onc_v[0-9]{2}.ti$"]
},
"spk" : {
"kernels" : ["hay_jaxa_050916_051119_v1n.bsp$", "hay_osbj_050911_051118_v1n.bsp$"]
},
"deps" : ["/hayabusa2"]
},
"nirs" : {
"ik" : {
"kernels" : ["nirs[0-9]{2}.ti$"]
},
"iak" : {
"kernels" : ["nirsAddendum[0-9]{3}.ti$"]
"kernels" : ["hyb2oncAddendum[0-9]{4}.ti$"]
},
"spk" : {
"kernels" : ["hay_jaxa_050916_051119_v1n.bsp$", "hayabusa_[0-9]{8}_[0-9]{8}_v[0-9]{2}.bsp$"]
"spk" : {
"reconstructed" : {
"kernels" : ["hyb2_[0-9]{8}-[0-9]{8}_[0-9]{4}[a-z]{1}_final_ver[0-9]{1}.oem.bsp$", "hyb2_hpk_[0-9]{8}_[0-9]{8}_v[0-9]{2}.bsp$", "hyb2_approach_od_v[0-9]{14}.bsp","lidar_derived_trj_[0-9]{8}_[0-9]{14}_[0-9]{14}_v[0-9]{2}.bsp$"]
}
},
"deps" : ["/hayabusa2"]
}
Expand Down
6 changes: 6 additions & 0 deletions SpiceQL/db/lro.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,11 @@
"kernels" : ["lro_lroc_v[0-9]{2}.ti$"]
},
"deps" : ["/moc"]
},
"minirf" : {
"iak" : {
"kernels" : "mrflroAddendum[0-9]{3}.ti$"
},
"deps" : ["/lroc"]
}
}
41 changes: 41 additions & 0 deletions SpiceQL/db/mer1.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
{
"mer1" : {
"ck" : {
"reconstructed" : {
"kernels" : ["mer1_surf_[a-z]{2,5}_ext[0-9]{1,2}_v[0-9]{1}.bc$",
"mer1_cruise.bc$",
"mer1_hga_stowed.bc$",
"mer1_surf_[a-z]{3,5}(_prim_v1)?.bc$"]
}
},
"spk" : {
"reconstructed" : {
"kernels" : ["de410_de910.bsp$",
"mar033(_[0-9]{4}-[0-9]{4})?.bsp$",
"mer1_cruise.bsp$",
"mer1_still_at_ls_v1.bsp$",
"mer1_struct_ver11.bsp$",
"mer1_edl_rcb_v1.bsp$",
"mer1_ls_040128_iau2000_v1.bsp$",
"mer1_surf_iddg.bsp$",
"mer1_surf_rover(rl)?(_[0-9]{4}_[0-9]{4}_v[0-9]{1})?.bsp$",
"mer1_surf_[a-z]{4,7}_[a-z]{2,4}[0-9]{0,2}(_v[0-9]{1})?.bsp$"]
}
},
"fk" : {
"kernels" : ["mer1(_v[0-9]{2})?.tf$",
"mer1_tp_tm20b3_iau2000_v[0-9]{1}.tf$"]
},
"ik" : {
"kernels" :"mer1_[a-z]{2}_([a-z][0-9]_)?[0-9]{8}_c[0-9]{2,3}.ti$"
},
"sclk" : {
"kernels" : ["MER_253_SCLKSCET.[0-9]{5}.tsc$",
"mer1_hlst_tm20b3_v[0-9]{1}.tsc",
"mer1.tsc$"]
},
"pck" : {
"kernels" : "mars_iau2000_v0.tpc"
}
}
}
41 changes: 41 additions & 0 deletions SpiceQL/db/mer2.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
{
"mer2" : {
"ck" : {
"reconstructed" : {
"kernels" : ["mer2_surf_[a-z]{2,5}_ext[0-9]{1,2}_v[0-9]{1}.bc$",
"mer2_surf_[a-z]{2,5}.bc$",
"mer2_cruise.bc$",
"mer2_surf_[a-z]{3,5}_[a-z]{2,3}_v[0-9]{1}.bc$",
"mer2_hga_stowed.bc$"]
}
},
"spk" : {
"reconstructed" : {
"kernels" : ["de410_de910.bsp$",
"mar033(_[0-9]{4}-[0-9]{4})?.bsp$",
"mer2_cruise.bsp",
"mer2_edl_rcb_v1.bsp",
"mer2_ls_040108_iau2000_v[0-9]{1}.bsp$",
"mer2_still_at_ls_v[0-9]{1}.bsp$",
"mer2_surf_[a-z]{3,7}_[a-z]{2,3}_v[0-9]{1,2}.bsp$",
"mer2_struct_ver[0-9]{2}.bsp$",
"spk_b_s_071029-160101_110624.bsp$",
"mer2_surf_[a-z]{4,7}_[a-z]{2,4}[0-9]{0,2}(_v[0-9]{1})?.bsp$"]
}
},
"fk" : {
"kernels" : ["mer2(_v[0-9]{2})?.tf$",
"mer2_tp_[a-z]{2}[0-9]{2}[a-z][0-9]([a-z])?_iau2000_v[0-9]{1}.tf$"]
},
"ik" : {
"kernels" :"mer2_[a-z]{2}_([a-z][0-9]_)?[0-9]{8}_c[0-9]{2,3}.ti$"
},
"sclk" : {
"kernels" : ["MER_254_SCLKSCET.[0-9]{5}.tsc$",
"mer2(_hlst_[a-z]{2}[0-9]{2}[a-z][0-9]([a-z])?_v[0-9]{1})?.tsc"]
},
"pck" : {
"kernels" : "mars_iau2000_v0.tpc"
}
}
}
56 changes: 56 additions & 0 deletions SpiceQL/db/msl.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
{
"msl":{
"ck":{
"reconstructed":{
"kernels":["msl_ra_[a-z]{8}_v[0-9]{1}.bc$",
"msl_cruise_recon_raw[a-z]{2,3}_v[0-9]{1}.bc$",
"msl_edl_v[0-9]{2}.bc$",
"msl_surf_[a-z]{2,5}_tlm[a-z]{0,3}.bc$",
"msl_surf_[a-z]{2,5}_[a-z]{2,6}_[0-9]{4}_[0-9]{4}_v[0-9]{1}.bc$",
"msl_surf_[a-z]{2,5}_tlm[a-z]{0,3}_spanned.bc",
"msl_cruise_recon_nospin.bc$",
"msl_still_at_ls_v1.bc$",
"msl_surf_rover_runout.bc$",
"msl_rover2cacs_v[0-9]{1}.bc$",
"msl_rsm_calpose_v[0-9]{1}.bc$",
"msl_hga_zero_v[0-9]{1}.bc$"]
}
},
"fk":{
"kernels":["msl.tf(.history)?$",
"msl_v[0-9]{2}.tf$",
"msl_tp_gc[0-9]{6}_iau2000_v[0-9]{1}.tf",
"msl_tp_[a-z]{2,3}[0-9]{6}_iau2000_v[0-9]{1}.tf$"]
},
"sclk":{
"kernels":["msl.tsc$",
"msl_lmst_[a-z]{2,3}[0-9]{6}_v[0-9]{1}.tsc$",
"MSL_[0-9]{2}_SCLKSCET.[0-9]{5}.tsc$"]
},
"ik":{
"kernels":["msl_[a-z]{2,5}_[c,v][0-9]{2}.ti$",
"msl_struct_v[0-9]{2}.ti$",
"msl_[a-z]{2,3}_zero_v[0-9]{1}.ti$",
"msl_[a-z]{4,5}_[0-9]{8}_c[0-9]{2}.ti$",
"msl_m[l,r]{1}_[0-9]{8}_c[0-9]{2}.ti$",
"msl_[a-z]{3}_[0-9]{8}_c[0-9]{2}.ti$"]
},
"lsk":{
"kernels":"msl.tls(.history)?$"
},
"spk":{
"kernels":["msl_struct_v[0-9]{2}.bsp$",
"msl_cruise_v[0-9]{1}.bsp$",
"msl_edl_v[0-9]{2}.bsp$",
"msl_ls_ops[0-9]{6}_iau2000_v[0-9]{1}.bsp$",
"msl_surf_rover_[a-z]{0,3}_?(runout)?.bsp$",
"msl_surf_[a-z]{5}_[a-z]{3}_[0-9]{4}_[0-9]{4}_v[0-9]{1}.bsp",
"msl_atls_[a-z]{2,3}[0-9]{6}_v[0-9]{1}.bsp$",
"msl_cruise.bsp(.history)?$",
"msl_[a-z]{2}_gc[0-9]{6}_iau2000_v[0-9]{1}.bsp$",
"msl_still_at_ls_v[0-9]{1}.bsp$",
"msl_spk_cruise_od057_v[0-9]{1}-tcm2_eph-edl-landed.bsp$",
"msl_cruise_merged_[0-9]{6}.bsp"]
}
}
}
Loading

0 comments on commit 676fa7a

Please sign in to comment.