From 39282bf769e26d012b179f32286737f1151219fa Mon Sep 17 00:00:00 2001 From: Sean Dague Date: Tue, 17 Feb 2015 09:00:57 -0500 Subject: [PATCH] purge all pure python libraries python libraries should be installed from upstream, not from the distro, as much as possible. The following is a first attempt at purging all the python libraries and making it so that they instead should fall back to the pypi versions. Libraries which are known to include native code are left behind. Change-Id: I47b7e787771683c2fc4404e586f11c1a19aac15c --- files/debs/general | 6 ------ files/debs/glance | 7 ------- files/debs/horizon | 16 ---------------- files/debs/keystone | 8 -------- files/debs/n-api | 2 -- files/debs/neutron | 9 --------- files/debs/nova | 15 --------------- files/debs/swift | 11 ++--------- 8 files changed, 2 insertions(+), 72 deletions(-) diff --git a/files/debs/general b/files/debs/general index 4050191379..5047c12249 100644 --- a/files/debs/general +++ b/files/debs/general @@ -1,5 +1,4 @@ bridge-utils -pylint screen unzip wget @@ -10,17 +9,12 @@ graphviz # testonly - docs lsof # useful when debugging openssh-server openssl -python-virtualenv -python-unittest2 iputils-ping wget curl tcpdump -euca2ools # only for testing client tar -python-cmd2 # dist:precise python-dev -python-mock # testonly python2.7 bc libyaml-dev diff --git a/files/debs/glance b/files/debs/glance index 8db8145935..9fda6a63d9 100644 --- a/files/debs/glance +++ b/files/debs/glance @@ -3,11 +3,4 @@ libpq-dev # testonly libssl-dev # testonly libxml2-dev libxslt1-dev # testonly -python-eventlet -python-routes -python-greenlet -python-sqlalchemy -python-pastedeploy -python-xattr -python-iso8601 zlib1g-dev # testonly diff --git a/files/debs/horizon b/files/debs/horizon index f9b7d597dc..1f45b54f7c 100644 --- a/files/debs/horizon +++ b/files/debs/horizon @@ -1,19 +1,3 @@ apache2 # NOPRIME libapache2-mod-wsgi # NOPRIME -python-beautifulsoup -python-dateutil -python-paste -python-pastedeploy -python-anyjson -python-routes -python-xattr -python-sqlalchemy -python-webob -pylint -python-eventlet -python-nose -python-mox -python-coverage -python-cherrypy3 # why? -python-migrate libpcre3-dev # pyScss diff --git a/files/debs/keystone b/files/debs/keystone index d316a4291b..70a56499e9 100644 --- a/files/debs/keystone +++ b/files/debs/keystone @@ -1,15 +1,7 @@ python-lxml -python-pastescript -python-pastedeploy -python-paste sqlite3 -python-pysqlite2 -python-sqlalchemy python-mysqldb python-mysql.connector -python-webob -python-greenlet -python-routes libldap2-dev libsasl2-dev libkrb5-dev diff --git a/files/debs/n-api b/files/debs/n-api index b4372d9361..0928cd56b9 100644 --- a/files/debs/n-api +++ b/files/debs/n-api @@ -1,3 +1 @@ -python-dateutil -msgpack-python fping diff --git a/files/debs/neutron b/files/debs/neutron index 3f4b6d2999..aa3d7095ca 100644 --- a/files/debs/neutron +++ b/files/debs/neutron @@ -7,17 +7,8 @@ libmysqlclient-dev # testonly mysql-server #NOPRIME sudo postgresql-server-dev-all # testonly -python-iso8601 -python-paste -python-routes -python-suds -python-pastedeploy -python-greenlet -python-eventlet -python-sqlalchemy python-mysqldb python-mysql.connector -python-pyudev python-qpid # NOPRIME dnsmasq-base dnsmasq-utils # for dhcp_release only available in dist:precise diff --git a/files/debs/nova b/files/debs/nova index 66f29c4baf..0c31385ddd 100644 --- a/files/debs/nova +++ b/files/debs/nova @@ -8,7 +8,6 @@ libmysqlclient-dev # testonly mysql-server # NOPRIME python-mysqldb python-mysql.connector -python-xattr # needed for glance which is needed for nova --- this shouldn't be here python-lxml # needed for glance which is needed for nova --- this shouldn't be here gawk iptables @@ -27,22 +26,8 @@ genisoimage # required for config_drive rabbitmq-server # NOPRIME qpidd # NOPRIME socat # used by ajaxterm -python-mox -python-paste -python-migrate -python-greenlet python-libvirt # NOPRIME python-libxml2 -python-routes python-numpy # used by websockify for spice console -python-pastedeploy -python-eventlet -python-cheetah -python-tempita -python-sqlalchemy -python-suds -python-lockfile python-m2crypto -python-feedparser -python-iso8601 python-qpid # NOPRIME diff --git a/files/debs/swift b/files/debs/swift index fd51699238..b32b43985a 100644 --- a/files/debs/swift +++ b/files/debs/swift @@ -1,14 +1,7 @@ curl memcached -python-configobj -python-coverage -python-eventlet -python-greenlet -python-netifaces +# NOTE python-nose only exists because of swift functional job, we should probably +# figure out a more consistent way of installing this from test-requirements.txt instead python-nose -python-pastedeploy -python-simplejson -python-webob -python-xattr sqlite3 xfsprogs