Merge pull request #446 from compas-dev/lts-1.x/pybullet-extra

Author: gonzalocasas

CHANGELOG.md

@@ -11,6 +11,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+* Made `pybullet` entirely optional. To install `pybullet`, use `pip install compas_fab.[pybullet]` or install `pybullet` manually.
+
 ### Removed
 
 

docs/backends/pybullet.rst

@@ -18,6 +18,12 @@ planning functionality.  PyBullet is also not compatible with IronPython. Hence
 it with Rhinoceros and Grasshopper it must be invoked through the
 :mod:`compas.rpc` module.
 
+Pybullet itself is no longer a dependency of ``compas_fab``, instead it is an
+optional requirement.
+
+To install it, using ``pip install compas_fab.[pybullet]`` or install using the
+package manager of your choice.
+
 Next Steps
 ==========
 

requirements-dev.txt

@@ -1,3 +1,4 @@
+pybullet
 attrs >=19.3.0
 black
 bump2version >=1.0.1

requirements.txt

@@ -1,5 +1,4 @@
 compas >= 2.0.4, < 3
 compas_robots >= 0.3, < 1
 roslibpy >= 1.1.0
-pybullet
 pyserial

setup.py

@@ -4,7 +4,6 @@
 from __future__ import print_function
 
 import io
-import sys
 from glob import glob
 from os import path
 
@@ -23,13 +22,7 @@ def read(*names, **kwargs):
 
 long_description = read("README.md")
 requirements = read("requirements.txt").split("\n")
-
-# Conditionally exclude pybullet if we're installing inside Rhino
-# because it fails to compile
-if "rhino" in sys.executable.lower():
-    requirements = [r for r in requirements if "pybullet" not in r]
-
-optional_requirements = {}
+optional_requirements = {"pybullet": ["pybullet"]}
 
 setup(
     name=about["__title__"],
@@ -64,6 +57,6 @@ def read(*names, **kwargs):
     ],
     keywords=["robotic fabrication", "digital fabrication", "architecture", "robotics", "ros"],
     install_requires=requirements,
-    extras_require={},
+    extras_require=optional_requirements,
     entry_points={},
 )