arsenetar/dupeguru
1
0
Fork 0
mirror of https://github.com/arsenetar/dupeguru.git synced 2025-05-12 03:29:49 +00:00
Code Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/hsoft/master'

Browse Source 
# Conflicts:
#	Makefile
- Update to use makefile changes from hsoft/master
- Remove unneeded PIP_OPTIONS
This commit is contained in:
Andrew Senetar 2017-08-23 16:59:27 -05:00
commit d2f60ba270
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@ -12,12 +12,10 @@ ifeq ($(shell uname -o), Msys)
BIN = Scripts BIN = Scripts
SO = pyd SO = pyd
VENV_OPTIONS = VENV_OPTIONS =
PIP_OPTIONS =
else else
BIN = bin BIN = bin
SO = so SO = so
VENV_OPTIONS = --system-site-packages VENV_OPTIONS = --system-site-packages
PIP_OPTIONS = --user
endif endif
# Set this variable if all dependencies are already met on the system. We will then avoid the # Set this variable if all dependencies are already met on the system. We will then avoid the
@ -75,8 +73,11 @@ $(submodules_target) :
env : | $(submodules_target) reqs env : | $(submodules_target) reqs
ifndef NO_VENV ifndef NO_VENV
@echo "Creating our virtualenv" @echo "Creating our virtualenv"
${PYTHON} -m venv env ${VENV_OPTIONS} ${PYTHON} -m venv env
$(VENV_PYTHON) -m pip install ${PIP_OPTIONS} -r requirements.txt $(VENV_PYTHON) -m pip install -r requirements.txt
# We can't use the "--system-site-packages" flag on creation because otherwise we end up with
# the system's pip and that messes up things in some cases (notably in Gentoo).
${PYTHON} -m venv --upgrade ${VENV_OPTIONS} env
endif endif
build/help : | env build/help : | env