From 345f1db994f28fc0a962172b1025058597f47ca0 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Mon, 11 May 2020 13:11:19 -0400 Subject: [PATCH] Don't uninstall pycurl, but do build it from source. oVirt requires something newer, but we can't use the wheel. --- Makefile | 2 +- requirements/requirements_ansible_uninstall.txt | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile b/Makefile index dba1e0844b..d14d44cfc3 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,7 @@ CELERY_SCHEDULE_FILE ?= /var/lib/awx/beat.db DEV_DOCKER_TAG_BASE ?= gcr.io/ansible-tower-engineering # Python packages to install only from source (not from binary wheels) # Comma separated list -SRC_ONLY_PKGS ?= cffi,pycparser,psycopg2,twilio +SRC_ONLY_PKGS ?= cffi,pycparser,psycopg2,twilio,pycurl # These should be upgraded in the AWX and Ansible venv before attempting # to install the actual requirements VENV_BOOTSTRAP ?= pip==19.3.1 setuptools==41.6.0 diff --git a/requirements/requirements_ansible_uninstall.txt b/requirements/requirements_ansible_uninstall.txt index 53a2b2ee08..56cbaa5f19 100644 --- a/requirements/requirements_ansible_uninstall.txt +++ b/requirements/requirements_ansible_uninstall.txt @@ -1,2 +1 @@ -pycurl # requires system package version rsa # stop adding new crypto libs