← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] ~cjwatson/rutabaga:simplify-find-links into rutabaga:master

 

Colin Watson has proposed merging ~cjwatson/rutabaga:simplify-find-links into rutabaga:master.

Commit message:
Simplify pip --find-links argument

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/rutabaga/+git/rutabaga/+merge/408417

The `$(realpath ...)` isn't necessary with modern versions of pip, and it breaks in the case where the `dependencies` directory doesn't exist yet when `make` is run.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/rutabaga:simplify-find-links into rutabaga:master.
diff --git a/Makefile b/Makefile
index 4a1c23a..8c1d51e 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@ PIP_SOURCE_DIR ?= dependencies
 
 PIP_CACHE_ARGS := -q
 ifneq ($(PIP_SOURCE_DIR),)
-PIP_CACHE_ARGS += --no-index --find-links=file://$(realpath $(PIP_SOURCE_DIR))/
+PIP_CACHE_ARGS += --no-index --find-links=$(PIP_SOURCE_DIR)
 endif
 
 # Create archives in labelled directories (e.g.