diff --git a/orekit-conda-recipe/build.sh b/orekit-conda-recipe/build.sh
index ca898deadb200a225a59be4a1ecbaf03e914dfa6..f09fc8895dfed10da476366f29074e44ccd5d1b0 100644
--- a/orekit-conda-recipe/build.sh
+++ b/orekit-conda-recipe/build.sh
@@ -8,7 +8,7 @@ $PYTHON -m jcc \
--python orekit \
--version 7.1.dev \
--jar $RECIPE_DIR/orekit-7.1-SNAPSHOT.jar \
---jar $RECIPE_DIR/commons-math3-3.5.jar \
+--jar $RECIPE_DIR/commons-math3-3.6-SNAPSHOT.jar \
--package java.io \
--package java.util \
--package java.text \
diff --git a/orekit-conda-recipe/meta.yaml b/orekit-conda-recipe/meta.yaml
index 0f71a287a5259edf004d9f8a6cb39866afbfcae9..fb4deaf1b15f4e309cd0538eba48a7daed8df1fb 100644
--- a/orekit-conda-recipe/meta.yaml
+++ b/orekit-conda-recipe/meta.yaml
@@ -2,14 +2,6 @@ package:
name: orekit
version: '7.1.dev0'
-#source:
-# fn: orekit-6.1.jar
-# url: https://www.orekit.org/forge/attachments/download/402/orekit-6.1.jar
-# md5: bf7dd84f65a842bd196e8324199e7a91
-# patches:
- # List any patch files here
- # - fix.patch
-
build:
# entry_points:
# Put any entry points (scripts to be generated automatically) here. The
@@ -22,10 +14,10 @@ build:
# If this is a new build for the same version, increment the build
# number. If you do not include this key, it defaults to 0.
- number: 1
+ number: 2
# Builds:
# 1 - orekit 7.1dev0 version from git 2015-10-05
-
+ # 2 - orekit 7.1dev0 version from git 2015-12-17
#has_prefix_files:
@@ -37,10 +29,11 @@ requirements:
- jcc 2.21
- python
- setuptools
+ - java-jdk [win or linux]
run:
- python
- #- java-jdk [win]
+ - java-jdk [win or linux]
#- jcc 2.21
#- setuptools
diff --git a/orekit-conda-recipe/orekit-7.1-SNAPSHOT.jar b/orekit-conda-recipe/orekit-7.1-SNAPSHOT.jar
index 5c032864e6f4ddddc2c340b4ecc1976beacdfc99..0658975e94bc842dc337528dcd7736ea9a5dbc13 100644
Binary files a/orekit-conda-recipe/orekit-7.1-SNAPSHOT.jar and b/orekit-conda-recipe/orekit-7.1-SNAPSHOT.jar differ
diff --git a/orekit-conda-recipe/test/AbstractDetectorTest.py b/orekit-conda-recipe/test/AbstractDetectorTest.py
index 179da2ccaa1112022abfe53fa5f053d265b1a970..3029aa579138e56861ad39f51109c272c3c0a7eb 100644
--- a/orekit-conda-recipe/test/AbstractDetectorTest.py
+++ b/orekit-conda-recipe/test/AbstractDetectorTest.py
@@ -18,6 +18,7 @@ from org.orekit.propagation.events.handlers import ContinueOnEvent, StopOnEvent
from math import radians
import math
import unittest
+import sys
from orekit.pyhelpers import setup_orekit_curdir
setup_orekit_curdir()
@@ -110,6 +111,5 @@ class AbstractDetectorTest(unittest.TestCase):
if __name__ == '__main__':
suite = unittest.TestLoader().loadTestsFromTestCase(AbstractDetectorTest)
- unittest.TextTestRunner(verbosity=2).run(suite)
-
- print "AbstractDetectorTest successfully run"
\ No newline at end of file
+ ret = not unittest.TextTestRunner(verbosity=2).run(suite).wasSuccessful()
+ sys.exit(ret)
diff --git a/orekit-conda-recipe/test/BackAndForthDetectorTest.py b/orekit-conda-recipe/test/BackAndForthDetectorTest.py
index ba28cb5f174cb140e6761957457c7c76a0e1d27f..405eba63406f5328a6a546e50de4471ed290c146 100644
--- a/orekit-conda-recipe/test/BackAndForthDetectorTest.py
+++ b/orekit-conda-recipe/test/BackAndForthDetectorTest.py
@@ -43,6 +43,7 @@ from org.orekit.utils import Constants;
from org.orekit.utils import IERSConventions;
from org.orekit.propagation.events import ElevationDetector
import unittest
+import sys
import math
@@ -111,6 +112,6 @@ if __name__ == '__main__':
#unittest.main()
suite = unittest.TestLoader().loadTestsFromTestCase(BackAndForthDetectorTest)
- unittest.TextTestRunner(verbosity=2).run(suite)
-
- print "BackandForthDetectorTest successfully run"
+ ret = not unittest.TextTestRunner(verbosity=2).run(suite).wasSuccessful()
+ sys.exit(ret)
+
diff --git a/orekit-conda-recipe/test/EventDetectorTest.py b/orekit-conda-recipe/test/EventDetectorTest.py
index b78503c90ff1d4478e573a566a0345997351c858..7ef86acb0e4d4fddb0539cde869cfd49535582a0 100644
--- a/orekit-conda-recipe/test/EventDetectorTest.py
+++ b/orekit-conda-recipe/test/EventDetectorTest.py
@@ -40,6 +40,7 @@ from org.orekit.python import PythonEventHandler, PythonAbstractDetector, Python
from math import radians
import math
import unittest
+import sys
from orekit.pyhelpers import setup_orekit_curdir
setup_orekit_curdir()
@@ -124,6 +125,5 @@ class EventDetectorTest(unittest.TestCase):
if __name__ == '__main__':
suite = unittest.TestLoader().loadTestsFromTestCase(EventDetectorTest)
- unittest.TextTestRunner(verbosity=2).run(suite)
-
- print "EventDetectorTest successfully run"
\ No newline at end of file
+ ret = not unittest.TextTestRunner(verbosity=2).run(suite).wasSuccessful()
+ sys.exit(ret)
diff --git a/orekit-conda-recipe/test/EventHandlerTest.py b/orekit-conda-recipe/test/EventHandlerTest.py
index d95e10fef600475c1b2e5a76940c7a48d153b684..e8fdb0feb329cbeb21fa2a76faf95426682caef3 100644
--- a/orekit-conda-recipe/test/EventHandlerTest.py
+++ b/orekit-conda-recipe/test/EventHandlerTest.py
@@ -43,6 +43,7 @@ from org.orekit.propagation.events import EventsLogger
from math import radians
import math
import unittest
+import sys
#%% Setup Orekit
from orekit.pyhelpers import setup_orekit_curdir
@@ -114,6 +115,5 @@ class EventHandlerTest(unittest.TestCase):
if __name__ == '__main__':
suite = unittest.TestLoader().loadTestsFromTestCase(EventHandlerTest)
- unittest.TextTestRunner(verbosity=2).run(suite)
-
- print "EventHandlerTest successfully run"
\ No newline at end of file
+ ret = not unittest.TextTestRunner(verbosity=2).run(suite).wasSuccessful()
+ sys.exit(ret)
diff --git a/orekit-conda-recipe/test/ImpulseManeuverTest.py b/orekit-conda-recipe/test/ImpulseManeuverTest.py
index 2418c275459976e686137e68071ff9c0686bb974..c4fb8c54424176ecea1145c32912ea22474ec59c 100644
--- a/orekit-conda-recipe/test/ImpulseManeuverTest.py
+++ b/orekit-conda-recipe/test/ImpulseManeuverTest.py
@@ -44,6 +44,7 @@ from org.orekit.time import TimeComponents;
from org.orekit.time import TimeScalesFactory;
from org.orekit.forces.maneuvers import ImpulseManeuver
import unittest
+import sys
import math
class ImpulseManeuverTest(unittest.TestCase):
@@ -87,5 +88,6 @@ if __name__ == '__main__':
#unittest.main()
suite = unittest.TestLoader().loadTestsFromTestCase(ImpulseManeuverTest)
- unittest.TextTestRunner(verbosity=2).run(suite)
- print "ImpulseManeuverTest successfully run"
+ ret = not unittest.TextTestRunner(verbosity=2).run(suite).wasSuccessful()
+ sys.exit(ret)
+
diff --git a/orekit-conda-recipe/test/KeplerianConverterTest.py b/orekit-conda-recipe/test/KeplerianConverterTest.py
index 981dfa2776e3b62ec94470322e7dfcfec235c8be..9675ac28dae45fa82b113fb9acd93831c595cb1a 100644
--- a/orekit-conda-recipe/test/KeplerianConverterTest.py
+++ b/orekit-conda-recipe/test/KeplerianConverterTest.py
@@ -36,6 +36,7 @@ from org.orekit.utils import PVCoordinates
from org.orekit.propagation.conversion import FiniteDifferencePropagatorConverter
from org.orekit.propagation.conversion import KeplerianPropagatorBuilder
import unittest
+import sys
from java.util import Arrays
@@ -95,10 +96,10 @@ class KeplerianConverterTest(unittest.TestCase):
delta = eps * orbit.getPVCoordinates().getVelocity().getZ());
def testConversionPositionVelocity(self):
- self.checkFit(self.orbit, 86400, 300, 1.0e-3, False, 1.94e-8)
+ self.checkFit(self.orbit, 86400, 300, 1.0e-3, False, 1.89e-8)
def testConversionPositionOnly(self):
- self.checkFit(self.orbit, 86400, 300, 1.0e-3, True, 2.27e-8)
+ self.checkFit(self.orbit, 86400, 300, 1.0e-3, True, 2.90e-8)
# #@Test(expected = OrekitException.class)
# def testConversionWithFreeParameter(self):
@@ -115,6 +116,5 @@ class KeplerianConverterTest(unittest.TestCase):
if __name__ == '__main__':
suite = unittest.TestLoader().loadTestsFromTestCase(KeplerianConverterTest)
- unittest.TextTestRunner(verbosity=2).run(suite)
-
- print "KeplerianConverterTest successfully run"
+ ret = not unittest.TextTestRunner(verbosity=2).run(suite).wasSuccessful()
+ sys.exit(ret)
diff --git a/orekit-conda-recipe/test/SmallManeuverAnalyticalModelTest.py b/orekit-conda-recipe/test/SmallManeuverAnalyticalModelTest.py
index e0e1747f29fcd15447c4c2be90abfd4e8fff7e72..d3ae1f5dc02a7ae9df9fe1cd186b53df4366f930 100644
--- a/orekit-conda-recipe/test/SmallManeuverAnalyticalModelTest.py
+++ b/orekit-conda-recipe/test/SmallManeuverAnalyticalModelTest.py
@@ -58,6 +58,7 @@ from math import radians
# from org.orekit.forces.maneuvers import getEphemeris
import unittest
+import sys
class SmallManeuverAnalyticalModelTest(unittest.TestCase):
@@ -221,6 +222,5 @@ class SmallManeuverAnalyticalModelTest(unittest.TestCase):
if __name__ == '__main__':
suite = unittest.TestLoader().loadTestsFromTestCase(SmallManeuverAnalyticalModelTest)
- unittest.TextTestRunner(verbosity=2).run(suite)
-
- print "SmallManeuverAnalyticalModelTest successfully run"
\ No newline at end of file
+ ret = not unittest.TextTestRunner(verbosity=2).run(suite).wasSuccessful()
+ sys.exit(ret)