Fix things up to work with nova.

Add extern/six back - turns out setup_requires isn't transitive.
Make sure .gitignore is right.

1 files changed, 5 insertions, 3 deletions

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())