Merge branch 'master' into jan/feature-cell-diameter

firedrakeproject · Sep 24, 2017 · faffacc · faffacc
2 parents cd99fc7 + 683fe8f
commit faffacc
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 4 deletions.
diff --git a/ChangeLog.rst b/ChangeLog.rst
@@ -7,6 +7,11 @@ Changelog
 - Add quadrilateral and hexahedron reference cells
 - Add quadrilateral and hexahedron elements (with a wrapping class for TensorProductElement)
 
+2017.1.0.post1 (2017-09-12)
+---------------------------
+
+- Change PyPI package name to fenics-fiat.
+
 2017.1.0 (2017-05-09)
 ---------------------
 

diff --git a/FIAT/__init__.py b/FIAT/__init__.py
@@ -43,7 +43,7 @@
 from FIAT.reference_element import ufc_cell, ufc_simplex  # noqa: F401
 from FIAT.hdivcurl import Hdiv, Hcurl                     # noqa: F401
 
-__version__ = pkg_resources.get_distribution("FIAT").version
+__version__ = pkg_resources.get_distribution("fenics-fiat").version
 
 # List of supported elements and mapping to element classes
 supported_elements = {"Argyris": Argyris,

diff --git a/doc/sphinx/source/conf.py b/doc/sphinx/source/conf.py
@@ -56,7 +56,7 @@
 project = u'FInite element Automatic Tabulator (FIAT)'
 this_year = datetime.date.today().year
 copyright = u'%s, FEniCS Project' % this_year
-version = pkg_resources.get_distribution("FIAT").version
+version = pkg_resources.get_distribution("fenics-fiat").version
 release = version
 
 # The language for content autogenerated by Sphinx. Refer to documentation

diff --git a/doc/sphinx/source/releases.rst b/doc/sphinx/source/releases.rst
@@ -9,6 +9,7 @@ Release notes
    :maxdepth: 2
 
    releases/next
+   releases/v2017.1.0.post1
    releases/v2017.1.0
    releases/v2016.2.0
    releases/v2016.1.0

diff --git a/doc/sphinx/source/releases/v2017.1.0.post1.rst b/doc/sphinx/source/releases/v2017.1.0.post1.rst
@@ -0,0 +1,10 @@
+=================================
+Changes in version 2017.1.0.post1
+=================================
+
+FIAT 2017.1.0.post1 was released on 2017-09-12.
+
+Summary of changes
+==================
+
+- Change PyPI package name to fenics-fiat.
diff --git a/setup.py b/setup.py
@@ -18,9 +18,9 @@
 url = "https://bitbucket.org/fenics-project/fiat/"
 tarball = None
 if 'dev' not in version:
-    tarball = url + "downloads/fiat-%s.tar.gz" % version
+    tarball = url + "downloads/fenics-fiat-%s.tar.gz" % version
 
-setup(name="FIAT",
+setup(name="fenics-fiat",
       description="FInite element Automatic Tabulator",
       version=version,
       author="Robert C. Kirby et al.",