Python 3

Jenkinsfile

@@ -3,10 +3,10 @@ pipeline {
     label 'linux'
   }
   environment {
-    TEST_FILES = "tests/extrusion/test_facet_integrals_2D.py tests/extrusion/test_mixed_bcs.py tests/extrusion/test_steady_advection_2D_extr.py tests/multigrid/test_two_poisson_gmg.py tests/output tests/regression/test_facet_orientation.py tests/regression/test_matrix_free.py tests/regression/test_nested_fieldsplit_solves.py tests/regression/test_nullspace.py tests/regression/test_point_eval_api.py tests/regression/test_point_eval_cells.py tests/regression/test_point_eval_fs.py tests/regression/test_solving_interface.py tests/regression/test_steady_advection_2D.py"
     PATH = "/usr/local/bin:/usr/bin:/bin"
     CC = "mpicc"
     FIREDRAKE_CI_TESTS = "1"
+    PYTHONHASHSEED = "12453221"
   }
   stages {
     stage('Clean') {
@@ -21,9 +21,7 @@ pipeline {
         sh 'mkdir tmp'
         dir('tmp') {
           timestamps {
-            sh 'pip install virtualenv'
-            sh '../scripts/firedrake-install --disable-ssh --minimal-petsc ${SLEPC} --adjoint --slope --install thetis --install gusto ${PACKAGE_MANAGER}'
-            sh '$HOME/.local/bin/virtualenv --relocatable firedrake'
+            sh '../scripts/firedrake-install --disable-ssh --minimal-petsc ${SLEPC} --adjoint --slope --install thetis --install gusto ${PACKAGE_MANAGER} || (cat firedrake-install.log && /bin/false)'
           }
         }
       }
@@ -34,7 +32,7 @@ pipeline {
           timestamps {
             sh '''
 . ./firedrake/bin/activate
-pip install flake8
+python -m pip install flake8
 cd firedrake/src/firedrake
 make lint
 '''
@@ -50,11 +48,11 @@ make lint
 . ./firedrake/bin/activate
 export PYOP2_CACHE_DIR=${VIRTUAL_ENV}/pyop2_cache
 export FIREDRAKE_TSFC_KERNEL_CACHE_DIR=${VIRTUAL_ENV}/tsfc_cache
-firedrake-clean
-pip install pytest-cov pytest-xdist
-pip list
+python $(which firedrake-clean)
+python -m pip install pytest-cov pytest-xdist
+python -m pip list
 cd firedrake/src/firedrake
-py.test -n 4 --cov firedrake -v tests
+python -m pytest -n 4 --cov firedrake -v tests
 '''
           }
         }
@@ -68,7 +66,7 @@ py.test -n 4 --cov firedrake -v tests
 . ./firedrake/bin/activate
 export PYOP2_CACHE_DIR=${VIRTUAL_ENV}/pyop2_cache
 export FIREDRAKE_TSFC_KERNEL_CACHE_DIR=${VIRTUAL_ENV}/tsfc_cache
-cd firedrake/src/dolfin-adjoint; py.test -n 4 -v tests_firedrake
+cd firedrake/src/dolfin-adjoint; python -m pytest -n 4 -v tests_firedrake
 '''
           }
         }

Makefile

@@ -6,11 +6,11 @@ modules:
 
 lint:
 	@echo "    Linting firedrake codebase"
-	@flake8 firedrake
+	@python -m flake8 firedrake
 	@echo "    Linting firedrake test suite"
-	@flake8 tests
+	@python -m flake8 tests
 	@echo "    Linting firedrake scripts"
-	@flake8 scripts --filename=*
+	@python -m flake8 scripts --filename=*
 
 clean:
 	@echo "    Cleaning extension modules"
@@ -42,22 +42,22 @@ endif
 
 test_regression: modules
 	@echo "    Running non-extruded regression tests"
-	@py.test tests/regression $(PYTEST_ARGS)
+	@python -m pytest tests/regression $(PYTEST_ARGS)
 
 test_extrusion: modules
 	@echo "    Running extruded regression tests"
-	@py.test tests/extrusion $(PYTEST_ARGS)
+	@python -m pytest tests/extrusion $(PYTEST_ARGS)
 
 test_demos: modules
 	@echo "    Running test of demos"
-	@py.test tests/demos $(PYTEST_ARGS)
+	@python -m pytest tests/demos $(PYTEST_ARGS)
 
 test: modules
 	@echo "    Running all regression tests"
-	@py.test tests $(PYTEST_ARGS)
+	@python -m pytest tests $(PYTEST_ARGS)
 
 alltest: modules lint test
 
 shorttest: modules lint
 	@echo "    Running short regression tests"
-	@py.test --short tests $(PYTEST_ARGS)
+	@python -m pytest --short tests $(PYTEST_ARGS)

demos/DG_advection/DG_advection.py.rst

@@ -264,14 +264,14 @@ terminal. ::
 
       if step % 20 == 0:
           outfile.write(q)
-          print "t=", t
+          print("t=", t)
 
 Finally, we display the normalised :math:`L^2` error, by comparing to the
 initial condition. ::
 
   L2_err = sqrt(assemble((q - q_init)*(q - q_init)*dx))
   L2_init = sqrt(assemble(q_init*q_init*dx))
-  print L2_err/L2_init
+  print(L2_err/L2_init)
 
 This demo can be found as a script in
 `DG_advection.py <DG_advection.py>`__.

demos/benney_luke/benney_luke.py.rst

@@ -189,7 +189,7 @@ from piecewise quadratic functions to piecewise linears::
 We are now ready to enter the main time iteration loop::
 
   while t < T:
-        print t, abs((E-E0)/E0)
+        print(t, abs((E-E0)/E0))
         t += dt
 
         t_.assign(t)

demos/camassa-holm/camassaholm.py.rst

@@ -191,7 +191,7 @@ The energy can be computed and checked. ::
 
   #
      E = assemble((u0*u0 + alphasq*u0.dx(0)*u0.dx(0))*dx)
-     print "t = ", t, "E = ", E
+     print("t = ", t, "E = ", E)
 
 To implement the timestepping algorithm, we just call the solver, and assign
 ``w1`` to ``w0``. ::

demos/eigenvalues_QG_basinmodes/qgbasinmodes.py.rst

@@ -219,7 +219,7 @@ and we gather the final eigenfunctions ::
 We can now list and show plots for the eigenvalues and eigenfunctions
 that were found. ::
 
-   print "Leading eigenvalue is:", lam
+   print("Leading eigenvalue is:", lam)
 
    try:
        from matplotlib import pyplot

demos/extruded_shallow_water/test_extrusion_lsw.py

@@ -73,8 +73,8 @@
     p_test = TestFunction(Xplot)
     solve(p_trial * p_test * dx == p_0 * p_test * dx, p_plot)
     file << p_plot, t
-    print t
+    print(t)
 
 E_1 = assemble(0.5 * p_0 * p_0 * dx + 0.5 * dot(u_0, u_0) * dx)
-print 'Initial energy', E_0
-print 'Final energy', E_1
+print('Initial energy', E_0)
+print('Final energy', E_1)

demos/helmholtz/helmholtz.py.rst

@@ -129,6 +129,6 @@ Alternatively, since we have an analytic solution, we can check the
 :math:`L_2` norm of the error in the solution::
 
   f.interpolate(cos(x*pi*2)*cos(y*pi*2))
-  print sqrt(assemble(dot(u - f, u - f) * dx))
+  print(sqrt(assemble(dot(u - f, u - f) * dx)))
 
 A python script version of this demo can be found `here <helmholtz.py>`__.

demos/linear_fluid_structure_interaction/linear_fluid_structure_interaction.py.rst

@@ -4,10 +4,13 @@ Linear mixed fluid-structure interaction system
 
 .. rst-class:: emphasis
 
-This tutorial is aimed to demonstrate the use of subdomain functionality and show how to describe a system consisting of multiple materials in Firedrake.
+    This tutorial demonstrates the use of subdomain
+    functionality and show how to describe a system consisting of
+    multiple materials in Firedrake.
 
-The tutorial was contributed by `Tomasz Salwa <mailto:[email protected]>`__
-and `Onno Bokhove <mailto:[email protected]>`__.
+    The tutorial was contributed by `Tomasz Salwa
+    <mailto:[email protected]>`__ and `Onno Bokhove
+    <mailto:[email protected]>`__.
 
 The model considered consists of fluid with a free surface and an elastic solid. We will be using interchangeably notions of fluid/water and structure/solid/beam. For simplicity (and speed of computation) we consider a model in 2D, however it can be easily generalised to 3D. The starting point is the linearised version (domain is fixed) of the fully nonlinear variational principle. In non-dimensional units:
 
@@ -275,7 +278,7 @@ In the end, we proceed with the actual computation loop::
 
     while t <= t_end + dt:
         t += dt
-        print 'time = ', t * T
+        print('time = ', t * T)
         # symplectic Euler scheme
         LVS_phi_f.solve()
         LVS_U_phi.solve()
@@ -304,7 +307,14 @@ A python script version of this demo can be found `here <linear_fluid_structure_
 
 The mesh file is `here <L_domain.msh>`__. It can be generated with `gmsh <http://gmsh.info/>`__ from `this file <L_domain.geo>`__ with a command: gmsh -2 L_domain.geo.
 
-The work is based on the article "Variational modelling of wave-structure interactions with an offshore wind-turbine mast" by Tomasz Salwa, Onno Bokhove and Mark Kelmanson :cite:`Salwa:2017`. The authors gratefully acknowledge funding from European Commission, Marie Curie Actions - Initial Training Networks (ITN), project number 607596.
+.. rst-class:: emphasis
+
+   The work is based on the article "Variational modelling of
+   wave-structure interactions with an offshore wind-turbine mast" by
+   Tomasz Salwa, Onno Bokhove and Mark Kelmanson
+   :cite:`Salwa:2017`. The authors gratefully acknowledge funding from
+   European Commission, Marie Curie Actions - Initial Training
+   Networks (ITN), project number 607596.
 
 
 .. rubric:: References