From 7c838616c98212c808d12c3789cc17ec76cbd878 Mon Sep 17 00:00:00 2001 From: Robert Collins Date: Fri, 3 Jul 2015 13:28:09 +1200 Subject: [PATCH] Fix library runs. Libraries were resulting in two edit-constraints runs: - one for the library, which adds a non-editable file path - then one for the editable servers, but that fails becuse pkg-resources couldn't parse the prior entry. This is fixed in two parts: the dependent patch which supports parsing file urls that have egg names, and this patch which changes from a file path to a file url with an egg name. Change-Id: I0f07858e96ea3baf46f8a453e253b9ed29c7f7e2 --- inc/python | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/inc/python b/inc/python index ca185f05d2..bba9cda44d 100644 --- a/inc/python +++ b/inc/python @@ -238,7 +238,9 @@ function setup_package_with_req_sync { if [ -n "$REQUIREMENTS_DIR" ]; then # Constrain this package to this project directory from here on out. local name=$(awk '/^name.*=/ {print $3}' $project_dir/setup.cfg) - $REQUIREMENTS_DIR/.venv/bin/edit-constraints $REQUIREMENTS_DIR/upper-constraints.txt -- $name "$flags $project_dir" + $REQUIREMENTS_DIR/.venv/bin/edit-constraints \ + $REQUIREMENTS_DIR/upper-constraints.txt -- $name \ + "$flags file://$project_dir#egg=$name" fi setup_package $project_dir $flags