[openstack-cinder/el6-havana] remove more python dependency management

Pádraig Brady pbrady at fedoraproject.org
Mon Jul 22 01:02:37 UTC 2013


commit ab2068ea229dc5b6e4354fecd9755c3a4fdb8d97
Author: Pádraig Brady <P at draigBrady.com>
Date:   Mon Jul 22 01:41:44 2013 +0100

    remove more python dependency management
    
    This is problematic and redundant in rpm packages

 openstack-cinder.spec |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
---
diff --git a/openstack-cinder.spec b/openstack-cinder.spec
index fe78bf2..ef418c4 100644
--- a/openstack-cinder.spec
+++ b/openstack-cinder.spec
@@ -147,6 +147,10 @@ find cinder -name \*.py -exec sed -i '/\/usr\/bin\/env python/{d;q}' {} +
 # TODO: Have the following handle multi line entries
 sed -i '/setup_requires/d; /install_requires/d; /dependency_links/d' setup.py
 
+# Remove the requirements file so that pbr hooks don't add it
+# to distutils requires_dist config
+rm -rf {test-,}requirements.txt tools/{pip,test}-requires
+
 # We add REDHATCINDERVERSION/RELEASE with the pbr removal patch
 sed -i s/REDHATCINDERVERSION/%{version}/ cinder/version.py
 sed -i s/REDHATCINDERRELEASE/%{release}/ cinder/version.py


More information about the scm-commits mailing list