Skip to content
This repository has been archived by the owner on Oct 13, 2021. It is now read-only.

Commit

Permalink
Merge pull request #575 from pelmers/makefilecleanup58
Browse files Browse the repository at this point in the history
Move VIRTUAL_ENV up in the file, scope lint to dxr/
  • Loading branch information
pelmers committed Jun 24, 2016
2 parents 36a1da1 + aff3905 commit 0959459
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions makefile
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
# If there's an activated virtualenv, use that. Otherwise, make one in the cwd.
# This lets the installed Python packages persist across container runs when
# using Docker.
VIRTUAL_ENV ?= $(PWD)/venv

# Things you might normally want to run:

## These are meant to be run within whatever virtualized, containerized, or
Expand All @@ -11,7 +16,7 @@ test: all

lint: $(VIRTUAL_ENV)/bin/activate requirements
$(VIRTUAL_ENV)/bin/pip install flake8
$(VIRTUAL_ENV)/bin/flake8 --config=tooling/flake8.config .
$(VIRTUAL_ENV)/bin/flake8 --config=tooling/flake8.config dxr/

clean: static_clean
rm -rf .npm_installed \
Expand Down Expand Up @@ -62,10 +67,6 @@ docker_stop:

# Private things:

# If there's an activated virtualenv, use that. Otherwise, make one in the cwd.
# This lets the installed Python packages persist across container runs when
# using Docker.
VIRTUAL_ENV ?= $(PWD)/venv
DXR_PROD ?= 0

# Bring the elasticsearch container up if it isn't:
Expand Down

0 comments on commit 0959459

Please sign in to comment.