From 39aaeb3f329993046703233d2f52c9f7470a8de1 Mon Sep 17 00:00:00 2001 From: Sam Yaple Date: Wed, 21 Sep 2022 17:43:06 -0400 Subject: [PATCH] Remove uwsgi by default Not all deploys will use uwsgi by default but there is no way to disable it currently. Since uwsgi itself isnt truly a python app (just a C program with a python building shim). The user will still be able to install binary package based uwsgi or include uwsgi in the extra pip packages to install if they wish to. Related-Id: I76612794c1ba8dbc45b62dff00cee43c6ba10a34 Change-Id: I15008d41633168fda31e061003ccf4681cade68e --- pydep.txt | 2 +- scripts/requirements.sh | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/pydep.txt b/pydep.txt index d5e18d9..b370305 100644 --- a/pydep.txt +++ b/pydep.txt @@ -9,4 +9,4 @@ pyldap [(newton keystone ldap) (ocata keystone ldap) (pike keystone lda pymysql [] python-ldap [(!newton !ocata !pike !queens keystone ldap)] python-memcached [] -uwsgi [] +uwsgi [barbican] diff --git a/scripts/requirements.sh b/scripts/requirements.sh index 37ada71..9618b19 100755 --- a/scripts/requirements.sh +++ b/scripts/requirements.sh @@ -72,12 +72,9 @@ if [ ! -z "${PIP_PACKAGES}" ]; then pip install ${PIP_ARGS} -c /upper-constraints.txt --no-cache ${PIP_PACKAGES} fi -export UWSGI_PROFILE_OVERRIDE=ssl=true -export CPUCOUNT=1 - # Build all dependencies in parallel. This is safe because we are # constrained on the version and we are building with --no-deps -echo uwsgi enum-compat ${PIP_PACKAGES} | xargs -n1 | split -l1 -a3 +echo ${PIP_PACKAGES} | xargs -n1 | split -l1 -a3 if [[ "$KEEP_ALL_WHEELS" == "False" ]]; then ls -1 | xargs -n1 -P20 -t bash -c 'pip wheel ${PIP_WHEEL_ARGS} --find-links /source-wheels --no-deps --wheel-dir / -c /upper-constraints.txt -r $1 || cat $1 >> /failure' _ | tee /tmp/wheels.txt # Remove native-binary wheels, we only want to keep wheels that we