diff --git a/Makefile b/Makefile index b75f7d391..3394adc18 100644 --- a/Makefile +++ b/Makefile @@ -25,7 +25,7 @@ VIRTUALENV_ROOT := $(shell [ -z $$VIRTUAL_ENV ] && echo $$(pwd)/venv || echo $$V .PHONY: bootstrap bootstrap: generate-version-file pip3 install -r requirements_for_test.txt - npm install && npm run build + npm install && npm rebuild node-sass npm run build .PHONY: run-flask run-flask: diff --git a/README.md b/README.md index 24fac36fb..e96db3e44 100644 --- a/README.md +++ b/README.md @@ -11,20 +11,10 @@ GOV.UK Notify admin application - https://www.notifications.service.gov.uk/ ## Setting up -### Install Homebrew - -Install [Homebrew](https://brew.sh), a package manager for OSX: - -```shell -/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)" -``` - ### Make sure you're using correct language versions Languages needed - Python 3.6.x -- [Node](https://nodejs.org/) 10.15.3 or greater -- [npm](https://www.npmjs.com/) 6.4.1 or greater Need to install node? Run: @@ -32,16 +22,6 @@ Need to install node? Run: brew install node ``` -#### `pyenv` For Python version management - -[pyenv](https://github.com/pyenv/pyenv) is a program to manage and swap between different versions of Python. To install: - -```shell -brew install pyenv -``` - -And then follow the further installation instructions in https://github.com/pyenv/pyenv#installation to configure it. - #### `n` For Node version management [NPM](npmjs.org) is Node's package management tool. `n` is a tool for managing @@ -53,13 +33,6 @@ npm install -g n n lts ``` -### Install NPM dependencies - -```shell -npm install -npm rebuild node-sass -``` - ### Install Python dependencies Install dependencies and build the frontend assets: @@ -68,12 +41,6 @@ Install dependencies and build the frontend assets: make bootstrap ``` -**Note:** You may need versions of both Python 3 and Python 2 accessible to build the python dependencies. `pyenv` is great for that, and making both Python versions accessible can be done like so: - -```shell -pyenv global 3.6.3 2.7.15 -``` - ### Create a local `environment.sh` file In the root directory of the application, run: