diff options
| author | hut <hut@lepus.uberspace.de> | 2016-01-25 12:46:47 +0100 |
|---|---|---|
| committer | hut <hut@lepus.uberspace.de> | 2016-01-25 20:53:37 +0100 |
| commit | 34e28e6159dece029770a0c172e25021beea9edf (patch) | |
| tree | 076b65d34deddde71c75b6d48a89ba2d700bcb8b | |
| parent | 0267251adf7285b87a6a6b20450ed325b98bc26d (diff) | |
| download | ranger-34e28e6159dece029770a0c172e25021beea9edf.tar.gz | |
Revert "Use setuptools if present"
This reverts commit 8b958c577a7f5f484db42b7c26b0340e14fd9351. Reasons: 1. it breaks the `. ranger` command (fixes #454) 2. the `ranger.desktop` file is not installed properly 3. ranger won't run when installing it outside of PYTHONPATH
| -rw-r--r-- | .gitignore | 1 | ||||
| -rwxr-xr-x | setup.py | 9 |
2 files changed, 2 insertions, 8 deletions
diff --git a/.gitignore b/.gitignore index 09f1a7e6..5357ead2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,4 @@ *~ -*.egg-info *.pyc *.pyo stuff/* diff --git a/setup.py b/setup.py index 9da63925..234bba19 100755 --- a/setup.py +++ b/setup.py @@ -2,12 +2,7 @@ # This file is part of ranger, the console file manager. # License: GNU GPL version 3, see the file "AUTHORS" for details. -# Setuptools is superior but not available in the stdlib -try: - from setuptools import setup -except ImportError: - from distutils.core import setup - +import distutils.core import os.path import ranger @@ -16,7 +11,7 @@ def _findall(directory): if os.path.isfile(os.path.join(directory, f))] if __name__ == '__main__': - setup( + distutils.core.setup( name='ranger', description='Vim-like file manager', long_description=ranger.__doc__, |