diff options
| author | Adam J. Stewart <ajstewart426@gmail.com> | 2017-10-19 02:26:04 -0500 |
|---|---|---|
| committer | Todd Gamblin <tgamblin@llnl.gov> | 2017-10-19 00:26:04 -0700 |
| commit | a1c19f8389aa5135330042c72df36e603c1645db (patch) | |
| tree | 75b80071a0d5f98d84eb845063d04000cc1c0f26 | |
| parent | b46f1e3605ed2e2491c563f391145054442cb024 (diff) | |
| download | spack-a1c19f8389aa5135330042c72df36e603c1645db.tar.gz spack-a1c19f8389aa5135330042c72df36e603c1645db.tar.bz2 spack-a1c19f8389aa5135330042c72df36e603c1645db.tar.xz spack-a1c19f8389aa5135330042c72df36e603c1645db.zip | |
Allow documentation to build in Python 3 (#5736)
| -rw-r--r-- | lib/spack/docs/conf.py | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/lib/spack/docs/conf.py b/lib/spack/docs/conf.py index b27a3a5538..9b4101fdfe 100644 --- a/lib/spack/docs/conf.py +++ b/lib/spack/docs/conf.py @@ -61,11 +61,6 @@ spack_root = '../../..' os.environ['SPACK_ROOT'] = 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 # a terminal. os.environ['COLIFY_SIZE'] = '25x120' @@ -192,9 +187,9 @@ copyright = u'2013-2017, Lawrence Livermore National Laboratory.' # built documents. # # 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. -release = '.'.join(spack_version[:2]) +release = str(spack.spack_version.up_to(2)) # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. |