From e6b1755d7014845b6aa250fc881bf87ac2b03c0b Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Sun, 10 Mar 2013 18:06:12 -0400 Subject: [PATCH] Fix things up to work with nova. Add extern/six back - turns out setup_requires isn't transitive. Make sure .gitignore is right. --- .gitignore | 2 ++ setup.cfg | 2 +- setup.py | 8 +++++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 24f0fdd..8cef338 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,5 @@ develop-eggs .*.swp .coverage cover +AUTHORS +ChangeLog diff --git a/setup.cfg b/setup.cfg index c041a00..4dc089f 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,6 @@ [metadata] name = oslo.packaging +version = 0.1 author = OpenStack author-email = openstack-dev@lists.openstack.org summary = OpenStack's setup automation in a reusable form @@ -19,7 +20,6 @@ classifier = [files] packages = oslo - oslo.packaging namespace_packages = oslo diff --git a/setup.py b/setup.py index bbb4e9b..5cd6208 100755 --- a/setup.py +++ b/setup.py @@ -14,10 +14,12 @@ # See the License for the specific language governing permissions and # limitations under the License. -from setuptools import setup +import setuptools # See setup.cfg for the project metadata. -from oslo.setup import util import filtered_args +from oslo.packaging import util -setup(**filtered_args()) +# Use our internals directly, so that we don't chicken-and-egg needing to +# install an entry point before using ourself. +setuptools.setup(**util.filtered_args())