Show More
@@ -4,3 +4,7 b'' | |||||
4 | def test_import_configloader(): |
|
4 | def test_import_configloader(): | |
5 | from IPython.config import configloader |
|
5 | from IPython.config import configloader | |
6 |
|
6 | |||
|
7 | def test_import_userconfig(): | |||
|
8 | from IPython.config import userconfig | |||
|
9 | ||||
|
10 |
1 | NO CONTENT: file renamed from IPython/UserConfig/__init__.py to IPython/config/userconfig/__init__.py |
|
NO CONTENT: file renamed from IPython/UserConfig/__init__.py to IPython/config/userconfig/__init__.py |
1 | NO CONTENT: file renamed from IPython/UserConfig/ipy_user_conf.py to IPython/config/userconfig/ipy_user_conf.py |
|
NO CONTENT: file renamed from IPython/UserConfig/ipy_user_conf.py to IPython/config/userconfig/ipy_user_conf.py |
1 | NO CONTENT: file renamed from IPython/UserConfig/ipythonrc to IPython/config/userconfig/ipythonrc |
|
NO CONTENT: file renamed from IPython/UserConfig/ipythonrc to IPython/config/userconfig/ipythonrc |
1 | NO CONTENT: file renamed from IPython/UserConfig/ipythonrc-math to IPython/config/userconfig/ipythonrc-math |
|
NO CONTENT: file renamed from IPython/UserConfig/ipythonrc-math to IPython/config/userconfig/ipythonrc-math |
1 | NO CONTENT: file renamed from IPython/UserConfig/ipythonrc-numeric to IPython/config/userconfig/ipythonrc-numeric |
|
NO CONTENT: file renamed from IPython/UserConfig/ipythonrc-numeric to IPython/config/userconfig/ipythonrc-numeric |
1 | NO CONTENT: file renamed from IPython/UserConfig/ipythonrc-physics to IPython/config/userconfig/ipythonrc-physics |
|
NO CONTENT: file renamed from IPython/UserConfig/ipythonrc-physics to IPython/config/userconfig/ipythonrc-physics |
1 | NO CONTENT: file renamed from IPython/UserConfig/ipythonrc-pysh to IPython/config/userconfig/ipythonrc-pysh |
|
NO CONTENT: file renamed from IPython/UserConfig/ipythonrc-pysh to IPython/config/userconfig/ipythonrc-pysh |
1 | NO CONTENT: file renamed from IPython/UserConfig/ipythonrc-tutorial to IPython/config/userconfig/ipythonrc-tutorial |
|
NO CONTENT: file renamed from IPython/UserConfig/ipythonrc-tutorial to IPython/config/userconfig/ipythonrc-tutorial |
@@ -167,7 +167,7 b' where you can customize many aspects of IPython\'s functionality in:\\n""")' | |||||
167 |
|
167 | |||
168 | printf(ipythondir) |
|
168 | printf(ipythondir) | |
169 |
|
169 | |||
170 |
rcdirend = os.path.join('IPython',' |
|
170 | rcdirend = os.path.join('IPython','config','userconfig') | |
171 | cfg = lambda d: os.path.join(d,rcdirend) |
|
171 | cfg = lambda d: os.path.join(d,rcdirend) | |
172 | try: |
|
172 | try: | |
173 | rcdir = filter(os.path.isdir,map(cfg,sys.path))[0] |
|
173 | rcdir = filter(os.path.isdir,map(cfg,sys.path))[0] |
@@ -3352,7 +3352,7 b' Defaulting color scheme to \'NoColor\'"""' | |||||
3352 | ip = self.getapi() |
|
3352 | ip = self.getapi() | |
3353 | ipinstallation = path(IPython.__file__).dirname() |
|
3353 | ipinstallation = path(IPython.__file__).dirname() | |
3354 | upgrade_script = '%s "%s"' % (sys.executable,ipinstallation / 'utils' / 'upgradedir.py') |
|
3354 | upgrade_script = '%s "%s"' % (sys.executable,ipinstallation / 'utils' / 'upgradedir.py') | |
3355 |
src_config = ipinstallation / ' |
|
3355 | src_config = ipinstallation / 'config' / 'userconfig' | |
3356 | userdir = path(ip.options.ipythondir) |
|
3356 | userdir = path(ip.options.ipythondir) | |
3357 | cmd = '%s "%s" "%s"' % (upgrade_script, src_config, userdir) |
|
3357 | cmd = '%s "%s" "%s"' % (upgrade_script, src_config, userdir) | |
3358 | print ">",cmd |
|
3358 | print ">",cmd |
@@ -224,7 +224,7 b' def make_runners():' | |||||
224 |
|
224 | |||
225 | # These are tested by nose, so skip IPython.kernel |
|
225 | # These are tested by nose, so skip IPython.kernel | |
226 | top_pack = ['config','Extensions','frontend', |
|
226 | top_pack = ['config','Extensions','frontend', | |
227 |
'testing','tests','tools',' |
|
227 | 'testing','tests','tools','userconfig'] | |
228 |
|
228 | |||
229 | if have_wx: |
|
229 | if have_wx: | |
230 | top_pack.append('gui') |
|
230 | top_pack.append('gui') |
@@ -64,8 +64,8 b' def default_argv():' | |||||
64 |
|
64 | |||
65 | # Get the install directory for the user configuration and tell ipython to |
|
65 | # Get the install directory for the user configuration and tell ipython to | |
66 | # use the default profile from there. |
|
66 | # use the default profile from there. | |
67 |
from IPython import |
|
67 | from IPython.config import userconfig | |
68 |
ipcdir = os.path.dirname( |
|
68 | ipcdir = os.path.dirname(userconfig.__file__) | |
69 | #ipconf = os.path.join(ipcdir,'ipy_user_conf.py') |
|
69 | #ipconf = os.path.join(ipcdir,'ipy_user_conf.py') | |
70 | ipconf = os.path.join(ipcdir,'ipythonrc') |
|
70 | ipconf = os.path.join(ipcdir,'ipythonrc') | |
71 | #print 'conf:',ipconf # dbg |
|
71 | #print 'conf:',ipconf # dbg |
@@ -204,12 +204,12 b' Top-level sub-packages:' | |||||
204 |
|
204 | |||
205 | * :file:`testing`. Good where it is. |
|
205 | * :file:`testing`. Good where it is. | |
206 |
|
206 | |||
207 |
* :file:`tests`. |
|
207 | * :file:`tests`. Remove. | |
208 |
|
208 | |||
209 | * :file:`tools`. Things in here need to be looked at and moved elsewhere like |
|
209 | * :file:`tools`. Things in here need to be looked at and moved elsewhere like | |
210 | :file:`IPython.utils`. |
|
210 | :file:`IPython.utils`. | |
211 |
|
211 | |||
212 |
* :file:`UserConfig`. Move to |
|
212 | * :file:`UserConfig`. Move to :file:`IPython.config.userconfig`. | |
213 |
|
213 | |||
214 | * :file:`config`. Good where it is! |
|
214 | * :file:`config`. Good where it is! | |
215 |
|
215 | |||
@@ -217,8 +217,6 b' Top-level sub-packages:' | |||||
217 |
|
217 | |||
218 | * :file:`frontend`. Good where it is! |
|
218 | * :file:`frontend`. Good where it is! | |
219 |
|
219 | |||
220 |
|
||||
221 |
|
||||
222 | * :file:`gui`. Eventually this should be moved to a subdir of |
|
220 | * :file:`gui`. Eventually this should be moved to a subdir of | |
223 | :file:`IPython.frontend`. |
|
221 | :file:`IPython.frontend`. | |
224 |
|
222 |
General Comments 0
You need to be logged in to leave comments.
Login now