openstack/loci
Code Issues Proposed changes

Fix enum-compat in a better way

Browse Source 
Upstream requirements generator has a bug and is not pulling in
enum-compat. lower-contraints.txt has it strangely. This is the quick
fix to the issue.

Change-Id: I7c8bfbb89f13db1c251e762dfaf2020fa1f2fdc8
This commit is contained in:
Sam Yaple
2018-05-18 11:51:54 -04:00
parent 5682a103f0
commit 0d4142f12b
2 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
playbooks/loci-builder.yaml
View File

@@ -13,9 +13,6 @@
tag: "{{ branch }}-{{ item.name }}" tag: "{{ branch }}-{{ item.name }}"
repository: 172.17.0.1:5000/loci/requirements repository: 172.17.0.1:5000/loci/requirements
push: yes push: yes
buildargs:
# NOTE(SamYaple): enum-compat isnt in upper-constraints yet
PIP_PACKAGES: "enum-compat"
with_items: "{{ distros }}" with_items: "{{ distros }}"
async: 1000 async: 1000
poll: 0 poll: 0

2
scripts/requirements.sh
View File

@@ -43,7 +43,7 @@ pushd $(mktemp -d)
# constrained on the version and we are building with --no-deps # constrained on the version and we are building with --no-deps
export CASS_DRIVER_BUILD_CONCURRENCY=8 export CASS_DRIVER_BUILD_CONCURRENCY=8
split -l1 /upper-constraints.txt split -l1 /upper-constraints.txt
echo uwsgi ${PIP_PACKAGES} | xargs -n1 | split -l1 -a3 echo uwsgi enum-compat ${PIP_PACKAGES} | xargs -n1 | split -l1 -a3
ls -1 | xargs -n1 -P20 -t bash -c 'pip wheel --no-deps --wheel-dir / -c /upper-constraints.txt -r $1 || echo %1 >> /failure' _ | tee /tmp/wheels.txt ls -1 | xargs -n1 -P20 -t bash -c 'pip wheel --no-deps --wheel-dir / -c /upper-constraints.txt -r $1 || echo %1 >> /failure' _ | tee /tmp/wheels.txt
# TODO(SamYaple): Improve the failure catching # TODO(SamYaple): Improve the failure catching