Skip to content

Commit

Permalink
got rid of extraneous version
Browse files Browse the repository at this point in the history
  • Loading branch information
atait committed Jan 30, 2019
1 parent 60d05e7 commit a1f3dd1
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 23 deletions.
30 changes: 14 additions & 16 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,22 +42,20 @@
# built documents.
#

with open("../version.py") as f:
code = compile(f.read(), "version.py", 'exec')
version_dict = {}
exec(code, {}, version_dict)
# The short X.Y version.
version = version_dict['version']
# The full version, including alpha/beta/rc tags.
release = version_dict['release']


# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
#
# This is also used if you do content translation via gettext catalogs.
# Usually you set "language" from the command line for these cases.
language = None
# with open("../version.py") as f:
# code = compile(f.read(), "version.py", 'exec')
# version_dict = {}
# exec(code, {}, version_dict)
# # The short X.Y version.
# version = version_dict['version']
# # The full version, including alpha/beta/rc tags.
# release = version_dict['release']

import xmltodict
with open("../grain.xml") as fx:
grain_dict = xmltodict.parse(fx.read())
version = grain_dict['salt-grain']['version']
release = version

# List of patterns, relative to source directory, that match files and
# directories to ignore when looking for source files.
Expand Down
7 changes: 0 additions & 7 deletions version.py

This file was deleted.

0 comments on commit a1f3dd1

Please sign in to comment.