Update and re-enable drake-visualizer for macOS (RobotLocomotion#14769)

qingfengpu001 · Mar 12, 2021 · 973cfbf · 973cfbf
1 parent a8b8cd3
commit 973cfbf
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 34 deletions.
diff --git a/tools/workspace/drake_visualizer/drake_visualizer_bazel.py b/tools/workspace/drake_visualizer/drake_visualizer_bazel.py
@@ -12,14 +12,6 @@
 # or `bazel run`.
 sys.dont_write_bytecode = True  # noqa
 
-if sys.platform == "darwin":
-    # Drake Visualizer is disabled for at least as long as it takes to
-    # transition Drake and VTK 8.2 to Python 3.9 or some alternative solution
-    # is found, see https://github.com/RobotLocomotion/drake/issues/14650 for
-    # updates.
-    sys.exit("ERROR: Drake Visualizer is disabled on macOS, see "
-             "https://git.io/Jt1BG for updates")
-
 from _drake_visualizer_builtin_scripts import (
     _exec_drake_visualizer_with_plugins,
 )

diff --git a/tools/workspace/drake_visualizer/drake_visualizer_installed.py.in b/tools/workspace/drake_visualizer/drake_visualizer_installed.py.in
@@ -10,14 +10,6 @@ match that of the real `drake-visualizer` binary.
 from os.path import isdir, join, dirname, realpath
 import sys
 
-if sys.platform == "darwin":
-    # Drake Visualizer is disabled for at least as long as it takes to
-    # transition Drake and VTK 8.2 to Python 3.9 or some alternative solution
-    # is found, see https://github.com/RobotLocomotion/drake/issues/14650 for
-    # updates.
-    sys.exit("ERROR: Drake Visualizer is disabled on macOS, see "
-             "https://git.io/Jt1BG for updates")
-
 # Ensure that we can import the necessary scripts, accommodating symlinks.
 PREFIX_DIR = dirname(dirname(realpath(__file__)))
 assert isdir(join(PREFIX_DIR, "bin")), f"Bad location: {PREFIX_DIR}"

diff --git a/tools/workspace/drake_visualizer/repository.bzl b/tools/workspace/drake_visualizer/repository.bzl
@@ -56,8 +56,8 @@ def _impl(repository_ctx):
         fail(os_result.error)
 
     if os_result.is_macos:
-        archive = "dv-0.1.0-406-g4c3e570a-python-3.8.6-qt-5.15.1-vtk-8.2.0-mac-x86_64.tar.gz"  # noqa
-        sha256 = "292f46d391359d2a2ae71906eb852433dba8e06138dc88b59303a295cf9af1a7"  # noqa
+        archive = "dv-0.1.0-406-g4c3e570a-python-3.9.2-qt-5.15.2-vtk-8.2.0-mac-x86_64.tar.gz"  # noqa
+        sha256 = "8a13ffa117167fada851acef8535a42d613b71be2200ea3c7139e9fea05782b8"  # noqa
     elif os_result.ubuntu_release == "18.04":
         archive = "dv-0.1.0-406-g4c3e570a-python-3.6.9-qt-5.9.5-vtk-8.2.0-bionic-x86_64-1.tar.gz"  # noqa
         sha256 = "2c477c2f1186cd151710af9a6f50bd3720034ced3c5ed21d977b0a822ac56237"  # noqa

diff --git a/tools/workspace/drake_visualizer/test/drake_visualizer_bazel_test.py b/tools/workspace/drake_visualizer/test/drake_visualizer_bazel_test.py
@@ -5,14 +5,6 @@
 
 
 class TestDrakeVisualizerBazel(unittest.TestCase):
-    # Drake Visualizer is disabled for at least as long as it takes to
-    # transition Drake and VTK 8.2 to Python 3.9 or some alternative solution
-    # is found, see https://github.com/RobotLocomotion/drake/issues/14650 for
-    # updates.
-    @unittest.skipIf(
-        sys.platform == "darwin",
-        "Drake Visualizer is disabled on macOS, see https://git.io/Jt1BG "
-        "for updates")
     def test_help(self):
         """Ensure we can call drake_visualizer --help in Bazel."""
         bin_path = "tools/drake_visualizer"

diff --git a/tools/workspace/drake_visualizer/test/drake_visualizer_installed_test.py b/tools/workspace/drake_visualizer/test/drake_visualizer_installed_test.py
@@ -6,14 +6,6 @@
 
 
 class TestDrakeVisualizerInstalled(unittest.TestCase):
-    # Drake Visualizer is disabled for at least as long as it takes to
-    # transition Drake and VTK 8.2 to Python 3.9 or some alternative solution
-    # is found, see https://github.com/RobotLocomotion/drake/issues/14650 for
-    # updates.
-    @unittest.skipIf(
-        sys.platform == "darwin",
-        "Drake Visualizer is disabled on macOS, see https://git.io/Jt1BG "
-        "for updates")
     def test_help(self):
         """Ensures we can call `./bin/drake-visualizer --help` from install."""
         # Get install directory.