small tweaks, bump up version to 0.0.4

StanfordVL · Apr 7, 2020 · 9206643 · 9206643
1 parent 2b7aefc
commit 9206643
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -23,7 +23,7 @@ If you use iGibson or its assets and models, consider citing the following publi
 
 
 ### Release
-This is the repository for iGibson (gibson2) 0.0.1 release. Bug reports, suggestions for improvement, as well as community developments are encouraged and appreciated. Here is the [Changelog](misc/CHANGELOG.md). The support for our previous version of the environment, [Gibson v1](http://github.com/StanfordVL/GibsonEnv/), will be moved to this repository.
+This is the repository for iGibson (gibson2) 0.0.4 release. Bug reports, suggestions for improvement, as well as community developments are encouraged and appreciated. Here is the [Changelog](misc/CHANGELOG.md). The support for our previous version of the environment, [Gibson v1](http://github.com/StanfordVL/GibsonEnv/), will be moved to this repository.
 
 ### Documentation
 The documentation for this repository can be found here: [iGibson Environment Documentation](http://svl.stanford.edu/igibson/docs/). It includes installation guide (including data download), quickstart guide, code examples, and APIs.

diff --git a/docs/assets.md b/docs/assets.md
@@ -34,11 +34,12 @@ assets
 │   └── ycb
 ├── networks
 │   └── model.pth
-└── test
-    └── mesh
+├── test
+│   └── mesh
+└── example_configs
+    └── {}.yaml
 
 ```
-
 `models` contains robot models and interactive objects, `networks` contain the neural network filler used in Gibson V1, `test` contains files for performing tests of installation. 
 
 ## Models
@@ -66,4 +67,8 @@ We also include [YCB objects](http://www.ycbbenchmarks.com/object-models/) in `y
 
 ## Test meshes
 
-In `test` folder we save a mesh file to test the renderer is compiled correctly, it is used by `test/test_render.py`.
+In `test` folder we save a mesh file to test the renderer is compiled correctly, it is used by `test/test_render.py`.
+
+## Example configs
+
+Sample config files to be used with the demo.
diff --git a/gibson2/__init__.py b/gibson2/__init__.py
@@ -1,7 +1,7 @@
 import yaml
 import os
 
-__version__ = "0.0.1"
+__version__ = "0.0.4"
 
 with open(os.path.join(os.path.dirname(os.path.realpath(__file__)), 'global_config.yaml')) as f:
     global_config = yaml.load(f, Loader=yaml.FullLoader)

diff --git a/gibson2/core/render/viewer.py b/gibson2/core/render/viewer.py
@@ -14,7 +14,7 @@ def __init__(self):
         self.view_direction = np.array([1, 0, 0])
 
         cv2.namedWindow('ExternalView')
-        cv2.moveWindow("ExternalView", 0,0);
+        cv2.moveWindow("ExternalView", 0,0)
         cv2.namedWindow('RobotView')
         cv2.setMouseCallback('ExternalView', self.change_dir)
 

diff --git a/gibson2/envs/demo.py b/gibson2/envs/demo.py
@@ -16,7 +16,7 @@ def __init__(self):
         download_demo_data()
 
     def run_demo(self):
-        config = parse_config(os.path.join(gibson2.assets_path, '../../examples/configs/turtlebot_demo.yaml'))
+        config = parse_config(os.path.join(gibson2.assets_path, 'example_configs/turtlebot_demo.yaml'))
 
         s = Simulator(mode='gui', image_width=700, image_height=700)
         scene = BuildingScene('Rs')

diff --git a/gibson2/envs/demo_interactive.py b/gibson2/envs/demo_interactive.py
@@ -16,14 +16,14 @@ def __init__(self):
         download_demo_data()
 
     def run_demo(self):
-        config = parse_config(os.path.join(gibson2.assets_path, '../../examples/configs/turtlebot_demo.yaml'))
+        config = parse_config(os.path.join(gibson2.assets_path, 'example_configs/turtlebot_demo.yaml'))
         s = Simulator(mode='gui', image_width=700, image_height=700)
         scene = BuildingScene('Rs_interactive', is_interactive=True)
         s.import_scene(scene)
         turtlebot = Turtlebot(config)
         s.import_robot(turtlebot)
 
-        for i in range(1000):
+        for i in range(10000):
             turtlebot.apply_action([0.1,0.5])
             s.step()
 

diff --git a/setup.py b/setup.py
@@ -98,11 +98,16 @@ def run(self):
                 check_call("bash realenv/envs/build.sh".split())
                 install.run(self)
 '''
+with open("README.md", "r") as fh:
+    long_description = fh.read()
 
 setup(
     name='gibson2',
-    version='0.0.2b',
+    version='0.0.4',
     author='Stanford University',
+    long_description_content_type="text/markdown",
+    long_description=long_description,
+    url='https://github.com/StanfordVL/iGibson',
     zip_safe=False,
     packages=find_packages(),
     install_requires=[