import recipeloader from main package (#117)

* import recipeloader from main package * try installing pyembree with conda-forge * fix typo * change version * revert conda forge install * bump cellpack * bump cellpack version * try removing 3.7
simularium · Sep 6, 2022 · d367c84 · d367c84
1 parent c4f6a76
commit d367c84
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/build-main.yml b/.github/workflows/build-main.yml
@@ -15,7 +15,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        python-version: [3.7, 3.8, 3.9]
+        python-version: [3.8, 3.9]
         os: [ubuntu-latest]
 
     steps:

diff --git a/.github/workflows/test-and-lint.yml b/.github/workflows/test-and-lint.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        python-version: [3.7, 3.8, 3.9]
+        python-version: [3.8, 3.9]
         os: [ubuntu-latest]
 
     steps:

diff --git a/setup.py b/setup.py
@@ -22,7 +22,7 @@
 ]
 
 cellpack_requirements = [
-    "cellpack>=0.2.3",
+    "cellpack>=1.0.3",
 ]
 
 setup_requirements = [

diff --git a/simulariumio/cellpack/cellpack_converter.py b/simulariumio/cellpack/cellpack_converter.py
@@ -7,13 +7,13 @@
 import json
 from scipy.spatial.transform import Rotation as R
 
+from cellpack import RecipeLoader
 from ..constants import DISPLAY_TYPE, VIZ_TYPE
 from ..data_objects.camera_data import CameraData
 from ..trajectory_converter import TrajectoryConverter
 from ..data_objects import TrajectoryData, AgentData, DimensionData
 from ..data_objects import MetaData, DisplayData
 from .cellpack_data import HAND_TYPE, CellpackData
-from cellpack.autopack.iotools_simple import RecipeLoader
 
 ###############################################################################