summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMonty Taylor <mordred@inaugust.com>2013-06-10 21:55:50 -0700
committerMonty Taylor <mordred@inaugust.com>2013-06-11 08:17:55 -0700
commit94547fc8554c7e193ceb4fe281ea72ffd2a0dd3a (patch)
tree0f7c28c5bbe2536df8a411396e75863b32fd4a92
parenteec909b6b44b769ea4fbb218a80034f012ed6af8 (diff)
downloadoslo-version-94547fc8554c7e193ceb4fe281ea72ffd2a0dd3a.tar.gz
Remove explicit depend on distribute.
Things in the world are moving towards setuptools 0.7, and there is not a path between distribute and setuptools. Our explicit dependency on setuptools is causing us to have to write patches to try to jump through additional hoops to get it to install in the right contexts. Fixes bug 1189941 Change-Id: Id7a749c02203100dab52160a551d3548c8a48fd6
-rwxr-xr-xsetup.py13
1 files changed, 0 insertions, 13 deletions
diff --git a/setup.py b/setup.py
index 0fd8d96..dcc3d3e 100755
--- a/setup.py
+++ b/setup.py
@@ -14,19 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-import os
-import sys
-
-try:
- sys.path += [x for x in os.listdir(".") if x.endswith(".egg")]
- import d2to1 # flake8: noqa
-except ImportError:
- import subprocess
- if not subprocess.call(
- [sys.executable] +
- "-m pip.__init__ install distribute<0.7 d2to1>=0.2.10,<0.3".split()
- ):
- sys.exit(subprocess.call([sys.executable] + sys.argv))
import setuptools
setuptools.setup(