Merge branch 'master' into pbrubeck/fix/restricted-dmhooks

Author: pbrubeck

pyop2/compilation.py

@@ -427,7 +427,6 @@ def load(code, extension, cppargs=(), ldargs=(), comm=None):
     :kwarg comm: Optional communicator to compile the code on (only
         rank 0 compiles code) (defaults to pyop2.mpi.COMM_WORLD).
     """
-    global _compiler
     if _compiler:
         # Use the global compiler if it has been set
         compiler = _compiler

tests/firedrake/multigrid/test_custom_transfer.py

@@ -70,7 +70,6 @@ def test_repeated_custom_transfer_options():
     solver = LinearVariationalSolver(problem, solver_parameters=options)
     solver.solve()
 
-    global optcount
     assert optcount == 1
 
     uh.assign(0)