Remove Python 2 support

FEniCS · Dec 14, 2017 · f90e46b · f90e46b
1 parent f2b2511
commit f90e46b
Show file tree

Hide file tree

Showing 62 changed files with 42 additions and 181 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -8,7 +8,7 @@ jobs:
       - checkout
       - run:
           name: Install dependencies  # Install with sudo as tests not run as superuser in circleci/python
-          command: sudo pip install flake8 pytest six numpy sympy --upgrade
+          command: sudo pip install flake8 pytest numpy sympy --upgrade
       - run:
           name: Install FIAT
           command: pip install . --user

diff --git a/.gitignore b/.gitignore
@@ -2,7 +2,7 @@
 
 /build/
 /dist/
-/FIAT.egg-info/
+/fenics_fiat.egg-info/
 
 /.cache/
 /doc/sphinx/source/api-doc

diff --git a/.travis.yml b/.travis.yml
@@ -8,15 +8,12 @@ notifications:
     template: "%{repository}#%{build_number} (%{branch} - %{commit} : %{author}): %{message} | %{build_url}"
 language: python
 python:
-  - "2.7"
   - "3.4"
 
 before_install:
   - pip install --upgrade pip
   - pip install flake8
-  - pip install flake8-future-import
   - pip install pytest
-  - pip install six
 
 install:
   - pip install .

diff --git a/FIAT/P0.py b/FIAT/P0.py
@@ -21,8 +21,6 @@
 # This work is partially supported by the US Department of Energy
 # under award number DE-FG02-04ER25650
 
-from __future__ import absolute_import, print_function, division
-
 from FIAT import dual_set, functional, polynomial_set, finite_element
 import numpy
 

diff --git a/FIAT/__init__.py b/FIAT/__init__.py
@@ -2,8 +2,6 @@
 evaluating arbitrary order Lagrange and many other elements.
 Simplices in one, two, and three dimensions are supported."""
 
-from __future__ import absolute_import, print_function, division
-
 import pkg_resources
 
 # Import finite element classes

diff --git a/FIAT/argyris.py b/FIAT/argyris.py
@@ -15,8 +15,6 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with FIAT. If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import absolute_import, print_function, division
-
 from FIAT import finite_element, polynomial_set, dual_set, functional
 from FIAT.reference_element import TRIANGLE
 

diff --git a/FIAT/brezzi_douglas_fortin_marini.py b/FIAT/brezzi_douglas_fortin_marini.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, print_function, division
-
 from FIAT import (finite_element, functional, dual_set,
                   polynomial_set, lagrange)
 

diff --git a/FIAT/brezzi_douglas_marini.py b/FIAT/brezzi_douglas_marini.py
@@ -16,8 +16,6 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with FIAT. If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import absolute_import, print_function, division
-
 from FIAT import (finite_element, quadrature, functional, dual_set,
                   polynomial_set, nedelec)
 

diff --git a/FIAT/bubble.py b/FIAT/bubble.py
@@ -16,8 +16,6 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with FIAT. If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import absolute_import, print_function, division
-
 from FIAT.lagrange import Lagrange
 from FIAT.restricted import RestrictedElement
 

diff --git a/FIAT/crouzeix_raviart.py b/FIAT/crouzeix_raviart.py
@@ -20,8 +20,6 @@
 #
 # Last changed: 2010-01-28
 
-from __future__ import absolute_import, print_function, division
-
 from FIAT import finite_element, polynomial_set, dual_set, functional
 
 

diff --git a/FIAT/discontinuous.py b/FIAT/discontinuous.py
@@ -15,8 +15,6 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with FIAT. If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import absolute_import, print_function, division
-
 from FIAT.finite_element import CiarletElement
 from FIAT.dual_set import DualSet
 

diff --git a/FIAT/discontinuous_lagrange.py b/FIAT/discontinuous_lagrange.py
@@ -16,8 +16,6 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with FIAT. If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import absolute_import, print_function, division
-
 from FIAT import finite_element, polynomial_set, dual_set, functional, P0
 
 

diff --git a/FIAT/discontinuous_raviart_thomas.py b/FIAT/discontinuous_raviart_thomas.py
@@ -17,8 +17,6 @@
 #
 # Modified by Jan Blechta 2014
 
-from __future__ import absolute_import, print_function, division
-
 from FIAT import dual_set, finite_element, functional
 from FIAT.raviart_thomas import RTSpace
 

diff --git a/FIAT/discontinuous_taylor.py b/FIAT/discontinuous_taylor.py
@@ -17,8 +17,6 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with FIAT. If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import absolute_import, print_function, division
-
 from FIAT import finite_element, polynomial_set, dual_set, functional, P0, quadrature
 from FIAT.polynomial_set import mis
 import numpy

diff --git a/FIAT/dual_set.py b/FIAT/dual_set.py
@@ -15,10 +15,7 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with FIAT. If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import absolute_import, print_function, division
-
 import numpy
-from six import iteritems
 
 
 class DualSet(object):
@@ -29,10 +26,10 @@ def __init__(self, nodes, ref_el, entity_ids):
 
         # Compute the nodes on the closure of each sub_entity.
         self.entity_closure_ids = {}
-        for dim, entities in iteritems(ref_el.sub_entities):
+        for dim, entities in ref_el.sub_entities.items():
             self.entity_closure_ids[dim] = {}
 
-            for e, sub_entities in iteritems(entities):
+            for e, sub_entities in entities.items():
                 ids = []
 
                 for d, se in sub_entities:

diff --git a/FIAT/enriched.py b/FIAT/enriched.py
@@ -15,8 +15,6 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with FIAT. If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import absolute_import, print_function, division
-
 from itertools import chain
 
 import numpy

diff --git a/FIAT/expansions.py b/FIAT/expansions.py
@@ -18,8 +18,6 @@
 and Sherwin.  These are parametrized over a reference element so as
 to allow users to get coordinates that they want."""
 
