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