Browse code
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
Robert Collins authored on 2015/07/03 10:28:09Showing 1 changed files
| ... | ... |
@@ -238,7 +238,9 @@ function setup_package_with_req_sync {
|
| 238 | 238 |
if [ -n "$REQUIREMENTS_DIR" ]; then |
| 239 | 239 |
# Constrain this package to this project directory from here on out. |
| 240 | 240 |
local name=$(awk '/^name.*=/ {print $3}' $project_dir/setup.cfg)
|
| 241 |
- $REQUIREMENTS_DIR/.venv/bin/edit-constraints $REQUIREMENTS_DIR/upper-constraints.txt -- $name "$flags $project_dir" |
|
| 241 |
+ $REQUIREMENTS_DIR/.venv/bin/edit-constraints \ |
|
| 242 |
+ $REQUIREMENTS_DIR/upper-constraints.txt -- $name \ |
|
| 243 |
+ "$flags file://$project_dir#egg=$name" |
|
| 242 | 244 |
fi |
| 243 | 245 |
|
| 244 | 246 |
setup_package $project_dir $flags |