-from __future__ import absolute_import, print_function, division
-
 import numpy
 import math
 import sympy

diff --git a/FIAT/finite_element.py b/FIAT/finite_element.py
@@ -19,10 +19,7 @@
 # Modified by David A. Ham (david.ham@imperial.ac.uk), 2014
 # Modified by Thomas H. Gibson (t.gibson15@imperial.ac.uk), 2016
 
-from __future__ import absolute_import, print_function, division
-
 import numpy
-from six.moves import map
 
 from FIAT.polynomial_set import PolynomialSet
 from FIAT.quadrature_schemes import create_quadrature

diff --git a/FIAT/functional.py b/FIAT/functional.py
@@ -21,8 +21,6 @@
 # - a reference element domain
 # - type information
 
-from __future__ import absolute_import, print_function, division
-
 from collections import OrderedDict
 from itertools import chain
 import numpy

diff --git a/FIAT/gauss_legendre.py b/FIAT/gauss_legendre.py
@@ -17,7 +17,6 @@
 #
 # Written by David A. Ham (david.ham@imperial.ac.uk), 2015
 
-from __future__ import absolute_import, print_function, division
 from FIAT import finite_element, polynomial_set, dual_set, functional, quadrature
 from FIAT.reference_element import LINE
 

diff --git a/FIAT/gauss_lobatto_legendre.py b/FIAT/gauss_lobatto_legendre.py
@@ -17,8 +17,6 @@
 #
 # Written by David A. Ham (david.ham@imperial.ac.uk), 2015
 
-from __future__ import absolute_import, print_function, division
-
 from FIAT import finite_element, polynomial_set, dual_set, functional, quadrature
 from FIAT.reference_element import LINE
 

diff --git a/FIAT/hdiv_trace.py b/FIAT/hdiv_trace.py
@@ -15,10 +15,6 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with FIAT. If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import absolute_import, print_function, division
-from six import iteritems, itervalues
-from six.moves import range
-
 import numpy as np
 from FIAT.discontinuous_lagrange import DiscontinuousLagrange
 from FIAT.dual_set import DualSet
@@ -92,7 +88,7 @@ def __init__(self, ref_el, degree):
         dg_elements = {}
         entity_dofs = {}
         topology = ref_el.get_topology()
-        for top_dim, entities in iteritems(topology):
+        for top_dim, entities in topology.items():
             cell = ref_el.construct_subelement(top_dim)
             entity_dofs[top_dim] = {}
 
@@ -216,7 +212,7 @@ def tabulate(self, order, points, entity=None):
                 # Retrieve values by tabulating the DG element
                 element = self.dg_elements[facet_sd]
                 nf = element.space_dimension()
-                nonzerovals, = itervalues(element.tabulate(order, new_points))
+                nonzerovals, = element.tabulate(order, new_points).values()
                 indices = slice(nf * unique_facet, nf * (unique_facet + 1))
 
         else:
@@ -244,7 +240,7 @@ def tabulate(self, order, points, entity=None):
                     for i in range(num_facets):
                         # Found it! Grab insertion indices
                         if (facet_dim, i) == entity:
-                            nonzerovals, = itervalues(element.tabulate(0, points))
+                            nonzerovals, = element.tabulate(0, points).values()
                             indices = slice(offset, offset + nf)
 
                         offset += nf

diff --git a/FIAT/hdivcurl.py b/FIAT/hdivcurl.py
@@ -15,8 +15,6 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with FIAT. If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import absolute_import, print_function, division
-
 import numpy
 import types
 from FIAT.tensor_product import TensorProductElement

