fix: ffmpeg installation for examples

SophT-Team · Jul 28, 2022 · 5e473d0 · 5e473d0
1 parent ba61189
commit 5e473d0
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 105 deletions.
diff --git a/Makefile b/Makefile
@@ -15,6 +15,12 @@ poetry-remove:
 install:
 	poetry install
 
+.PHONY: install_examples_dependencies
+install_examples_dependencies:
+	poetry install -E examples
+	# sadly pip ffmpeg doesnt work, hence we use conda for ffmpeg
+	conda install -c conda-forge ffmpeg
+
 .PHONY: install_with_new_dependency
 install_with_new_dependency:
 	poetry lock

diff --git a/examples/README.md b/examples/README.md
@@ -8,7 +8,7 @@ More [advanced cases](#advanced-cases) are stored in separate repository with it
 In order to run examples, you will need to install additional dependencies.
 
 ```bash
-poetry install -E examples
+make install_examples_dependencies
 ```
 
 ## Case Examples
@@ -30,7 +30,7 @@ Examples can serve as a starting template for customized usages.
     * __Features__: CosseratRod, MuscleTorques, AnisotropicFrictionalPlane, Gravity, CMA Optimization
     * [MuscularSnake](./MuscularSnake)
       * __Purpose__: Example of [Parallel connection module](../elastica/experimental/connection_contact_joint/parallel_connection.py) and customized [Force module](./MuscularSnake/muscle_forces.py) to implement muscular snake.
-      * __Features__: MuscleForces(custom implemented) 
+      * __Features__: MuscleForces(custom implemented)
 * [ButterflyCase](./ButterflyCase)
     * __Purpose__: Demonstrate simple restoration with initial strain.
     * __Features__: CosseratRod
@@ -51,13 +51,13 @@ Examples can serve as a starting template for customized usages.
     * __Features__: HelicalBucklingBC
 * [ContinuumFlagellaCase](./ContinuumFlagellaCase)
     * __Purpose__: Demonstrate flagella modeling using PyElastica.
-    * __Features__: SlenderBodyTheory, MuscleTorques, 
+    * __Features__: SlenderBodyTheory, MuscleTorques,
     * [MuscularFlagella](./MuscularFlagella)
         * __Purpose__: Example of customizing [Joint module](./MuscularFlagella/connection_flagella.py) and [Force module](./MuscularFlagella/muscle_forces_flagella.py) to implement muscular flagella.
         * __Features__: MuscleForces(custom implemented)
 * [RodContactCase](./RodContactCase)
   * [RodRodContact](./RodContactCase/RodRodContact)
-    * __Purpose__: Demonstrates contact between two rods, for different initial conditions. 
+    * __Purpose__: Demonstrates contact between two rods, for different initial conditions.
     * __Features__: CosseratRod, ExternalContact
   * [RodSelfContact](./RodContactCase/RodSelfContact)
     * [PlectonemesCase](./RodContactCase/RodSelfContact/PlectonemesCase)

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -52,8 +52,6 @@ myst-parser = {version = "^0.17.2", optional = true, extras = ["docs"]}
 numpydoc = {version = "^1.3.1", optional = true, extras = ["docs"]}
 docutils = {version = "^0.17.1", optional = true, extras = ["docs"]}
 cma = {version = "^3.2.2", optional = true, extras = ["examples"]}
-ffmpeg = {version = "^1.4", optional = true, extras = ["examples"]}
-moviepy = {version = "^1.0.3", optional = true, extras = ["examples"]}
 matplotlib = {version = "^3.3.2", optional = true, extras = ["examples"]}
 
 [tool.poetry.dev-dependencies]
@@ -79,8 +77,6 @@ docs = [
 ]
 examples = [
   "cma",
-  "ffmpeg",
-  "moviepy",
   "matplotlib",
 ]