version bump to 0.8.0 (#1162)

* 0.8.0 version bump and logistics changes

* simplify doc

* python 2, 3 compatible import

Author: yxlao

CMakeLists.txt

@@ -32,10 +32,10 @@ string(CONCAT PROJECT_VERSION_THREE_NUMBER "${OPEN3D_VERSION_MAJOR}"
                                            ".${OPEN3D_VERSION_MINOR}"
                                            ".${OPEN3D_VERSION_PATCH}")
 
-# pypi package name controls specifies the repository name on pypi
-# possbie names include:
-# - open3d: default name when building from source and for conda
-# - open3d-python: for PyPI
+# PyPI package name controls specifies the repository name on PyPI. The default
+# name is "open3d". In the past, for historical reasons, we've used the
+# following names for PyPI, while they are now deprecated:
+# - open3d-python
 # - py3d
 # - open3d-original
 # - open3d-official

docs/compilation.rst

@@ -285,7 +285,11 @@ Alternatively, this file can be generated by calling CMake from the console:
 
     mkdir build
     cd build
+
+    :: Run one of the following lines based on your Visual Studio version
     cmake -G "Visual Studio 14 2015 Win64" ..
+    cmake -G "Visual Studio 15 2017 Win64" ..
+    cmake -G "Visual Studio 16 2019 Win64" ..
 
 .. error:: If cmake fail to find ``PYTHON_EXECUTABLE``, follow the Ubuntu guide:
     :ref:`compilation_ubuntu_python_binding` to activate the Python virtualenv before running

docs/conf.py

@@ -32,14 +32,6 @@ def get_git_short_hash():
     return rc
 
 
-def get_git_tag_short_hash(tag):
-    _ = subprocess.check_output(['git', 'fetch', '--tags'])
-    tags = subprocess.check_output(['git', 'show-ref', '--hash=8', tag])
-    tags = tags.decode("utf-8").strip()
-    tag = tags.split('\n')[0]
-    return tag
-
-
 # Import open3d raw python package with the highest priority
 # This is a trick to show open3d.open3d as open3d in the docs
 # Only tested to work on Unix
@@ -84,29 +76,11 @@ def get_git_tag_short_hash(tag):
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 
-# When building docs for a release e.g. 0.8.0, version == "v0.8.0"
-# When building docs for master, version == "latest (git_SHA_hash)"
-version_list = [
-    line.rstrip('\n').split(' ')[1]
-    for line in open('../src/Open3D/version.txt')
-]
-
-last_release = '.'.join(version_list[:3])
-last_release_tag = 'v' + last_release
+# This value can be overwritten in make_docs.py when sphinx-build is called.
+# Usually, the `version` value is set to the current git commit hash.
+# At Open3D releases, the `version` value is set to Open3D version number.
 current_hash = get_git_short_hash()
-last_release_hash = get_git_tag_short_hash(last_release_tag)
-
-if current_hash == last_release_hash:
-    # The last_release is current commit
-    # Building docs for a release, use version directly
-    version = last_release
-else:
-    # Building docs for master branch (latest), include hash
-    version = "latest ({})".format(current_hash)
-
-print("Building docs for version:", version)
-
-# The full version, including alpha/beta/rc tags.
+version = "latest ({})".format(current_hash)
 release = version
 
 # The language for content autogenerated by Sphinx. Refer to documentation

docs/getting_started.rst

@@ -9,7 +9,7 @@ Installing from PyPI or Conda
 =============================
 
 Open3D Python packages are distributed via
-`PyPI <https://pypi.org/project/open3d-python/>`_ and
+`PyPI <https://pypi.org/project/open3d/>`_ and
 `Conda <https://anaconda.org/open3d-admin/open3d>`_.
 
 Supported Python versions:
@@ -29,7 +29,7 @@ PyPI
 
 .. code-block:: bash
 
-    pip install open3d-python
+    pip install open3d
 
 Note: In general, we recommend using a
 `virtual environment <https://docs.python-guide.org/dev/virtualenvs/>`_ for
@@ -39,11 +39,11 @@ permission issues. For example:
 
 .. code-block:: bash
 
-    pip3 install open3d-python
+    pip3 install open3d
     # or
-    pip install --user open3d-python
+    pip install --user open3d
     # or
-    python3 -m pip install --user open3d-python
+    python3 -m pip install --user open3d
 
 Conda
 -----

docs/make_docs.py

@@ -51,71 +51,6 @@ def _create_or_clear_dir(dir_path):
     print("Created directory %s" % dir_path)
 
 
-class TemporaryDirectory(object):
-    """
-    Porting Python 3's TemporaryDirectory context manager to Python 2
-    https://github.com/python/cpython/blob/master/Lib/tempfile.py
-    """
-
-    def __init__(self, suffix=None, prefix=None, dir=None):
-        self.name = mkdtemp(suffix, prefix, dir)
-        self._finalizer = weakref.finalize(
-            self,
-            self._cleanup,
-            self.name,
-            warn_message="Implicitly cleaning up {!r}".format(self))
-
-    @classmethod
-    def _rmtree(cls, name):
-
-        def onerror(func, path, exc_info):
-            if issubclass(exc_info[0], PermissionError):
-
-                def resetperms(path):
-                    try:
-                        os.chflags(path, 0)
-                    except AttributeError:
-                        pass
-                    os.chmod(path, 0o700)
-
-                try:
-                    if path != name:
-                        resetperms(os.path.dirname(path))
-                    resetperms(path)
-
-                    try:
-                        os.unlink(path)
-                    # PermissionError is raised on FreeBSD for directories
-                    except (IsADirectoryError, PermissionError):
-                        cls._rmtree(path)
-                except FileNotFoundError:
-                    pass
-            elif issubclass(exc_info[0], FileNotFoundError):
-                pass
-            else:
-                raise ()
-
-        shutil.rmtree(name, onerror=onerror)
-
-    @classmethod
-    def _cleanup(cls, name, warn_message):
-        cls._rmtree(name)
-        warnings.warn(warn_message, ResourceWarning)
-
-    def __repr__(self):
-        return "<{} {!r}>".format(self.__class__.__name__, self.name)
-
-    def __enter__(self):
-        return self.name
-
-    def __exit__(self, exc, value, tb):
-        self.cleanup()
-
-    def cleanup(self):
-        if self._finalizer.detach():
-            self._rmtree(self.name)
-
-
 class PyAPIDocsBuilder:
     """
     Generate Python API *.rst files, per (sub) module, per class, per function.
@@ -263,8 +198,7 @@ class SphinxDocsBuilder:
     (3) Calls `sphinx-build` with the user argument
     """
 
-    def __init__(self, html_output_dir):
-        # Hard-coded parameters for Python API docs generation for now
+    def __init__(self, html_output_dir, is_release):
         # Directory structure for the Open3D Python package:
         # open3d
         # - __init__.py
@@ -273,6 +207,7 @@ def __init__(self, html_output_dir):
         self.c_module_relative = "open3d"  # The relative module reference to open3d.so
         self.python_api_output_dir = "python_api"
         self.html_output_dir = html_output_dir
+        self.is_release = is_release
 
     def run(self):
         self._gen_python_api_docs()
@@ -293,20 +228,41 @@ def _run_sphinx(self):
         """
         Call Sphinx command with hard-coded "html" target
         """
-        with TemporaryDirectory() as build_dir:
+        build_dir = os.path.join(self.html_output_dir, "html")
+
+        if self.is_release:
+            version_list = [
+                line.rstrip('\n').split(' ')[1]
+                for line in open('../src/Open3D/version.txt')
+            ]
+            release_version = '.'.join(version_list[:3])
+            print("Building docs for release:", release_version)
+
             cmd = [
                 "sphinx-build",
-                "-M",
+                "-b",
                 "html",
+                "-D",
+                "version=" + release_version,
+                "-D",
+                "release=" + release_version,
+                "-j",
+                str(multiprocessing.cpu_count()),
                 ".",
                 build_dir,
+            ]
+        else:
+            cmd = [
+                "sphinx-build",
+                "-b",
+                "html",
                 "-j",
                 str(multiprocessing.cpu_count()),
+                ".",
+                build_dir,
             ]
-            print('Calling: "%s"' % " ".join(cmd))
-            subprocess.check_call(cmd, stdout=sys.stdout, stderr=sys.stderr)
-            shutil.copytree(os.path.join(build_dir, "html"),
-                            os.path.join(self.html_output_dir, "html"))
+        print('Calling: "%s"' % " ".join(cmd))
+        subprocess.check_call(cmd, stdout=sys.stdout, stderr=sys.stderr)
 
 
 class DoxygenDocsBuilder:
@@ -340,6 +296,11 @@ def run(self):
                         action="store_true",
                         default=False,
                         help="Build Doxygen for C++ API docs.")
