Skip to content

Commit

Permalink
Merge pull request #128 from olcf/new_release
Browse files Browse the repository at this point in the history
changing version
  • Loading branch information
Noah Ginsburg authored Oct 3, 2019
2 parents 171dacd + 129533d commit 57d871d
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 6 deletions.
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.1.5
2.1.6
16 changes: 11 additions & 5 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
#
"""Configuration file for RTD"""
# Configuration file for the Sphinx documentation builder.
#
# This file does only contain a selection of the most common options. For a
Expand All @@ -12,7 +12,7 @@
# add these directories to sys.path here. If the directory is relative to the
# documentation root, use os.path.abspath to make it absolute, like shown here.
#
# import os
import os
# import sys
# sys.path.insert(0, os.path.abspath('.'))

Expand All @@ -22,11 +22,17 @@
project = u'PkPass'
author = u'Noah Ginsburg, Ryan Adamson'

HERE = os.path.abspath(os.path.dirname(__file__))
THERE = os.path.join(HERE, "..", "..")

VERSION = None
with open(os.path.join(THERE, 'VERSION')) as version_file:
VERSION = version_file.read().strip()

# The short X.Y version
version = u'2.1.5'
version = VERSION
# The full version, including alpha/beta/rc tags
release = u'2.1.5'

release = VERSION

# -- General configuration ---------------------------------------------------

Expand Down

0 comments on commit 57d871d

Please sign in to comment.