Updated conda packages for orekit 10.1

orekit-conda-recipe/bld.bat

@@ -10,18 +10,20 @@
 --use_full_names ^
 --python orekit ^
 --version %PKG_VERSION% ^
---jar %SRC_DIR%\orekit-9.3.1.jar ^
---jar %SRC_DIR%\hipparchus-core-1.4.jar ^
---jar %SRC_DIR%\hipparchus-filtering-1.4.jar ^
---jar %SRC_DIR%\hipparchus-fitting-1.4.jar ^
---jar %SRC_DIR%\hipparchus-geometry-1.4.jar ^
---jar %SRC_DIR%\hipparchus-ode-1.4.jar ^
---jar %SRC_DIR%\hipparchus-optim-1.4.jar ^
---jar %SRC_DIR%\hipparchus-stat-1.4.jar ^
+--jar %SRC_DIR%\orekit-10.1.jar ^
+--jar %SRC_DIR%\hipparchus-core-1.6.jar ^
+--jar %SRC_DIR%\hipparchus-filtering-1.6.jar ^
+--jar %SRC_DIR%\hipparchus-fitting-1.6.jar ^
+--jar %SRC_DIR%\hipparchus-geometry-1.6.jar ^
+--jar %SRC_DIR%\hipparchus-ode-1.6.jar ^
+--jar %SRC_DIR%\hipparchus-optim-1.6.jar ^
+--jar %SRC_DIR%\hipparchus-stat-1.6.jar ^
+--jar %SRC_DIR%\rugged-2.1.jar ^
 --package java.io ^
 --package java.util ^
 --package java.text ^
 --package org.orekit ^
+--package org.orekit.rugged ^
 java.io.BufferedReader ^
 java.io.FileInputStream ^
 java.io.FileOutputStream ^
@@ -48,13 +50,9 @@ java.util.Locale ^
 java.util.Map ^
 java.util.Set ^
 java.util.TreeSet ^
-java.util.concurrent.Executors ^
-java.util.concurrent.TimeUnit ^
-java.util.concurrent.ExecutorService ^
 java.util.stream.Collectors ^
 java.util.stream.Stream ^
 java.util.stream.DoubleStream ^
-java.util.concurrent.atomic.AtomicReference ^
 --module %SRC_DIR%\pyhelpers.py ^
 --reserved INFINITE ^
 --reserved ERROR ^
@@ -65,7 +63,8 @@ java.util.concurrent.atomic.AtomicReference ^
 --reserved max ^
 --reserved mean ^
 --reserved SNAN ^
---files 10 ^
+--classpath %PREFIX%\Library\lib\tools.jar ^
+--files 81 ^
 --build ^
 --install
 if errorlevel 1 exit 1

orekit-conda-recipe/build.sh

@@ -4,18 +4,20 @@ $PYTHON -m jcc \
 --use_full_names \
 --python orekit \
 --version ${PKG_VERSION} \
---jar $SRC_DIR/orekit-9.3.1.jar \
---jar $SRC_DIR/hipparchus-core-1.4.jar \
---jar $SRC_DIR/hipparchus-filtering-1.4.jar \
---jar $SRC_DIR/hipparchus-fitting-1.4.jar \
---jar $SRC_DIR/hipparchus-geometry-1.4.jar \
---jar $SRC_DIR/hipparchus-ode-1.4.jar \
---jar $SRC_DIR/hipparchus-optim-1.4.jar \
---jar $SRC_DIR/hipparchus-stat-1.4.jar \
+--jar $SRC_DIR/orekit-10.1.jar \
+--jar $SRC_DIR/hipparchus-core-1.6.jar \
+--jar $SRC_DIR/hipparchus-filtering-1.6.jar \
+--jar $SRC_DIR/hipparchus-fitting-1.6.jar \
+--jar $SRC_DIR/hipparchus-geometry-1.6.jar \
+--jar $SRC_DIR/hipparchus-ode-1.6.jar \
+--jar $SRC_DIR/hipparchus-optim-1.6.jar \
+--jar $SRC_DIR/hipparchus-stat-1.6.jar \
+--jar $SRC_DIR/rugged-2.1.jar \
 --package java.io \
 --package java.util \
 --package java.text \
 --package org.orekit \
