hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Allow documentation to build in Python 3 (#5736)

Browse source
This commit is contained in:
Adam J. Stewart 2017-10-19 02:26:04 -05:00 committed by Todd Gamblin
parent b46f1e3605
commit a1c19f8389
1 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/spack/docs/conf.py
View file

@ -61,11 +61,6 @@
os.environ['SPACK_ROOT'] = spack_root os.environ['SPACK_ROOT'] = spack_root
os.environ['PATH'] += '%s%s/bin' % (os.pathsep, spack_root) os.environ['PATH'] += '%s%s/bin' % (os.pathsep, spack_root)
# Get the spack version for use in the docs
spack_version = subprocess.Popen(
[spack_root + '/bin/spack', '-V'],
stderr=subprocess.PIPE).communicate()[1].strip().split('.')
# Set an environment variable so that colify will print output like it would to # Set an environment variable so that colify will print output like it would to
# a terminal. # a terminal.
os.environ['COLIFY_SIZE'] = '25x120' os.environ['COLIFY_SIZE'] = '25x120'
@ -192,9 +187,9 @@ def setup(sphinx):
# built documents. # built documents.
# #
# The short X.Y version. # The short X.Y version.
version = '.'.join(spack_version[:2]) version = str(spack.spack_version.up_to(2))
# The full version, including alpha/beta/rc tags. # The full version, including alpha/beta/rc tags.
release = '.'.join(spack_version[:2]) release = str(spack.spack_version.up_to(2))
# The language for content autogenerated by Sphinx. Refer to documentation # The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages. # for a list of supported languages.