From d367c84c46cafe57eb4c87eb41a2e0dc10f626f0 Mon Sep 17 00:00:00 2001
From: Megan Riel-Mehan <meganrm@gmail.com>
Date: Tue, 6 Sep 2022 13:04:06 -0700
Subject: [PATCH] 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
---
 .github/workflows/build-main.yml            | 2 +-
 .github/workflows/test-and-lint.yml         | 2 +-
 setup.py                                    | 2 +-
 simulariumio/cellpack/cellpack_converter.py | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build-main.yml b/.github/workflows/build-main.yml
index ed14cda6..8e94c31c 100644
--- 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
index 55cb0c86..76818dff 100644
--- 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
index 7fc1bf45..a25f3ed8 100644
--- 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
index 65daf3cd..93925d7d 100644
--- 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
 
 ###############################################################################