diff --git a/FIAT/hellan_herrmann_johnson.py b/FIAT/hellan_herrmann_johnson.py
@@ -18,8 +18,6 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with FIAT. If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import absolute_import, print_function, division
-
 from FIAT.finite_element import CiarletElement
 from FIAT.dual_set import DualSet
 from FIAT.polynomial_set import ONSymTensorPolynomialSet

diff --git a/FIAT/hermite.py b/FIAT/hermite.py
@@ -16,8 +16,6 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with FIAT. If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import absolute_import, print_function, division
-
 from FIAT import finite_element, polynomial_set, dual_set, functional
 
 

diff --git a/FIAT/jacobi.py b/FIAT/jacobi.py
@@ -20,8 +20,6 @@
 functions over the simplices and in defining quadrature
 rules over each domain."""
 
-from __future__ import absolute_import, print_function, division
-
 import numpy
 
 

diff --git a/FIAT/lagrange.py b/FIAT/lagrange.py
@@ -16,8 +16,6 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with FIAT. If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import absolute_import, print_function, division
-
 from FIAT import finite_element, polynomial_set, dual_set, functional
 
 

diff --git a/FIAT/mixed.py b/FIAT/mixed.py
@@ -17,10 +17,6 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with FIAT. If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import absolute_import, print_function, division
-from six import iteritems
-from six.moves import map
-
 import numpy
 
 from operator import add
@@ -90,7 +86,7 @@ def tabulate(self, order, points, entity=None):
         for i, e in enumerate(self.elements()):
             table = e.tabulate(order, points, entity)
 
-            for d, tab in iteritems(table):
+            for d, tab in table.items():
                 try:
                     arr = output[d]
                 except KeyError:
@@ -114,11 +110,11 @@ def concatenate_entity_dofs(ref_el, elements):
     entity_dof containing the information for the concatenated DoFs of
     all the elements."""
     entity_dofs = {dim: {i: [] for i in entities}
-                   for dim, entities in iteritems(ref_el.get_topology())}
+                   for dim, entities in ref_el.get_topology().items()}
     offsets = numpy.cumsum([0] + list(e.space_dimension()
                                       for e in elements), dtype=int)
     for i, d in enumerate(e.entity_dofs() for e in elements):
-        for dim, dofs in iteritems(d):
-            for ent, off in iteritems(dofs):
+        for dim, dofs in d.items():
+            for ent, off in dofs.items():
                 entity_dofs[dim][ent] += list(map(partial(add, offsets[i]), off))
     return entity_dofs
diff --git a/FIAT/morley.py b/FIAT/morley.py
@@ -15,8 +15,6 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with FIAT. If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import absolute_import, print_function, division
-
 from FIAT import finite_element, polynomial_set, dual_set, functional
 from FIAT.reference_element import TRIANGLE
 

diff --git a/FIAT/nedelec.py b/FIAT/nedelec.py
@@ -16,8 +16,6 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with FIAT. If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import absolute_import, print_function, division
-
 from FIAT import (polynomial_set, expansions, quadrature, dual_set,
                   finite_element, functional)
 from itertools import chain

diff --git a/FIAT/nedelec_second_kind.py b/FIAT/nedelec_second_kind.py
@@ -16,8 +16,6 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with FIAT. If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import absolute_import, print_function, division
-
 import numpy
 
 from FIAT.finite_element import CiarletElement

diff --git a/FIAT/nodal_enriched.py b/FIAT/nodal_enriched.py
@@ -15,8 +15,6 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with FIAT. If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import absolute_import, print_function, division
-
 import numpy as np
 
 from FIAT.polynomial_set import PolynomialSet

diff --git a/FIAT/orthopoly.py b/FIAT/orthopoly.py
@@ -29,10 +29,8 @@
     Modified by David A. Ham (david.ham@imperial.ac.uk), 2016
 """
 
-from __future__ import absolute_import, print_function, division
-
 import numpy as np
-from six.moves import xrange, reduce
+from functools import reduce
 from math import gamma
 
 
@@ -197,7 +195,7 @@ def polyval(alpha, beta, x):
     P[:, 0] = 1
     P[:, 1] = (x - alpha[0]) * P[:, 0]
 
-    for k in xrange(1, N):
+    for k in range(1, N):
         P[:, k + 1] = (x - alpha[k]) * P[:, k] - beta[k] * P[:, k - 1]
 
     return P
@@ -225,7 +223,7 @@ def jacobi(N, a, b, x, NOPT=1):
         P[:, 1] = 0.5 * (a - b + (apb + 2) * x)
 
     if N > 1:
-        for k in xrange(2, N + 1):
+        for k in range(2, N + 1):
             k2 = 2 * k
             g = k2 + apb
             g1 = g - 1