Merge branch '2.6-dev'

urbanairship · Feb 24, 2015 · 5bdf1ce · 5bdf1ce
2 parents efc327b + 7cb7dce
commit 5bdf1ce
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 8 deletions.
diff --git a/agent/setup.py b/agent/setup.py
@@ -1,3 +1,5 @@
+#!/usr/bin/env python
+
 from setuptools import setup, find_packages
 
 setup(
@@ -7,4 +9,5 @@
     packages=find_packages(exclude=['test']),
     author='Pulp Team',
     author_email='[email protected]',
+    install_requires=['m2crypto']
 )
diff --git a/bindings/setup.py b/bindings/setup.py
@@ -1,3 +1,5 @@
+#!/usr/bin/env python
+
 from setuptools import setup, find_packages
 
 setup(
@@ -7,4 +9,5 @@
     packages=find_packages(exclude=['test']),
     author='Pulp Team',
     author_email='[email protected]',
+    install_requires=['m2crypto', 'oauth2>=1.5.170']
 )
diff --git a/client_admin/setup.py b/client_admin/setup.py
@@ -1,3 +1,5 @@
+#!/usr/bin/env python
+
 from setuptools import setup, find_packages
 
 setup(

diff --git a/client_lib/setup.py b/client_lib/setup.py
@@ -1,3 +1,5 @@
+#!/usr/bin/env python
+
 from setuptools import setup, find_packages
 
 setup(
@@ -7,4 +9,5 @@
     packages=find_packages(exclude=['test']),
     author='Pulp Team',
     author_email='[email protected]',
+    install_requires=['isodate>0.5.0', 'm2crypto', 'okaara>=1.0.32', 'setuptools']
 )
diff --git a/common/setup.py b/common/setup.py
@@ -7,4 +7,5 @@
     packages=find_packages(exclude=['test']),
     author='Pulp Team',
     author_email='[email protected]',
+    install_requires=['iniparse', 'isodate>=0.5.0']
 )
diff --git a/comps.xml b/comps.xml
@@ -25,6 +25,7 @@
       <packagereq type="default">pulp-rpm-plugins</packagereq>
       <packagereq type="default">pulp-puppet-plugins</packagereq>
       <packagereq type="default">pulp-selinux</packagereq>
+      <packagereq type="default">python-gofer-qpid</packagereq>
       <packagereq type="default">python-qpid-qmf</packagereq>
       <packagereq type="default">python-qpid</packagereq>
     </packagelist>
@@ -102,4 +103,4 @@
       <packagereq type="mandatory">pulp-agent</packagereq>
     </packagelist>
   </group>
-</comps>
+</comps>
diff --git a/nodes/child/setup.py b/nodes/child/setup.py
@@ -11,5 +11,5 @@
         'pulp.importers': [
             'importer = pulp_node.importers.http.importer:entry_point',
         ],
-    }
+    },
 )
diff --git a/pulp.spec b/pulp.spec
@@ -307,11 +307,9 @@ Requires: python-pymongo >= 2.5.2
 Requires: python-mongoengine >= 0.7.10
 Requires: python-setuptools
 Requires: python-webpy
-Requires: python-okaara >= 1.0.32
 Requires: python-oauth2 >= 1.5.211
 Requires: python-httplib2
 Requires: python-isodate >= 0.5.0-1.pulp
-Requires: python-BeautifulSoup
 Requires: python-qpid
 Requires: python-nectar >= 1.1.6
 Requires: httpd
@@ -320,7 +318,6 @@ Requires: openssl
 Requires: nss-tools
 Requires: python-ldap
 Requires: python-gofer >= %{gofer_version}
-Requires: python-gofer-qpid >= %{gofer_version}
 Requires: crontabs
 Requires: acl
 Requires: mod_wsgi >= 3.4-1.pulp
@@ -667,7 +664,6 @@ for content, bind and system specific operations.
 Summary: Admin tool to administer the pulp server
 Group: Development/Languages
 Requires: python >= 2.6
-Requires: python-okaara >= 1.0.32
 Requires: python-%{name}-common = %{pulp_version}
 Requires: python-%{name}-bindings = %{pulp_version}
 Requires: python-%{name}-client-lib = %{pulp_version}
@@ -751,7 +747,6 @@ Requires: python-%{name}-bindings = %{pulp_version}
 Requires: python-%{name}-agent-lib = %{pulp_version}
 Requires: %{name}-consumer-client = %{pulp_version}
 Requires: python-gofer >= %{gofer_version}
-Requires: python-gofer-qpid >= %{gofer_version}
 Requires: gofer >= %{gofer_version}
 Requires: m2crypto
 

diff --git a/server/setup.py b/server/setup.py
@@ -13,5 +13,8 @@
             '../libexec/pulp-manage-workers = pulp.server.async.manage_workers:main',
             'pulp-manage-db = pulp.server.db.manage:main',
         ]
-    }
+    },
+    install_requires=[
+        'celery >=3.1.0, <3.2.0', 'httplib2', 'iniparse', 'isodate>=0.5.0', 'm2crypto',
+        'mongoengine>=0.7.10', 'oauth2>=1.5.211', 'pymongo>=2.5.2', 'setuptools', 'web.py']
 )
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,5 +11,5 @@ @@
             'pulp.importers': [
                 'importer = pulp_node.importers.http.importer:entry_point',
             ],
-        }
+        },
     )