Commit 3942cdf
Fixed packaging issue caused by ez_setup.py
ez_setup.py is not packaged with the rest of the code, this causes
`easy_install gitpython` to fail with an ImportError.
ez_setup is useful when setuptools are not present in the pythonpath.
(cherry picked from commit e7c37c6e0b12d2b4f5001fb3ecfc250a682f6d57)1 parent dc1fcf3 commit 3942cdf
1 file changed
Lines changed: 7 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,6 +1,10 @@ | |||
| 1 | - from ez_setup import use_setuptools | ||
| 2 | - use_setuptools() | ||
| 3 | - from setuptools import setup, find_packages | ||
| 1 | + try: | ||
| 2 | + from setuptools import setup, find_packages | ||
| 3 | + except ImportError: | ||
| 4 | + from ez_setup import use_setuptools | ||
| 5 | + use_setuptools() | ||
| 6 | + from setuptools import setup, find_packages | ||
| 7 | + | ||
| 4 | 8 | from distutils.command.build_py import build_py as _build_py | |
| 5 | 9 | from setuptools.command.sdist import sdist as _sdist | |
| 6 | 10 | import os | |
0 commit comments