mirror of
https://github.com/jupyter/notebook.git
synced 2025-02-17 12:39:54 +08:00
Finished initial reworking and updating of setup.py and friends, including the MANIFEST.in. Everything seems
to work fine. I have also gone through the tests in various subpackages (like kernel) and have protected imports of twisted, zope.interface and foolscap with a try/except clause. Now the tests are simply not run if these deps are missing. All tests now pass no matter what.
This commit is contained in:
parent
d816e04b5f
commit
9dc8fdd5e7
22
setup.py
22
setup.py
@ -72,12 +72,7 @@ if len(sys.argv) >= 2 and sys.argv[1] in ('sdist','bdist_rpm'):
|
||||
|
||||
# List of things to be updated. Each entry is a triplet of args for
|
||||
# target_update()
|
||||
to_update = [ # The do_sphinx scripts builds html and pdf, so just one
|
||||
# target is enough to cover all manual generation
|
||||
('doc/manual/ipython.pdf',
|
||||
['IPython/Release.py','doc/source/ipython.rst'],
|
||||
"cd doc && python do_sphinx.py" ),
|
||||
|
||||
to_update = [
|
||||
# FIXME - Disabled for now: we need to redo an automatic way
|
||||
# of generating the magic info inside the rst.
|
||||
#('doc/magic.tex',
|
||||
@ -93,6 +88,18 @@ if len(sys.argv) >= 2 and sys.argv[1] in ('sdist','bdist_rpm'):
|
||||
"cd doc && gzip -9c pycolor.1 > pycolor.1.gz"),
|
||||
]
|
||||
|
||||
try:
|
||||
import sphinx
|
||||
except ImportError:
|
||||
pass
|
||||
else:
|
||||
# The do_sphinx scripts builds html and pdf, so just one
|
||||
# target is enough to cover all manual generation
|
||||
to_update.append(
|
||||
('doc/manual/ipython.pdf',
|
||||
['IPython/Release.py','doc/source/ipython.rst'],
|
||||
"cd doc && python do_sphinx.py")
|
||||
)
|
||||
[ target_update(*t) for t in to_update ]
|
||||
|
||||
#---------------------------------------------------------------------------
|
||||
@ -152,9 +159,6 @@ else:
|
||||
# Do the actual setup now
|
||||
#---------------------------------------------------------------------------
|
||||
|
||||
print packages
|
||||
|
||||
|
||||
setup_args['packages'] = packages
|
||||
setup_args['package_data'] = package_data
|
||||
setup_args['scripts'] = scripts
|
||||
|
Loading…
Reference in New Issue
Block a user