Navigation Menu

Skip to content

Commit

Permalink
Add install_requires arguments to our setup.py files.
Browse files Browse the repository at this point in the history
This commit also removes some incorrect Requires lines in our spec file, and adds
python-gofer-qpid to our server qpid group.

https://pulp.plan.io/issues/278

re #278
  • Loading branch information
Randy Barlow committed Feb 19, 2015
1 parent f7cd200 commit 31201f7
Show file tree
Hide file tree
Showing 9 changed files with 19 additions and 8 deletions.
3 changes: 3 additions & 0 deletions agent/setup.py 100644 → 100755
@@ -1,3 +1,5 @@
#!/usr/bin/env python

from setuptools import setup, find_packages

setup(
Expand All @@ -7,4 +9,5 @@
packages=find_packages(exclude=['test']),
author='Pulp Team',
author_email='pulp-list@redhat.com',
install_requires=['m2crypto']
)
3 changes: 3 additions & 0 deletions bindings/setup.py 100644 → 100755
@@ -1,3 +1,5 @@
#!/usr/bin/env python

from setuptools import setup, find_packages

setup(
Expand All @@ -7,4 +9,5 @@
packages=find_packages(exclude=['test']),
author='Pulp Team',
author_email='pulp-list@redhat.com',
install_requires=['m2crypto', 'oauth2>=1.5.170']
)
2 changes: 2 additions & 0 deletions client_admin/setup.py 100644 → 100755
@@ -1,3 +1,5 @@
#!/usr/bin/env python

from setuptools import setup, find_packages

setup(
Expand Down
3 changes: 3 additions & 0 deletions client_lib/setup.py 100644 → 100755
@@ -1,3 +1,5 @@
#!/usr/bin/env python

from setuptools import setup, find_packages

setup(
Expand All @@ -7,4 +9,5 @@
packages=find_packages(exclude=['test']),
author='Pulp Team',
author_email='pulp-list@redhat.com',
install_requires=['isodate>0.5.0', 'm2crypto', 'okaara>=1.0.32', 'setuptools']
)
1 change: 1 addition & 0 deletions common/setup.py
Expand Up @@ -7,4 +7,5 @@
packages=find_packages(exclude=['test']),
author='Pulp Team',
author_email='pulp-list@redhat.com',
install_requires=['iniparse', 'isodate>=0.5.0']
)
3 changes: 2 additions & 1 deletion comps.xml
Expand Up @@ -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>
Expand Down Expand Up @@ -102,4 +103,4 @@
<packagereq type="mandatory">pulp-agent</packagereq>
</packagelist>
</group>
</comps>
</comps>
2 changes: 1 addition & 1 deletion nodes/child/setup.py
Expand Up @@ -11,5 +11,5 @@
'pulp.importers': [
'importer = pulp_node.importers.http.importer:entry_point',
],
}
},
)
5 changes: 0 additions & 5 deletions pulp.spec
Expand Up @@ -305,11 +305,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
Expand All @@ -318,7 +316,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
Expand Down Expand Up @@ -644,7 +641,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}
Expand Down Expand Up @@ -728,7 +724,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

Expand Down
5 changes: 4 additions & 1 deletion server/setup.py
Expand Up @@ -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']
)

0 comments on commit 31201f7

Please sign in to comment.