Merge 1f0077e into 86df882

pyomeca · Jun 7, 2020 · 04dba03 · 04dba03
2 parents 86df882 + 1f0077e
commit 04dba03
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 11 deletions.
diff --git a/pyomeca/analogs.py b/pyomeca/analogs.py
@@ -5,7 +5,7 @@
 import pandas as pd
 import xarray as xr
 
-from pyomeca.io import read, utils
+from .io import read, utils
 
 
 class Analogs:

diff --git a/pyomeca/angles.py b/pyomeca/angles.py
@@ -4,7 +4,7 @@
 import pandas as pd
 import xarray as xr
 
-from pyomeca.processing import angles
+from .processing import angles
 
 
 class Angles:

diff --git a/pyomeca/dataarray_accessor.py b/pyomeca/dataarray_accessor.py
@@ -5,8 +5,8 @@
 import pandas as pd
 import xarray as xr
 
-from pyomeca.io import write
-from pyomeca.processing import filter, interp, matrix, misc, rototrans
+from .io import write
+from .processing import filter, interp, matrix, misc, rototrans
 
 
 @xr.register_dataarray_accessor("meca")

diff --git a/pyomeca/io/__init__.py b/pyomeca/io/__init__.py
diff --git a/pyomeca/io/read.py b/pyomeca/io/read.py
@@ -6,7 +6,7 @@
 import pandas as pd
 import xarray as xr
 
-from pyomeca.io.utils import col_spliter, find_end_header_in_opensim_file
+from .utils import col_spliter, find_end_header_in_opensim_file
 
 
 def read_c3d(

diff --git a/pyomeca/markers.py b/pyomeca/markers.py
@@ -5,8 +5,8 @@
 import pandas as pd
 import xarray as xr
 
-from pyomeca.io import read, utils
-from pyomeca.processing.markers import markers_from_rototrans
+from .io import read, utils
+from .processing.markers import markers_from_rototrans
 
 
 class Markers:

diff --git a/pyomeca/processing/__init__.py b/pyomeca/processing/__init__.py
diff --git a/pyomeca/processing/rototrans.py b/pyomeca/processing/rototrans.py
@@ -5,7 +5,8 @@
 from scipy.optimize import least_squares
 
 from pyomeca import Angles
-from pyomeca.processing import misc
+
+from ..processing import misc
 
 
 def rototrans_from_euler_angles(

diff --git a/pyomeca/rototrans.py b/pyomeca/rototrans.py
@@ -5,7 +5,8 @@
 import xarray as xr
 
 from pyomeca import Angles
-from pyomeca.processing import rototrans
+
+from .processing import rototrans
 
 
 class Rototrans:

diff --git a/setup.py b/setup.py
@@ -1,4 +1,4 @@
-from setuptools import setup
+from setuptools import find_packages, setup
 
 setup(
     name="pyomeca",
@@ -8,6 +8,6 @@
     author_email="martinez.staps@gmail.com",
     url="https://github.com/pyomeca/pyomeca",
     license="Apache 2.0",
-    packages=["pyomeca"],
+    packages=find_packages(),
     keywords="pyomeca",
 )