BLD: Simplify setup. Require setuptools.

zoeith · Oct 14, 2014 · 5ec747d · 5ec747d
1 parent bfd8d9f
commit 5ec747d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 284 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,5 +1,7 @@
+include MANIFEST.in
+include setup.py
 include versioneer.py
 include trackpy/_version.py
 include README.md
-include LICENCE
+include LICENSE
 include doi.png
diff --git a/ez_setup.py b/ez_setup.py
diff --git a/setup.py b/setup.py
@@ -1,27 +1,11 @@
-# This downloads and install setuptools if it is not installed.
-from ez_setup import use_setuptools
-use_setuptools()
-
 import os
 import sys
 import warnings
+import setuptools
+import versioneer
+from setuptools import setup, Extension
 
-# try bootstrapping setuptools if it doesn't exist
-try:
-    import pkg_resources
-    try:
-        pkg_resources.require("setuptools>=0.6c5")
-    except pkg_resources.VersionConflict:
-        from ez_setup import use_setuptools
-        use_setuptools(version="0.6c5")
-    from setuptools import setup, Extension
-    _have_setuptools = True
-except ImportError:
-    # no setuptools installed
-    from numpy.distutils.core import setup
-    _have_setuptools = False
 
-import versioneer
 versioneer.VCS = 'git'
 versioneer.versionfile_source = 'trackpy/_version.py'
 versioneer.versionfile_build = 'trackpy/_version.py'