Add Python 3 dependencies for Mac

YinjieLin · Jan 8, 2019 · f1a45e3 · f1a45e3
1 parent 43f08d0
commit f1a45e3
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git a/setup/mac/binary_distribution/Brewfile b/setup/mac/binary_distribution/Brewfile
@@ -17,6 +17,7 @@ brew 'lz4'
 brew 'nlopt'
 brew 'numpy'
 brew 'protobuf'
+brew 'python'
 brew 'python@2'
 brew 'scipy'
 brew 'tinyxml'

diff --git a/setup/mac/binary_distribution/install_prereqs.sh b/setup/mac/binary_distribution/install_prereqs.sh
@@ -18,3 +18,4 @@ fi
 /usr/local/bin/brew bundle --file="${BASH_SOURCE%/*}/Brewfile"
 
 /usr/local/bin/pip2 install --upgrade --requirement "${BASH_SOURCE%/*}/requirements.txt"
+/usr/local/bin/pip3 install --upgrade --requirement "${BASH_SOURCE%/*}/requirements.txt"
diff --git a/setup/mac/binary_distribution/requirements.txt b/setup/mac/binary_distribution/requirements.txt
@@ -1,6 +1,5 @@
 lxml
 matplotlib
-pip
 pydot
 PyYAML
 pyzmq

diff --git a/setup/mac/source_distribution/install_prereqs.sh b/setup/mac/source_distribution/install_prereqs.sh
@@ -13,9 +13,8 @@ if [[ "${EUID}" -eq 0 ]]; then
 fi
 
 /usr/local/bin/brew update
-# TODO(jamiesnape): Remove this line on or after 9/30/18.
-/usr/local/bin/brew uninstall --force bazel
 /usr/local/bin/brew bundle --file="${BASH_SOURCE%/*}/Brewfile"
 /usr/local/bin/brew tap-pin bazelbuild/tap
 
 /usr/local/bin/pip2 install --upgrade --requirement "${BASH_SOURCE%/*}/requirements.txt"
+/usr/local/bin/pip3 install --upgrade --requirement "${BASH_SOURCE%/*}/requirements.txt"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -18,3 +18,4 @@ fi
		/usr/local/bin/brew bundle --file="${BASH_SOURCE%/*}/Brewfile"

		/usr/local/bin/pip2 install --upgrade --requirement "${BASH_SOURCE%/*}/requirements.txt"
		/usr/local/bin/pip3 install --upgrade --requirement "${BASH_SOURCE%/*}/requirements.txt"
-Original file line number
+Diff line change
@@ -1,6 +1,5 @@
     lxml
     matplotlib
-    pip
     pydot
     PyYAML
     pyzmq
@@ Expand Down @@