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
1=== modified file 'MANIFEST.in'
2--- MANIFEST.in 2011-03-16 20:03:59 +0000
3+++ MANIFEST.in 2011-03-30 15:59:54 +0000
4@@ -1,3 +1,1 @@
5 include LICENSE README
6-include nova_adminclient/__init__.py
7-include nova_adminclient/client.py
8
9=== modified file 'setup.py'
10--- setup.py 2011-03-16 20:03:59 +0000
11+++ setup.py 2011-03-30 15:59:54 +0000
12@@ -17,17 +17,17 @@
13 # under the License.
14
15 import os
16-from setuptools import setup, find_packages
17+from setuptools import setup
18
19
20 setup(name = "nova-adminclient",
21- version = "0.1.2",
22+ version = "0.1.3",
23 license = 'Apache License (2.0)',
24 description = "client for administering OpenStack Nova",
25 author = 'OpenStack',
26 author_email = 'nova@lists.launchpad.net',
27 url='http://www.openstack.org',
28- packages = find_packages('nova_adminclient'),
29+ packages = ['nova_adminclient'],
30 install_requires = ['setuptools', 'boto==1.9b'],
31 classifiers = [
32 'Development Status :: 5 - Production/Stable',

Subscribers

People subscribed via source and target branches