summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorhut <hut@lepus.uberspace.de>2015-07-14 02:11:20 +0200
committerhut <hut@lepus.uberspace.de>2015-07-14 02:11:20 +0200
commit9138f85e7bde80daf5307093ca044fb645836cc5 (patch)
tree4b79f00bf6fe14a4d62d2cc4898da74a683411e5
parentffc86e63f325a544d533b2a605e112ebc044f90e (diff)
parent8b958c577a7f5f484db42b7c26b0340e14fd9351 (diff)
downloadranger-9138f85e7bde80daf5307093ca044fb645836cc5.tar.gz
Merge branch 'setuptools' of https://github.com/dufferzafar/ranger
-rw-r--r--.gitignore1
-rwxr-xr-xsetup.py9
2 files changed, 8 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index 5357ead2..09f1a7e6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 *~
+*.egg-info
 *.pyc
 *.pyo
 stuff/*
diff --git a/setup.py b/setup.py
index 1e074f8d..cd3b80de 100755
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,12 @@
 # This file is part of ranger, the console file manager.
 # License: GNU GPL version 3, see the file "AUTHORS" for details.
 
-import distutils.core
+# Setuptools is superior but not available in the stdlib
+try:
+    from setuptools import setup
+except ImportError:
+    from distutils.core import setup
+
 import os.path
 import ranger
 
@@ -11,7 +16,7 @@ def _findall(directory):
             if os.path.isfile(os.path.join(directory, f))]
 
 if __name__ == '__main__':
-    distutils.core.setup(
+    setup(
         name='ranger',
         description='Vim-like file manager',
         long_description=ranger.__doc__,
b6d7bf4af5913c442'>8b59083 ^
c47da14 ^

9955ddc ^
c47da14 ^

b9da4b0 ^
439e15d ^
c225e1a ^
bf35794 ^
1076f2b
439e15d ^
bf35794 ^
1076f2b
7b5638f ^

c53980c ^
8b59083 ^
8b59083 ^


bf35794 ^

8b59083 ^

650a1fb ^
8b59083 ^
8b59083 ^

0025572 ^
bf35794 ^


8b59083 ^

1076f2b
da2bbd3 ^
3399650 ^
1173723 ^

a05beb6 ^
2e836ec ^
a05beb6 ^
95e8d12 ^
901b3ed ^
4688ad1 ^
b355755 ^
1076f2b
72707c2 ^
bf35794 ^

1076f2b

b355755 ^
8cc7f3b ^
d7413ff ^
b355755 ^
66da153 ^

bf35794 ^
292ccc4 ^
efa7e51 ^
bf35794 ^


bf35794 ^
39677ec ^
439e15d ^
dba2306 ^
3399650 ^
adaa28a ^


dba2306 ^
adaa28a ^
adaa28a ^
adaa28a ^
04eb016 ^
adaa28a ^

4688ad1 ^
adaa28a ^

3399650 ^
d7e1708 ^
dba2306 ^
c0705ee ^
adaa28a ^
c0705ee ^

8cc7f3b ^
d7e1708 ^
dba2306 ^
29355bd ^
b9da4b0 ^
9e8b325 ^
adaa28a ^
c47da14 ^
dba2306 ^
adaa28a ^
9e8b325 ^
dba2306 ^
adaa28a ^
dba2306 ^

e21d93b ^
d7413ff ^
937cabf ^
72707c2 ^
dba2306 ^
d4b7a9a ^
adaa28a ^
4688ad1 ^
adaa28a ^
349cada ^
29355bd ^
8b59083 ^
8b59083 ^
adaa28a ^
d4b7a9a ^
c47da14 ^
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137