Merge pull request #88 from petrushy/master-upstream

Updates for orekit 12.1.1
conda-forge · Jul 2, 2024 · d18acd8 · d18acd8
2 parents ba69aa1 + ee2c6f8
commit d18acd8
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 25 deletions.
diff --git a/.ci_support/linux_64_python3.10.____cpython.yaml b/.ci_support/linux_64_python3.10.____cpython.yaml
@@ -3,7 +3,7 @@ c_compiler:
 c_compiler_version:
 - '12'
 cdt_name:
-- cos6
+- cos7
 channel_sources:
 - conda-forge
 channel_targets:

diff --git a/.ci_support/linux_64_python3.11.____cpython.yaml b/.ci_support/linux_64_python3.11.____cpython.yaml
@@ -3,7 +3,7 @@ c_compiler:
 c_compiler_version:
 - '12'
 cdt_name:
-- cos6
+- cos7
 channel_sources:
 - conda-forge
 channel_targets:

diff --git a/.ci_support/linux_64_python3.12.____cpython.yaml b/.ci_support/linux_64_python3.12.____cpython.yaml
@@ -3,7 +3,7 @@ c_compiler:
 c_compiler_version:
 - '12'
 cdt_name:
-- cos6
+- cos7
 channel_sources:
 - conda-forge
 channel_targets:

diff --git a/.ci_support/linux_64_python3.8.____cpython.yaml b/.ci_support/linux_64_python3.8.____cpython.yaml
@@ -3,7 +3,7 @@ c_compiler:
 c_compiler_version:
 - '12'
 cdt_name:
-- cos6
+- cos7
 channel_sources:
 - conda-forge
 channel_targets:

diff --git a/.ci_support/linux_64_python3.9.____cpython.yaml b/.ci_support/linux_64_python3.9.____cpython.yaml
@@ -3,7 +3,7 @@ c_compiler:
 c_compiler_version:
 - '12'
 cdt_name:
-- cos6
+- cos7
 channel_sources:
 - conda-forge
 channel_targets:

diff --git a/recipe/bld.bat b/recipe/bld.bat
@@ -14,14 +14,14 @@
 --find-jvm-dll server ^
 --jar %SRC_DIR%\orekit-%PKG_VERSION%.jar ^
 --jar %SRC_DIR%\orekit-%PKG_VERSION%-python-wrapper.jar ^
---jar %SRC_DIR%\hipparchus-core-3.0.jar ^
---jar %SRC_DIR%\hipparchus-fitting-3.0.jar ^
---jar %SRC_DIR%\hipparchus-filtering-3.0.jar ^
---jar %SRC_DIR%\hipparchus-geometry-3.0.jar ^
---jar %SRC_DIR%\hipparchus-ode-3.0.jar ^
---jar %SRC_DIR%\hipparchus-optim-3.0.jar ^
---jar %SRC_DIR%\hipparchus-stat-3.0.jar ^
---jar %SRC_DIR%\rugged-3.0.jar ^
+--jar %SRC_DIR%\hipparchus-core-3.1.jar ^
+--jar %SRC_DIR%\hipparchus-fitting-3.1.jar ^
+--jar %SRC_DIR%\hipparchus-filtering-3.1.jar ^
+--jar %SRC_DIR%\hipparchus-geometry-3.1.jar ^
+--jar %SRC_DIR%\hipparchus-ode-3.1.jar ^
+--jar %SRC_DIR%\hipparchus-optim-3.1.jar ^
+--jar %SRC_DIR%\hipparchus-stat-3.1.jar ^
+--jar %SRC_DIR%\rugged-4.0-20240603.065802-2.jar ^
 --package java.io ^
 --package java.util ^
 --package java.text ^

diff --git a/recipe/build.sh b/recipe/build.sh
@@ -32,14 +32,14 @@ $PYTHON -m jcc \
 --version ${PKG_VERSION} \
 --jar $SRC_DIR/orekit-${PKG_VERSION}.jar \
 --jar $SRC_DIR/orekit-${PKG_VERSION}-python-wrapper.jar \
---jar $SRC_DIR/hipparchus-core-3.0.jar \
---jar $SRC_DIR/hipparchus-fitting-3.0.jar \
---jar $SRC_DIR/hipparchus-filtering-3.0.jar \
---jar $SRC_DIR/hipparchus-geometry-3.0.jar \
---jar $SRC_DIR/hipparchus-ode-3.0.jar \
---jar $SRC_DIR/hipparchus-optim-3.0.jar \
---jar $SRC_DIR/hipparchus-stat-3.0.jar \
---jar $SRC_DIR/rugged-3.0.jar \
+--jar $SRC_DIR/hipparchus-core-3.1.jar \
+--jar $SRC_DIR/hipparchus-fitting-3.1.jar \
+--jar $SRC_DIR/hipparchus-filtering-3.1.jar \
+--jar $SRC_DIR/hipparchus-geometry-3.1.jar \
+--jar $SRC_DIR/hipparchus-ode-3.1.jar \
+--jar $SRC_DIR/hipparchus-optim-3.1.jar \
+--jar $SRC_DIR/hipparchus-stat-3.1.jar \
+--jar $SRC_DIR/rugged-4.0-20240603.065802-2.jar \
 --package java.io \
 --package java.util \
 --package java.text \

diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -1,7 +1,7 @@
 {% set name = "orekit" %}
-{% set version = "12.0.1" %}
-{% set artifact_filename = "v12_0_1_3" %}
-{% set sha256 = "fcca6473cfbaa0daed60f199996e20a405ace806d18ed6ba59c5ec444fb98ed0" %}
+{% set version = "12.1.1" %}
+{% set artifact_filename = "v12_1_1_0" %}
+{% set sha256 = "31b4cb7e08f91834feeaac51c839ae9a1b18d470a501eaeef0ef7cf266880127" %}
 
 package:
   name: {{ name|lower }}
@@ -17,7 +17,7 @@ build:
   skip: False  # [arm64]
   skip: True   # [arm64 and py==312]
 
-  number: 8
+  number: 0
 
   rpaths:
     - lib/