+    parser.add_argument("--is_release",
+                        dest="is_release",
+                        action="store_true",
+                        default=False,
+                        help="Show Open3D version number rather than git hash.")
     args = parser.parse_args()
 
     # Clear output dir if new docs are to be built
@@ -350,7 +311,7 @@ def run(self):
     # To customize build, run sphinx-build manually
     if args.build_sphinx:
         print("Sphinx build enabled")
-        sdb = SphinxDocsBuilder(html_output_dir)
+        sdb = SphinxDocsBuilder(html_output_dir, args.is_release)
         sdb.run()
     else:
         print("Sphinx build disabled, use --sphinx to enable")

examples/Python/Basic/mesh_properties.py

@@ -94,9 +94,8 @@ def fmt_bool(b):
     if not edge_manifold:
         print('  # Remove non-manifold edges')
         mesh.remove_non_manifold_edges()
-        print(
-            f'  # Is mesh now edge-manifold: {fmt_bool(mesh.is_edge_manifold())}'
-        )
+        print('  # Is mesh now edge-manifold: {}'.format(
+            fmt_bool(mesh.is_edge_manifold())))
         o3d.visualization.draw_geometries([mesh])
 
 

src/Open3D/version.txt

@@ -1,4 +1,4 @@
 OPEN3D_VERSION_MAJOR 0
