Minor clean-up

Author: hwiedPro

.travis.yml

@@ -50,5 +50,5 @@ install:
   - ls ${PWD}/tmp/blender/3.2/scripts/addons/phobos
 
 # Finally start our test runner passing it the blender executable from the downloaded blender release
-script: python testrunner.py ./tmp/blender/blender
+script: python test/testrunner.py ./tmp/blender/blender
 

README.md

@@ -10,7 +10,7 @@ black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://gith
 ![Phobos](https://github.com/dfki-ric/phobos/wiki/img/phobos_logo_small.png)
 
 Phobos is both a CLI tool and add-on for the open-source 3D modeling software
-[Blender](http://www.blender.org) to support your robot model creation and editing
+[Blender](http://www.blender.org) to support your robot model creation and editing.
 
 The Blender add-on enables the creation of WYSIWYG robot
 models for use in robot frameworks like [ROS](http://wiki.ros.org/) and
@@ -58,6 +58,7 @@ Just zip the `phobos` subfolder: `zip -r phobos.zip phobos` and install it via B
 After installation the phobos main menu can be found on the right hand side of the 3D Viewport. If not already visible, one can find a very small arrow to open the Blender toolbar (purple circle showing it in the image).
 ![Small arrow to open the phobos toolbar widget.](https://github.com/dfki-ric/phobos/wiki/img/blender_phobos_menu_open.png)
 
+Phobos is currently tested and running with Blender v3.2.
 ### CLI
 Just install it using pip:
 ```bash

codemeta.json

@@ -12,7 +12,7 @@
   "identifier": "",
   "codeRepository": "https://github.com/dfki-ric/phobos",
   "datePublished": "2019-02-01",
-  "dateModified": "2020-12-16",
+  "dateModified": "2022-08-30",
   "dateCreated": "2019-02-01",
   "description": "Phobos is a python tool for processing simulation models. It comes with a Blender addon to create, edit and annotate robot models in a WYSIWYG environment and a python package/CLI tool to do this automated.",
   "keywords": "robotics, Blender, Python, URDF, SDF, model, MARS, SMURF, CLI",

phobos/blender/utils/io.py

@@ -559,7 +559,7 @@ def exportModel(model, exportpath='.', entitytypes=None):
     export_args = {
         "outputdir": exportpath,
         "formats": [format for format in entitytypes
-                    if format in ["urdf", "srdf", "sdf"] and getattr(bpy.context.scene, 'export_entity_'+format, False)
+                    if format in ["urdf", "sdf"] and getattr(bpy.context.scene, 'export_entity_'+format, False)
                     ],
         "ros_pkg": getattr(getExpSettings(), 'outputPathtype', "relative") == "ros_package",
         "ros_pkg_name": None if len(getRosPackageName()) == 0 else getRosPackageName(),

phobos/core/robot.py

@@ -20,8 +20,8 @@
 from ..utils.transform import create_transformation, inv, get_adjoint
 from ..utils.tree import find_close_ancestor_links
 from ..utils.urdf import read_urdf_filename, create_pdf_from_urdf, transform_object, get_joint_info_dict
-from ..utils.commandline_logging import get_logger
 
+from ..utils.commandline_logging import get_logger
 log = get_logger(__name__)
 
 

phobos/defs.py

@@ -1,4 +1,3 @@
-
 EULER_CONVENTION = 'xyz'
 RPY_CONVENTION = 'xyz'
 
@@ -68,4 +67,4 @@ def dump_json(obj, **kwargs):
     print("YAML not available (backwards compatibility).")
 
 MESH_TYPES = ["dae", "stl", "obj", "mars_obj", "bobj"]
-ENTITY_TYPES = ["smurf", "urdf", "sdf", "srdf", "joint_limits", "pdf"]
+ENTITY_TYPES = ["smurf", "urdf", "sdf", "joint_limits", "pdf"]

setup.py

@@ -71,6 +71,20 @@ def install_requirement(py_exec, package_name, upgrade_pip=False, lib=None):
 def check_requirements(py_exec, optional=False, upgrade_pip=False, lib=None):
     print("Checking requirements:")
     import importlib
+    requirements = [
+        "networkx",
+        "numpy",
+        "scipy",
+        "trimesh",
+        "setuptools",
+        "collada"
+    ]
+    optional_requirements = [
+        "pyyaml",
+        "pybullet",
+        "open3d",
+        "python-fcl"
+    ]
     reqs = [requirements]
     if optional:
         reqs += [optional_requirements]
@@ -107,7 +121,6 @@ def fetch_path_from_blender_script(blender_exec, script, keyword="blender"):
 
 
 def main(args):
-
     # data
     with open("README.md", "r") as fh:
         long_description = fh.read()
@@ -123,10 +136,9 @@ def main(args):
     kwargs = {
         "name": codemeta["title"].lower(),  # Replace with your own username
         "version": codemeta["version"],
-        "author":",  ".join(codemeta["author"]),
+        "author": ",  ".join(codemeta["author"]),
         "author_email": codemeta["maintainer"],
-        "description": codemeta["description"] + " Revision:" + get_git_branch() + "-"
-                    + get_git_revision_short_hash(),
+        "description": codemeta["description"] + " Revision:" + get_git_branch() + "-" + get_git_revision_short_hash(),
         "long_description": long_description,
         "long_description_content_type":" text/markdown",
         "url": codemeta["codeRepository"],