From 9e31bae60701c240bea3f0d02837191c1d0576d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Jonglez?= <clement@jonglez.space>
Date: Wed, 20 Mar 2024 19:35:13 +0100
Subject: [PATCH] rename source folder orekit_jpype->orekit, refactor source
files
---
{orekit_jpype => orekit}/__init__.py | 2 +-
.../jars/hipparchus-core-3.0-javadoc.jar | Bin
.../jars/hipparchus-core-3.0.jar | Bin
.../jars/hipparchus-filtering-3.0-javadoc.jar | Bin
.../jars/hipparchus-filtering-3.0.jar | Bin
.../jars/hipparchus-fitting-3.0-javadoc.jar | Bin
.../jars/hipparchus-fitting-3.0.jar | Bin
.../jars/hipparchus-geometry-3.0-javadoc.jar | Bin
.../jars/hipparchus-geometry-3.0.jar | Bin
.../jars/hipparchus-ode-3.0-javadoc.jar | Bin
.../jars/hipparchus-ode-3.0.jar | Bin
.../jars/hipparchus-optim-3.0-javadoc.jar | Bin
.../jars/hipparchus-optim-3.0.jar | Bin
.../jars/hipparchus-stat-3.0-javadoc.jar | Bin
.../jars/hipparchus-stat-3.0.jar | Bin
.../jars/orekit-12.0.2-javadoc.jar | Bin
{orekit_jpype => orekit}/jars/orekit-12.0.2.jar | Bin
.../jars/rugged-3.0-javadoc.jar | Bin
{orekit_jpype => orekit}/jars/rugged-3.0.jar | Bin
orekit_jpype/orekit_jpype.py => orekit/orekit.py | 2 +-
{orekit_jpype => orekit}/orekit_converters.py | 6 +++---
{orekit_jpype => orekit}/pyhelpers.py | 0
22 files changed, 5 insertions(+), 5 deletions(-)
rename {orekit_jpype => orekit}/__init__.py (67%)
rename {orekit_jpype => orekit}/jars/hipparchus-core-3.0-javadoc.jar (100%)
rename {orekit_jpype => orekit}/jars/hipparchus-core-3.0.jar (100%)
rename {orekit_jpype => orekit}/jars/hipparchus-filtering-3.0-javadoc.jar (100%)
rename {orekit_jpype => orekit}/jars/hipparchus-filtering-3.0.jar (100%)
rename {orekit_jpype => orekit}/jars/hipparchus-fitting-3.0-javadoc.jar (100%)
rename {orekit_jpype => orekit}/jars/hipparchus-fitting-3.0.jar (100%)
rename {orekit_jpype => orekit}/jars/hipparchus-geometry-3.0-javadoc.jar (100%)
rename {orekit_jpype => orekit}/jars/hipparchus-geometry-3.0.jar (100%)
rename {orekit_jpype => orekit}/jars/hipparchus-ode-3.0-javadoc.jar (100%)
rename {orekit_jpype => orekit}/jars/hipparchus-ode-3.0.jar (100%)
rename {orekit_jpype => orekit}/jars/hipparchus-optim-3.0-javadoc.jar (100%)
rename {orekit_jpype => orekit}/jars/hipparchus-optim-3.0.jar (100%)
rename {orekit_jpype => orekit}/jars/hipparchus-stat-3.0-javadoc.jar (100%)
rename {orekit_jpype => orekit}/jars/hipparchus-stat-3.0.jar (100%)
rename {orekit_jpype => orekit}/jars/orekit-12.0.2-javadoc.jar (100%)
rename {orekit_jpype => orekit}/jars/orekit-12.0.2.jar (100%)
rename {orekit_jpype => orekit}/jars/rugged-3.0-javadoc.jar (100%)
rename {orekit_jpype => orekit}/jars/rugged-3.0.jar (100%)
rename orekit_jpype/orekit_jpype.py => orekit/orekit.py (97%)
rename {orekit_jpype => orekit}/orekit_converters.py (95%)
rename {orekit_jpype => orekit}/pyhelpers.py (100%)
diff --git a/orekit_jpype/__init__.py b/orekit/__init__.py
similarity index 67%
rename from orekit_jpype/__init__.py
rename to orekit/__init__.py
index 53d9440..9b5226e 100644
--- a/orekit_jpype/__init__.py
+++ b/orekit/__init__.py
@@ -1,4 +1,4 @@
-from .orekit_jpype import initVM
+from .orekit import initVM
from jpype import JArray, JDouble
diff --git a/orekit_jpype/jars/hipparchus-core-3.0-javadoc.jar b/orekit/jars/hipparchus-core-3.0-javadoc.jar
similarity index 100%
rename from orekit_jpype/jars/hipparchus-core-3.0-javadoc.jar
rename to orekit/jars/hipparchus-core-3.0-javadoc.jar
diff --git a/orekit_jpype/jars/hipparchus-core-3.0.jar b/orekit/jars/hipparchus-core-3.0.jar
similarity index 100%
rename from orekit_jpype/jars/hipparchus-core-3.0.jar
rename to orekit/jars/hipparchus-core-3.0.jar
diff --git a/orekit_jpype/jars/hipparchus-filtering-3.0-javadoc.jar b/orekit/jars/hipparchus-filtering-3.0-javadoc.jar
similarity index 100%
rename from orekit_jpype/jars/hipparchus-filtering-3.0-javadoc.jar
rename to orekit/jars/hipparchus-filtering-3.0-javadoc.jar
diff --git a/orekit_jpype/jars/hipparchus-filtering-3.0.jar b/orekit/jars/hipparchus-filtering-3.0.jar
similarity index 100%
rename from orekit_jpype/jars/hipparchus-filtering-3.0.jar
rename to orekit/jars/hipparchus-filtering-3.0.jar
diff --git a/orekit_jpype/jars/hipparchus-fitting-3.0-javadoc.jar b/orekit/jars/hipparchus-fitting-3.0-javadoc.jar
similarity index 100%
rename from orekit_jpype/jars/hipparchus-fitting-3.0-javadoc.jar
rename to orekit/jars/hipparchus-fitting-3.0-javadoc.jar
diff --git a/orekit_jpype/jars/hipparchus-fitting-3.0.jar b/orekit/jars/hipparchus-fitting-3.0.jar
similarity index 100%
rename from orekit_jpype/jars/hipparchus-fitting-3.0.jar
rename to orekit/jars/hipparchus-fitting-3.0.jar
diff --git a/orekit_jpype/jars/hipparchus-geometry-3.0-javadoc.jar b/orekit/jars/hipparchus-geometry-3.0-javadoc.jar
similarity index 100%
rename from orekit_jpype/jars/hipparchus-geometry-3.0-javadoc.jar
rename to orekit/jars/hipparchus-geometry-3.0-javadoc.jar
diff --git a/orekit_jpype/jars/hipparchus-geometry-3.0.jar b/orekit/jars/hipparchus-geometry-3.0.jar
similarity index 100%
rename from orekit_jpype/jars/hipparchus-geometry-3.0.jar
rename to orekit/jars/hipparchus-geometry-3.0.jar
diff --git a/orekit_jpype/jars/hipparchus-ode-3.0-javadoc.jar b/orekit/jars/hipparchus-ode-3.0-javadoc.jar
similarity index 100%
rename from orekit_jpype/jars/hipparchus-ode-3.0-javadoc.jar
rename to orekit/jars/hipparchus-ode-3.0-javadoc.jar
diff --git a/orekit_jpype/jars/hipparchus-ode-3.0.jar b/orekit/jars/hipparchus-ode-3.0.jar
similarity index 100%
rename from orekit_jpype/jars/hipparchus-ode-3.0.jar
rename to orekit/jars/hipparchus-ode-3.0.jar
diff --git a/orekit_jpype/jars/hipparchus-optim-3.0-javadoc.jar b/orekit/jars/hipparchus-optim-3.0-javadoc.jar
similarity index 100%
rename from orekit_jpype/jars/hipparchus-optim-3.0-javadoc.jar
rename to orekit/jars/hipparchus-optim-3.0-javadoc.jar
diff --git a/orekit_jpype/jars/hipparchus-optim-3.0.jar b/orekit/jars/hipparchus-optim-3.0.jar
similarity index 100%
rename from orekit_jpype/jars/hipparchus-optim-3.0.jar
rename to orekit/jars/hipparchus-optim-3.0.jar
diff --git a/orekit_jpype/jars/hipparchus-stat-3.0-javadoc.jar b/orekit/jars/hipparchus-stat-3.0-javadoc.jar
similarity index 100%
rename from orekit_jpype/jars/hipparchus-stat-3.0-javadoc.jar
rename to orekit/jars/hipparchus-stat-3.0-javadoc.jar
diff --git a/orekit_jpype/jars/hipparchus-stat-3.0.jar b/orekit/jars/hipparchus-stat-3.0.jar
similarity index 100%
rename from orekit_jpype/jars/hipparchus-stat-3.0.jar
rename to orekit/jars/hipparchus-stat-3.0.jar
diff --git a/orekit_jpype/jars/orekit-12.0.2-javadoc.jar b/orekit/jars/orekit-12.0.2-javadoc.jar
similarity index 100%
rename from orekit_jpype/jars/orekit-12.0.2-javadoc.jar
rename to orekit/jars/orekit-12.0.2-javadoc.jar
diff --git a/orekit_jpype/jars/orekit-12.0.2.jar b/orekit/jars/orekit-12.0.2.jar
similarity index 100%
rename from orekit_jpype/jars/orekit-12.0.2.jar
rename to orekit/jars/orekit-12.0.2.jar
diff --git a/orekit_jpype/jars/rugged-3.0-javadoc.jar b/orekit/jars/rugged-3.0-javadoc.jar
similarity index 100%
rename from orekit_jpype/jars/rugged-3.0-javadoc.jar
rename to orekit/jars/rugged-3.0-javadoc.jar
diff --git a/orekit_jpype/jars/rugged-3.0.jar b/orekit/jars/rugged-3.0.jar
similarity index 100%
rename from orekit_jpype/jars/rugged-3.0.jar
rename to orekit/jars/rugged-3.0.jar
diff --git a/orekit_jpype/orekit_jpype.py b/orekit/orekit.py
similarity index 97%
rename from orekit_jpype/orekit_jpype.py
rename to orekit/orekit.py
index ac8c678..fe26ef9 100644
--- a/orekit_jpype/orekit_jpype.py
+++ b/orekit/orekit.py
@@ -42,4 +42,4 @@ def initVM(vmargs:Union[str, None]=None, additional_classpaths:Union[List, None]
print("JVM already started, resuming on started JVM")
# Perform modifications for orekit
- import orekit_jpype.orekit_converters
+ import orekit.orekit_converters
diff --git a/orekit_jpype/orekit_converters.py b/orekit/orekit_converters.py
similarity index 95%
rename from orekit_jpype/orekit_converters.py
rename to orekit/orekit_converters.py
index 2a9a317..1b65a11 100644
--- a/orekit_jpype/orekit_converters.py
+++ b/orekit/orekit_converters.py
@@ -7,7 +7,7 @@ Importing this file will automatically implement the changes.
"""
import datetime, math
-import orekit_jpype
+import orekit
from jpype._jcustomizer import JImplementationFor, JConversion
@@ -16,7 +16,7 @@ import jpype, _jpype
from jpype import JArray, JDouble
from org.orekit.time import TimeScalesFactory, AbsoluteDate
-from orekit_jpype.pyhelpers import absolutedate_to_datetime, datetime_to_absolutedate
+from orekit.pyhelpers import absolutedate_to_datetime, datetime_to_absolutedate
import os
dirpath = os.path.dirname(os.path.abspath(__file__))
@@ -33,7 +33,7 @@ def _JObjectRepr(obj) -> str:
_jpype._JObject.__repr__ = _JObjectRepr
# Create a top level function JArray_double to mimic JCC backend
-orekit_jpype.JArray_double = JArray(JDouble)
+orekit.JArray_double = JArray(JDouble)
# Some helper methods on selected classes
diff --git a/orekit_jpype/pyhelpers.py b/orekit/pyhelpers.py
similarity index 100%
rename from orekit_jpype/pyhelpers.py
rename to orekit/pyhelpers.py
--
GitLab