-OPEN3D_VERSION_MINOR 7
+OPEN3D_VERSION_MINOR 8
 OPEN3D_VERSION_PATCH 0
 OPEN3D_VERSION_TWEAK 0

src/Python/package/README.rst

@@ -3,7 +3,11 @@
 About This Project
 #######################
 
-Open3D is an open-source library that supports rapid development of software that deals with 3D data. The Open3D frontend exposes a set of carefully selected data structures and algorithms in both C++ and Python. The backend is highly optimized and is set up for parallelization. We welcome contributions from the open-source community.
+Open3D is an open-source library that supports rapid development of software
+that deals with 3D data. The Open3D frontend exposes a set of carefully selected
+data structures and algorithms in both C++ and Python. The backend is highly
+optimized and is set up for parallelization. We welcome contributions from the
+open-source community.
 
 If you use Open3D in an academic project, please cite our paper:
 ::
@@ -30,9 +34,15 @@ Supported platforms
 
 The package has been tested on:
 
-* Ubuntu 16.04 with Python 2.7 and 3.5
-* Windows 10 with Python 2.7 and 3.5
-* MacOS High Sierra 10.13.4 with Python 2.7
+* Ubuntu 16.04, Ubuntu 18.04
+* Windows 10 64-bit
+* macOS High Sierra and above
+
+With Python version:
+* 2.7
+* 3.5
+* 3.6
+* 3.7
 
 Resources
 ======================

src/Python/package/conda_meta/meta.yaml

@@ -1,9 +1,8 @@
 # Currently this meta file is created manaully. We can also generate this meta
-# file with `conda skeleton pypi open3d-python`. The main difference is that
+# file with `conda skeleton pypi open3d`. The main difference is that
 # the this manaully create meta.yaml uses the shared objects in the local
 # `pip_package` folder, while the auto generated meta uses the PyPI source
-# distribution during Conda package creation. The manual meta file is chosen
-# since we'll use the `open3d` name rather than open3d-python`.
+# distribution during Conda package creation.
 
 package:
     name: open3d

src/Python/package/open3d/__init__.py

@@ -37,7 +37,7 @@
 __version__ = '@PROJECT_VERSION@'
 
 if "@ENABLE_JUPYTER@" == "ON":
-    from open3d.j_visualizer import *
+    from .j_visualizer import *
 
     def _jupyter_nbextension_paths():
         return [{