From 684e9e9ce2bfbe21571b7ba61aa9b91ea49892fa Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Wed, 17 Dec 2014 11:48:59 -0500 Subject: [PATCH] Don't install sphinx from distro We don't generate docs in devstack. But also, sphinx depends on babel which has a hard depend that breaks with setuptools 8. However, pip installed babel/sphinx should not have this problem. Change-Id: I84a82e56f6540724d50c6201a68c480ba7645add --- files/debs/horizon | 1 - files/debs/ryu | 1 - files/rpms-suse/horizon | 1 - files/rpms-suse/ryu | 1 - files/rpms/horizon | 1 - files/rpms/ryu | 1 - 6 files changed, 6 deletions(-) diff --git a/files/debs/horizon b/files/debs/horizon index 5d06928c7b..f9b7d597dc 100644 --- a/files/debs/horizon +++ b/files/debs/horizon @@ -12,7 +12,6 @@ python-webob pylint python-eventlet python-nose -python-sphinx python-mox python-coverage python-cherrypy3 # why? diff --git a/files/debs/ryu b/files/debs/ryu index 9b850807e6..354c1b75d3 100644 --- a/files/debs/ryu +++ b/files/debs/ryu @@ -1,2 +1 @@ python-eventlet -python-sphinx diff --git a/files/rpms-suse/horizon b/files/rpms-suse/horizon index fa7e43964a..d1f378a70d 100644 --- a/files/rpms-suse/horizon +++ b/files/rpms-suse/horizon @@ -4,7 +4,6 @@ python-CherryPy # why? (coming from apts) python-Paste python-PasteDeploy python-Routes -python-Sphinx python-SQLAlchemy python-WebOb python-anyjson diff --git a/files/rpms-suse/ryu b/files/rpms-suse/ryu index 6b426fb163..354c1b75d3 100644 --- a/files/rpms-suse/ryu +++ b/files/rpms-suse/ryu @@ -1,2 +1 @@ -python-Sphinx python-eventlet diff --git a/files/rpms/horizon b/files/rpms/horizon index 1d06ac278b..82385ed06c 100644 --- a/files/rpms/horizon +++ b/files/rpms/horizon @@ -15,7 +15,6 @@ python-nose python-paste #dist:f19,f20,f21 python-paste-deploy #dist:f19,f20,f21 python-routes -python-sphinx python-sqlalchemy python-webob pyxattr diff --git a/files/rpms/ryu b/files/rpms/ryu index 9b850807e6..354c1b75d3 100644 --- a/files/rpms/ryu +++ b/files/rpms/ryu @@ -1,2 +1 @@ python-eventlet -python-sphinx