Show More
@@ -32,14 +32,21 def ipython_parent(): | |||||
32 |
|
32 | |||
33 | def ipython_submodules(root): |
|
33 | def ipython_submodules(root): | |
34 | """return IPython submodules relative to root""" |
|
34 | """return IPython submodules relative to root""" | |
|
35 | from IPython.frontend.html.notebook import DEFAULT_STATIC_FILES_PATH | |||
35 | return [ |
|
36 | return [ | |
36 | pjoin(root, 'IPython', 'frontend', 'html', 'notebook', 'static', 'components'), |
|
37 | pjoin(DEFAULT_STATIC_FILES_PATH, 'components') | |
37 | ] |
|
38 | ] | |
38 |
|
39 | |||
39 | def is_repo(d): |
|
40 | def is_repo(d): | |
40 | """is d a git repo?""" |
|
41 | """is d a git repo?""" | |
41 | return os.path.exists(pjoin(d, '.git')) |
|
42 | return os.path.exists(pjoin(d, '.git')) | |
42 |
|
43 | |||
|
44 | def is_package(): | |||
|
45 | """Is a package manager responsible for the static files path?""" | |||
|
46 | from IPython.utils.path import get_ipython_package_dir | |||
|
47 | from IPython.frontend.html.notebook import DEFAULT_STATIC_FILES_PATH | |||
|
48 | return not DEFAULT_STATIC_FILES_PATH.startswith(get_ipython_package_dir()) | |||
|
49 | ||||
43 | def check_submodule_status(root=None): |
|
50 | def check_submodule_status(root=None): | |
44 | """check submodule status |
|
51 | """check submodule status | |
45 |
|
52 | |||
@@ -51,8 +58,12 def check_submodule_status(root=None): | |||||
51 | """ |
|
58 | """ | |
52 |
|
59 | |||
53 | if hasattr(sys, "frozen"): |
|
60 | if hasattr(sys, "frozen"): | |
54 | # frozen via py2exe or similar, don't bother |
|
61 | # frozen via py2exe or similar, don't bother | |
55 | return 'clean' |
|
62 | return 'clean' | |
|
63 | ||||
|
64 | if is_package(): | |||
|
65 | # package manager is responsible for static files, don't bother | |||
|
66 | return 'clean' | |||
56 |
|
67 | |||
57 | if not root: |
|
68 | if not root: | |
58 | root = ipython_parent() |
|
69 | root = ipython_parent() |
General Comments 0
You need to be logged in to leave comments.
Login now