##// END OF EJS Templates
remove bundled profiles...
Min RK -
Show More
1 NO CONTENT: file renamed from IPython/config/profile/README_STARTUP to IPython/core/profile/README_STARTUP
NO CONTENT: file renamed from IPython/config/profile/README_STARTUP to IPython/core/profile/README_STARTUP
@@ -112,7 +112,7 b' def list_profiles_in(path):'
112
112
113 def list_bundled_profiles():
113 def list_bundled_profiles():
114 """list profiles that are bundled with IPython."""
114 """list profiles that are bundled with IPython."""
115 path = os.path.join(get_ipython_package_dir(), u'config', u'profile')
115 path = os.path.join(get_ipython_package_dir(), u'core', u'profile')
116 files = os.listdir(path)
116 files = os.listdir(path)
117 profiles = []
117 profiles = []
118 for profile in files:
118 for profile in files:
@@ -114,7 +114,7 b' class ProfileDir(LoggingConfigurable):'
114 self._mkdir(self.startup_dir)
114 self._mkdir(self.startup_dir)
115
115
116 readme = os.path.join(self.startup_dir, 'README')
116 readme = os.path.join(self.startup_dir, 'README')
117 src = os.path.join(get_ipython_package_dir(), u'config', u'profile', u'README_STARTUP')
117 src = os.path.join(get_ipython_package_dir(), u'core', u'profile', u'README_STARTUP')
118
118
119 if not os.path.exists(src):
119 if not os.path.exists(src):
120 self.log.warn("Could not copy README_STARTUP to startup dir. Source file %s does not exist.", src)
120 self.log.warn("Could not copy README_STARTUP to startup dir. Source file %s does not exist.", src)
@@ -169,7 +169,7 b' class ProfileDir(LoggingConfigurable):'
169 if os.path.isfile(dst) and not overwrite:
169 if os.path.isfile(dst) and not overwrite:
170 return False
170 return False
171 if path is None:
171 if path is None:
172 path = os.path.join(get_ipython_package_dir(), u'config', u'profile', u'default')
172 path = os.path.join(get_ipython_package_dir(), u'core', u'profile', u'default')
173 src = os.path.join(path, config_file)
173 src = os.path.join(path, config_file)
174 shutil.copy(src, dst)
174 shutil.copy(src, dst)
175 return True
175 return True
@@ -149,9 +149,8 b' def test_list_profiles_in():'
149
149
150 def test_list_bundled_profiles():
150 def test_list_bundled_profiles():
151 # This variable will need to be updated when a new profile gets bundled
151 # This variable will need to be updated when a new profile gets bundled
152 bundled_true = [u'cluster', u'math', u'pysh', u'sympy']
153 bundled = sorted(list_bundled_profiles())
152 bundled = sorted(list_bundled_profiles())
154 nt.assert_equal(bundled, bundled_true)
153 nt.assert_equal(bundled, [])
155
154
156
155
157 def test_profile_create_ipython_dir():
156 def test_profile_create_ipython_dir():
@@ -183,7 +183,7 b' def find_package_data():'
183 os.chdir(cwd)
183 os.chdir(cwd)
184
184
185 package_data = {
185 package_data = {
186 'IPython.config.profile' : ['README*', '*/*.py'],
186 'IPython.core' : ['profile/README*'],
187 'IPython.core.tests' : ['*.png', '*.jpg'],
187 'IPython.core.tests' : ['*.png', '*.jpg'],
188 'IPython.lib.tests' : ['*.wav'],
188 'IPython.lib.tests' : ['*.wav'],
189 'IPython.testing.plugin' : ['*.txt'],
189 'IPython.testing.plugin' : ['*.txt'],
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
General Comments 0
You need to be logged in to leave comments. Login now