Show More
@@ -152,6 +152,9 b' else:' | |||
|
152 | 152 | # Do the actual setup now |
|
153 | 153 | #--------------------------------------------------------------------------- |
|
154 | 154 | |
|
155 | print packages | |
|
156 | ||
|
157 | ||
|
155 | 158 | setup_args['packages'] = packages |
|
156 | 159 | setup_args['package_data'] = package_data |
|
157 | 160 | setup_args['scripts'] = scripts |
@@ -86,22 +86,22 b' def add_package(packages, pname, config=False, tests=False, scripts=False, other' | |||
|
86 | 86 | """ |
|
87 | 87 | Add a package to the list of packages, including certain subpackages. |
|
88 | 88 | """ |
|
89 |
packages.append('.'.join([' |
|
|
89 | packages.append('.'.join(['IPython',pname])) | |
|
90 | 90 | if config: |
|
91 |
packages.append('.'.join([' |
|
|
91 | packages.append('.'.join(['IPython',pname,'config'])) | |
|
92 | 92 | if tests: |
|
93 |
packages.append('.'.join([' |
|
|
93 | packages.append('.'.join(['IPython',pname,'tests'])) | |
|
94 | 94 | if scripts: |
|
95 |
packages.append('.'.join([' |
|
|
95 | packages.append('.'.join(['IPython',pname,'scripts'])) | |
|
96 | 96 | if others is not None: |
|
97 | 97 | for o in others: |
|
98 |
packages.append('.'.join([' |
|
|
98 | packages.append('.'.join(['IPython',pname,o])) | |
|
99 | 99 | |
|
100 | 100 | def find_packages(): |
|
101 | 101 | """ |
|
102 | 102 | Find all of IPython's packages. |
|
103 | 103 | """ |
|
104 |
packages = [' |
|
|
104 | packages = ['IPython'] | |
|
105 | 105 | add_package(packages, 'config', tests=True) |
|
106 | 106 | add_package(packages , 'Extensions') |
|
107 | 107 | add_package(packages, 'external') |
@@ -175,9 +175,9 b' def find_scripts():' | |||
|
175 | 175 | Find IPython's scripts. |
|
176 | 176 | """ |
|
177 | 177 | scripts = [] |
|
178 |
scripts.append('ipython |
|
|
179 |
scripts.append('ipython |
|
|
180 |
scripts.append('ipython |
|
|
178 | scripts.append('ipython/kernel/scripts/ipengine') | |
|
179 | scripts.append('ipython/kernel/scripts/ipcontroller') | |
|
180 | scripts.append('ipython/kernel/scripts/ipcluster') | |
|
181 | 181 | scripts.append('scripts/ipython') |
|
182 | 182 | scripts.append('scripts/pycolor') |
|
183 | 183 | scripts.append('scripts/irunner') |
@@ -76,12 +76,13 b' def check_for_twisted():' | |||
|
76 | 76 | major = twisted.version.major |
|
77 | 77 | minor = twisted.version.minor |
|
78 | 78 | micro = twisted.version.micro |
|
79 | print_status("Twisted", twisted.version.short()) | |
|
79 | 80 | if not ((major==2 and minor>=5 and micro>=0) or \ |
|
80 | 81 | major>=8): |
|
81 | 82 | print_message("WARNING: IPython requires Twisted 2.5.0 or greater, you have version %s"%twisted.version.short()) |
|
83 | print_message("Twisted is required for parallel computing capabilities") | |
|
82 | 84 | return False |
|
83 | 85 | else: |
|
84 | print_status("Twisted", twisted.version.short()) | |
|
85 | 86 | return True |
|
86 | 87 | |
|
87 | 88 | def check_for_foolscap(): |
@@ -108,7 +109,7 b' def check_for_sphinx():' | |||
|
108 | 109 | try: |
|
109 | 110 | import sphinx |
|
110 | 111 | except ImportError: |
|
111 |
print_status('sphinx', "Not found (required for building |
|
|
112 | print_status('sphinx', "Not found (required for building documentation)") | |
|
112 | 113 | return False |
|
113 | 114 | else: |
|
114 | 115 | print_status('sphinx', sphinx.__version__) |
@@ -118,7 +119,7 b' def check_for_pygments():' | |||
|
118 | 119 | try: |
|
119 | 120 | import pygments |
|
120 | 121 | except ImportError: |
|
121 |
print_status('pygments', "Not found (required for syntax highlighting |
|
|
122 | print_status('pygments', "Not found (required for syntax highlighting documentation)") | |
|
122 | 123 | return False |
|
123 | 124 | else: |
|
124 | 125 | print_status('pygments', pygments.__version__) |
@@ -128,7 +129,7 b' def check_for_nose():' | |||
|
128 | 129 | try: |
|
129 | 130 | import nose |
|
130 | 131 | except ImportError: |
|
131 |
print_status('nose', "Not found (required for running the |
|
|
132 | print_status('nose', "Not found (required for running the test suite)") | |
|
132 | 133 | return False |
|
133 | 134 | else: |
|
134 | 135 | print_status('nose', nose.__version__) |
General Comments 0
You need to be logged in to leave comments.
Login now