Merge branch 'johannr/simplify-version-str'

FIAT/__init__.py

@@ -4,6 +4,8 @@
 
 from __future__ import absolute_import, print_function, division
 
+import pkg_resources
+
 # Import finite element classes
 from FIAT.finite_element import FiniteElement, CiarletElement  # noqa: F401
 from FIAT.argyris import Argyris
@@ -39,7 +41,7 @@
 from FIAT.reference_element import ufc_cell, ufc_simplex  # noqa: F401
 from FIAT.hdivcurl import Hdiv, Hcurl                     # noqa: F401
 
-__version__ = "2017.1.0.dev0"
+__version__ = pkg_resources.get_distribution("FIAT").version
 
 # List of supported elements and mapping to element classes
 supported_elements = {"Argyris": Argyris,

doc/sphinx/source/conf.py

@@ -15,6 +15,8 @@
 import sys
 import os
 import shlex
+import pkg_resources
+import datetime
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
@@ -52,19 +54,10 @@
 
 # General information about the project.
 project = u'FInite element Automatic Tabulator (FIAT)'
-copyright = u'2015, FEniCS Project'
-
-# The version info for the project you're documenting, acts as replacement for
-# |version| and |release|, also used in various other places throughout the
-# built documents.
-#
-import FIAT
-fiat_version = FIAT.__version__
-
-# The short X.Y version.
-version = fiat_version
-# The full version, including alpha/beta/rc tags.
-release = fiat_version
+this_year = datetime.date.today().year
+copyright = u'%s, FEniCS Project' % this_year
+version = pkg_resources.get_distribution("FIAT").version
+release = version
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

setup.py

@@ -2,7 +2,6 @@
 
 from __future__ import absolute_import, print_function, division
 
-import re
 import sys
 
 try:
@@ -14,8 +13,7 @@
     print("Python 2.7 or higher required, please upgrade.")
     sys.exit(1)
 
-version = re.findall('__version__ = "(.*)"',
-                     open('FIAT/__init__.py', 'r').read())[0]
+version = "2017.1.0.dev0"
 
 url = "https://bitbucket.org/fenics-project/fiat/"
 tarball = None