+--package org.orekit.rugged \
 java.io.BufferedReader \
 java.io.FileInputStream \
 java.io.FileOutputStream \
@@ -42,13 +44,9 @@ java.util.Locale \
 java.util.Map \
 java.util.Set \
 java.util.TreeSet \
-java.util.concurrent.Executors \
-java.util.concurrent.TimeUnit \
-java.util.concurrent.ExecutorService \
 java.util.stream.Collectors \
 java.util.stream.Stream \
 java.util.stream.DoubleStream \
-java.util.concurrent.atomic.AtomicReference \
 --module $SRC_DIR/pyhelpers.py \
 --reserved INFINITE \
 --reserved ERROR \
@@ -59,7 +57,8 @@ java.util.concurrent.atomic.AtomicReference \
 --reserved max \
 --reserved mean \
 --reserved SNAN \
---files 10 \
+--classpath $PREFIX/lib/tools.jar \
+--files 81 \
 --build \
 --install
 

orekit-conda-recipe/meta.yaml

 {% set name = "orekit" %}
-{% set version = "9.3.1" %}
-{% set filename = "v9_3_1_0" %}
-{% set sha256 = "8b6b84599542927a419261667ad0374c82b4d92daded52483fc9ce658af82217" %}
+{% set version = "10.1" %}
+{% set artifact_filename = "v10_1_5" %}
+{% set sha256 = "350781883ced170a2d2d7b4a5d91f8af4010aa942347eb7ff59aad48570aa780" %}  # [not osx]
+{% set sha256 = "66ebabc895773dff2293e011547a626c9652ffeb74023fc900f3875b55f95de2" %}  # [osx]
+
 
 package:
   name: {{ name|lower }}
   version: {{ version }}
 
 source:
-  fn: {{ filename }}.zip
-  url: https://github.com/petrushy/orekit_python_artifacts/archive/{{ filename }}.zip
+  fn: {{ artifact_filename }}.zip  # [not osx]
+  url: https://github.com/petrushy/orekit_python_artifacts/archive/{{ artifact_filename }}.zip  # [not osx]
+  fn: {{ artifact_filename }}.tar.gz  # [osx]
+  url: https://github.com/petrushy/orekit_python_artifacts/archive/{{ artifact_filename }}.tar.gz  # [osx]
   sha256: {{ sha256 }}
 
 build:
@@ -27,8 +31,8 @@ requirements:
   host:
     - python
     - setuptools
-    - jcc >=3.3
-    # Force anaconda openjdk
+    - jcc >=3.6
+    # Force anaconda openjdk 
     - openjdk 8.0.152
 
   run:
@@ -60,6 +64,7 @@ about:
     various algorithms to handle them (conversions, propagations, pointing, ....).
 
     The Orekit library is written in java. This package provides a python wrapper to that library.
+
   doc_url: https://www.orekit.org/static/apidocs/
 
 extra:

orekit-conda-recipe/run_test.bat

 cd test
+setlocal EnableDelayedExpansion
+set error=0
+
 for %%f in (*.py) do (
     python "%%f"
-    if errorlevel 1 exit 1
+    if "!errorlevel!" NEQ "0" (
+        set error=1
+    )
 )
 
+if %error% NEQ 0 exit /B 1
+

orekit-conda-recipe/run_test.sh

 #!/usr/bin/env bash
 cd test
 
+ERROR=0
+
 for f in *.py; do
     if python "$f"; then
         echo "Test reported ok"
     else
-        echo "Trying to Fail!"
-        exit 1
+        echo "Test failed"
+        ERROR=1
     fi
 done
-exit 0
+exit $ERROR