Merge lp:~mordred/nova-adminclient/fix-dist into lp:nova-adminclient

Proposed by Monty Taylor
Status: Merged
Approved by: Devin Carlen
Approved revision: 3
Merged at revision: 3
Proposed branch: lp:~mordred/nova-adminclient/fix-dist
Merge into: lp:nova-adminclient
Diff against target: 32 lines (+3/-5)
2 files modified
MANIFEST.in (+0/-2)
setup.py (+3/-3)
To merge this branch: bzr merge lp:~mordred/nova-adminclient/fix-dist
Reviewer Review Type Date Requested Status
Devin Carlen Approve
Review via email: mp+55582@code.launchpad.net

Description of the change

Fixed the dist problem. (the first arg to find_packages is the dir to look in - not the package to find)

To post a comment you must log in.
Revision history for this message
Devin Carlen (devcamcar) wrote :

Thanks Monty! I appreciate it.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'MANIFEST.in'
--- MANIFEST.in 2011-03-16 20:03:59 +0000
+++ MANIFEST.in 2011-03-30 15:59:54 +0000
@@ -1,3 +1,1 @@
1include LICENSE README1include LICENSE README
2include nova_adminclient/__init__.py
3include nova_adminclient/client.py
42
=== modified file 'setup.py'
--- setup.py 2011-03-16 20:03:59 +0000
+++ setup.py 2011-03-30 15:59:54 +0000
@@ -17,17 +17,17 @@
17# under the License.17# under the License.
1818
19import os19import os
20from setuptools import setup, find_packages20from setuptools import setup
2121
2222
23setup(name = "nova-adminclient",23setup(name = "nova-adminclient",
24 version = "0.1.2",24 version = "0.1.3",
25 license = 'Apache License (2.0)',25 license = 'Apache License (2.0)',
26 description = "client for administering OpenStack Nova",26 description = "client for administering OpenStack Nova",
27 author = 'OpenStack',27 author = 'OpenStack',
28 author_email = 'nova@lists.launchpad.net',28 author_email = 'nova@lists.launchpad.net',
29 url='http://www.openstack.org',29 url='http://www.openstack.org',
30 packages = find_packages('nova_adminclient'),30 packages = ['nova_adminclient'],
31 install_requires = ['setuptools', 'boto==1.9b'],31 install_requires = ['setuptools', 'boto==1.9b'],
32 classifiers = [32 classifiers = [
33 'Development Status :: 5 - Production/Stable',33 'Development Status :: 5 - Production/Stable',

Subscribers

People subscribed via source and target branches