Use the target python to run sphinx. Fix div.document-no-sidebar style

This commit is contained in:
Robin Dunn
2019-10-30 11:18:48 -07:00
parent a3d90b5e41
commit f14cf8c06e
2 changed files with 4 additions and 4 deletions

View File

@@ -702,8 +702,8 @@ def uploadPackage(fileName, options, mask=defaultMask, keep=75):
cmd = 'scp {} {}:{}'.format(fileName, host, uploadDir)
runcmd(cmd)
# Make sure it is readable by all
cmd = 'ssh {} "cd {}; chmod a+r {}"'.format(host, uploadDir, os.path.basename(fileName))
# Make sure it is readable by all, and writable by rbot
cmd = 'ssh {} "cd {}; chmod 644 {}"'.format(host, uploadDir, os.path.basename(fileName))
runcmd(cmd)
if not options.release:
@@ -1131,7 +1131,7 @@ def cmd_sphinx(options, args):
pwd2 = pushDir(sphinxDir)
buildDir = os.path.join(sphinxDir, 'build')
htmlDir = os.path.join(phoenixDir(), 'docs', 'html')
runcmd('sphinx-build -b html -d %s/doctrees . %s' % (buildDir, htmlDir))
runcmd('{} -m sphinx -b html -d {}/doctrees . {}'.format(PYTHON, buildDir, htmlDir))
del pwd2
msg('Postprocessing sphinx output...')

View File

@@ -121,7 +121,7 @@ div.document-no-sidebar {
position: relative;
margin-left: 0px;
z-index: 0;
top: 30px;
top: 0px;
}
div.sphinxsidebar {