Skip to content

Commit

Permalink
BLD: Remove ez_setup entirely. We require setuptools.
Browse files Browse the repository at this point in the history
  • Loading branch information
danielballan committed Oct 13, 2014
1 parent cadb89b commit 8067c33
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 284 deletions.
1 change: 0 additions & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
include MANIFEST.in
include setup.py
include ez_setup.py
include versioneer.py
include trackpy/_version.py
include README.md
Expand Down
264 changes: 0 additions & 264 deletions ez_setup.py

This file was deleted.

22 changes: 3 additions & 19 deletions setup.py
Original file line number Diff line number Diff line change
@@ -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'
Expand Down

0 comments on commit 8067c33

Please sign in to comment.