From 743387dab394a5ae484e9568252bd1003c325c45 Mon Sep 17 00:00:00 2001
From: Jesse Mapel <jmapel@usgs.gov>
Date: Fri, 4 Mar 2022 12:29:29 -0700
Subject: [PATCH] Updates for spiceypy 5
---
ale/base/data_naif.py | 2 +-
environment.yml | 2 +-
recipe/meta.yaml | 2 +-
tests/pytests/data/MVA_2B2_01_02329N002E0302/SEL_M_V01.TSC | 2 +-
tests/pytests/data/TC1S2B0_01_06691S820E0465/SEL_M_V01.TSC | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ale/base/data_naif.py b/ale/base/data_naif.py
index 7049957..bbf9186 100644
--- a/ale/base/data_naif.py
+++ b/ale/base/data_naif.py
@@ -397,7 +397,7 @@ class NaifSpice():
'SSB')
state = ssb_tar_state - ssb_obs_state
matrix = spice.sxform("J2000", self.reference_frame, time)
- state = spice.mxvg(matrix, state, 6, 6);
+ state = spice.mxvg(matrix, state)
else:
state, _ = spice.spkezr(target,
time,
diff --git a/environment.yml b/environment.yml
index 2d4e741..78c8b7d 100644
--- a/environment.yml
+++ b/environment.yml
@@ -15,7 +15,7 @@ dependencies:
- python
- python-dateutil
- scipy>=1.4.0
- - spiceypy>=2.3.0
+ - spiceypy>=4.0.1
- pyyaml
- pytest
- pytest-cov
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
index ead926e..77c50b1 100644
--- a/recipe/meta.yaml
+++ b/recipe/meta.yaml
@@ -29,7 +29,7 @@ requirements:
- python-dateutil
- pytz
- scipy >=1.4.0
- - spiceypy >=2.3.0
+ - spiceypy >=4.0.1
- pyyaml
test:
diff --git a/tests/pytests/data/MVA_2B2_01_02329N002E0302/SEL_M_V01.TSC b/tests/pytests/data/MVA_2B2_01_02329N002E0302/SEL_M_V01.TSC
index f1f3fe8..298916c 100755
--- a/tests/pytests/data/MVA_2B2_01_02329N002E0302/SEL_M_V01.TSC
+++ b/tests/pytests/data/MVA_2B2_01_02329N002E0302/SEL_M_V01.TSC
@@ -11,7 +11,7 @@ SCLK_KERNEL_ID = ( @2009-06-10T12:57:27.4670 )
SCLK_DATA_TYPE_131 = ( 1 )
SCLK01_N_FIELDS_131 = ( 1 )
SCLK01_MODULI_131 = ( 4294967296 )
-SCLK01_OFFSETS_131 = ( 0 0 )
+SCLK01_OFFSETS_131 = ( 0 )
SCLK01_OUTPUT_DELIM_131 = ( 2 )
SCLK_PARTITION_START_131 = ( 0.0000000000000E+00 )
SCLK_PARTITION_END_131 = ( 1.2614400000000E+09 )
diff --git a/tests/pytests/data/TC1S2B0_01_06691S820E0465/SEL_M_V01.TSC b/tests/pytests/data/TC1S2B0_01_06691S820E0465/SEL_M_V01.TSC
index f1f3fe8..298916c 100644
--- a/tests/pytests/data/TC1S2B0_01_06691S820E0465/SEL_M_V01.TSC
+++ b/tests/pytests/data/TC1S2B0_01_06691S820E0465/SEL_M_V01.TSC
@@ -11,7 +11,7 @@ SCLK_KERNEL_ID = ( @2009-06-10T12:57:27.4670 )
SCLK_DATA_TYPE_131 = ( 1 )
SCLK01_N_FIELDS_131 = ( 1 )
SCLK01_MODULI_131 = ( 4294967296 )
-SCLK01_OFFSETS_131 = ( 0 0 )
+SCLK01_OFFSETS_131 = ( 0 )
SCLK01_OUTPUT_DELIM_131 = ( 2 )
SCLK_PARTITION_START_131 = ( 0.0000000000000E+00 )
SCLK_PARTITION_END_131 = ( 1.2614400000000E+09 )
--
GitLab