forked from divad12/khan-dotfiles
-
Notifications
You must be signed in to change notification settings - Fork 17
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Summary: While re-installing onto a brand new install, I ran into several issues and noticed some things that are no longer needed. Specifically: * Installing `yarn` via homebrew has the potential to overwrite the `node` we have installed (usually with a newer version than we want). Instead, it's easiest to just use `npm` to install yarn globally. * `readline` is a [[ https://khanacademy.slack.com/archives/C02NMB1R5/p1606758044205900 | perenial ]] [[ https://khanacademy.slack.com/archives/C02NMB1R5/p1601497407132100 | problem ]] to get installed with `pip`. But our version of Python comes with `readline` packaged into it, and that version of readline properly switches between readline and libedit (macOS) depending on the OS it's on. I don't think we need to install the readline module manually any longer (see https://pypi.org/project/gnureadline/) * Don't force-install [email protected] - that breaks `make install_deps` in webapp Issue: "none" Test Plan: Well, I guess the best way would be to run this diff on a fresh install of macOS. Reviewers: ebrown, csilvers, benkraft Reviewed By: ebrown Subscribers: bryan, john, kevinb, jeff, csilvers Differential Revision: https://phabricator.khanacademy.org/D68282
- Loading branch information
1 parent
e66ad9a
commit 80267e8
Showing
3 changed files
with
6 additions
and
33 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -254,16 +254,9 @@ install_deps() { | |
|
||
create_and_activate_virtualenv "$ROOT/.virtualenv/khan27" | ||
|
||
# Inspiration from this slack discussion | ||
# https://khanacademy.slack.com/archives/C0918TZ5G/p1560899833202100 | ||
# In general, need to pin npm to V6.4.1 | ||
# Also, need to install yarn first before run `make install_deps` | ||
# Need to install yarn first before run `make install_deps` | ||
# in webapp. | ||
# TODO(avidal): Is this still necessary? That's an ancient version of npm | ||
# and you can get yarn via brew or via your distribution. | ||
if ! which yarn >/dev/null; then | ||
echo "Installing yarn" | ||
sudo npm install -g [email protected] | ||
if ! which yarn >/dev/null 2>&1; then | ||
sudo npm install -g yarn | ||
fi | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters