Python 3.12 in tsfc CI workflow (FEniCS#328)

Fix action space check ruff unsafe ruff symmetric space check fix import conflict Fix action space check (FEniCS#331) * Fix action space check * ruff * unsafe ruff * symmetric space check * fix import conflict remove apply_default_restrictions() (FEniCS#329) * ruff==0.8.0 * remove apply_default_restrictions() --------- Co-authored-by: Matthew Scroggs <[email protected]>
firedrakeproject · Dec 18, 2024 · a187e75 · a187e75
1 parent 6432a72
commit a187e75
Show file tree

Hide file tree

Showing 23 changed files with 309 additions and 354 deletions.
diff --git a/.github/workflows/tsfc-tests.yml b/.github/workflows/tsfc-tests.yml
@@ -21,7 +21,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: 3.9
+          python-version: 3.12
 
       - name: Install UFL
         run: |

diff --git a/test/test_apply_restrictions.py b/test/test_apply_restrictions.py
@@ -11,7 +11,7 @@
     i,
     triangle,
 )
-from ufl.algorithms.apply_restrictions import apply_default_restrictions, apply_restrictions
+from ufl.algorithms.apply_restrictions import apply_restrictions
 from ufl.algorithms.renumbering import renumber_indices
 from ufl.finiteelement import FiniteElement
 from ufl.pullback import identity_pullback
@@ -54,7 +54,7 @@ def test_apply_restrictions():
     assert apply_restrictions((grad(f) + grad(g))("-")) == (grad(f)("-") + grad(g)("-"))
 
     # x is the same from both sides but computed from one of them
-    assert apply_default_restrictions(x) == x("+")
+    assert apply_restrictions(x) == x("+")
 
     # n on a linear mesh is opposite pointing from the other side
     assert apply_restrictions(n("+")) == n("+")

diff --git a/ufl/__init__.py b/ufl/__init__.py
@@ -435,208 +435,208 @@
 from ufl.utils.sequences import product
 
 __all__ = [
-    "product",
-    "as_cell",
-    "AbstractCell",
-    "Cell",
-    "TensorProductCell",
-    "AbstractDomain",
-    "Mesh",
-    "MeshView",
-    "L2",
     "H1",
     "H2",
-    "HCurl",
-    "HDiv",
-    "HInf",
-    "HEin",
-    "HDivDiv",
-    "HCurlDiv",
-    "identity_pullback",
-    "l2_piola",
-    "contravariant_piola",
-    "covariant_piola",
-    "double_contravariant_piola",
-    "double_covariant_piola",
-    "covariant_contravariant_piola",
-    "l2_piola",
-    "MixedPullback",
-    "SymmetricPullback",
+    "L2",
+    "AbstractCell",
+    "AbstractDomain",
+    "AbstractFiniteElement",
     "AbstractPullback",
-    "SpatialCoordinate",
-    "CellVolume",
+    "Action",
+    "Adjoint",
+    "And",
+    "Argument",
+    "Arguments",
+    "BaseForm",
+    "Cell",
     "CellDiameter",
+    "CellNormal",
+    "CellVolume",
     "Circumradius",
-    "MinCellEdgeLength",
-    "MaxCellEdgeLength",
+    "Coargument",
+    "Coefficient",
+    "Coefficients",
+    "Cofunction",
+    "Constant",
+    "Dn",
+    "Dx",
+    "ExternalOperator",
     "FacetArea",
-    "MinFacetEdgeLength",
-    "MaxFacetEdgeLength",
     "FacetNormal",
-    "CellNormal",
+    "Form",
+    "FormSum",
+    "FunctionSpace",
+    "HCurl",
+    "HCurlDiv",
+    "HDiv",
+    "HDivDiv",
+    "HEin",
+    "HInf",
+    "Identity",
+    "Index",
+    "Integral",
+    "Interpolate",
     "Jacobian",
     "JacobianDeterminant",
     "JacobianInverse",
-    "AbstractFiniteElement",
-    "FunctionSpace",
+    "Matrix",
+    "MaxCellEdgeLength",
+    "MaxFacetEdgeLength",
+    "Measure",
+    "Mesh",
+    "MeshView",
+    "MinCellEdgeLength",
+    "MinFacetEdgeLength",
     "MixedFunctionSpace",
-    "Argument",
-    "Coargument",
+    "MixedPullback",
+    "Not",
+    "Or",
+    "PermutationSymbol",
+    "SpatialCoordinate",
+    "SymmetricPullback",
+    "TensorConstant",
+    "TensorProductCell",
     "TestFunction",
-    "TrialFunction",
-    "Arguments",
     "TestFunctions",
+    "TrialFunction",
     "TrialFunctions",
-    "Coefficient",
-    "Cofunction",
-    "Coefficients",
-    "Matrix",
-    "Adjoint",
-    "Action",
-    "Interpolate",
-    "interpolate",
-    "ExternalOperator",
-    "Constant",
     "VectorConstant",
-    "TensorConstant",
-    "split",
-    "PermutationSymbol",
-    "Identity",
-    "zero",
-    "as_ufl",
-    "Index",
-    "indices",
+    "ZeroBaseForm",
+    "acos",
+    "action",
+    "adjoint",
+    "as_cell",
+    "as_matrix",
     "as_tensor",
+    "as_ufl",
     "as_vector",
-    "as_matrix",
-    "unit_vector",
-    "unit_vectors",
-    "unit_matrix",
-    "unit_matrices",
-    "rank",
-    "shape",
-    "conj",
-    "real",
-    "imag",
-    "outer",
-    "inner",
-    "dot",
-    "cross",
-    "perp",
-    "det",
-    "inv",
-    "cofac",
-    "transpose",
-    "tr",
-    "diag",
-    "diag_vector",
-    "dev",
-    "skew",
-    "sym",
-    "sqrt",
-    "exp",
-    "ln",
-    "erf",
-    "cos",
-    "sin",
-    "tan",
-    "acos",
     "asin",
     "atan",
     "atan2",
-    "cosh",
-    "sinh",
-    "tanh",
-    "bessel_J",
-    "bessel_Y",
+    "avg",
     "bessel_I",
+    "bessel_J",
     "bessel_K",
-    "eq",
-    "ne",
-    "le",
-    "ge",
-    "lt",
-    "gt",
-    "And",
-    "Or",
-    "Not",
+    "bessel_Y",
+    "cell_avg",
+    "cofac",
     "conditional",
-    "sign",
-    "max_value",
-    "min_value",
-    "variable",
-    "diff",
-    "Dx",
-    "grad",
-    "div",
+    "conj",
+    "contravariant_piola",
+    "cos",
+    "cosh",
+    "covariant_contravariant_piola",
+    "covariant_piola",
+    "cross",
     "curl",
-    "rot",
-    "nabla_grad",
-    "nabla_div",
-    "Dn",
-    "exterior_derivative",
-    "jump",
-    "avg",
-    "cell_avg",
-    "facet_avg",
-    "elem_mult",
-    "elem_div",
-    "elem_pow",
-    "elem_op",
-    "Form",
-    "BaseForm",
-    "FormSum",
-    "ZeroBaseForm",
-    "Integral",
-    "Measure",
-    "register_integral_type",
-    "integral_types",
     "custom_integral_types",
-    "replace",
-    "derivative",
-    "action",
-    "energy_norm",
-    "rhs",
-    "lhs",
-    "extract_blocks",
-    "system",
-    "functional",
-    "adjoint",
-    "sensitivity_rhs",
-    "dx",
-    "ds",
-    "dS",
-    "dP",
-    "dc",
     "dC",
-    "dO",
     "dI",
+    "dO",
+    "dP",
+    "dS",
+    "dS_h",
+    "dS_v",
     "dX",
+    "dc",
+    "derivative",
+    "det",
+    "dev",
+    "diag",
+    "diag_vector",
+    "diff",
+    "div",
+    "dot",
+    "double_contravariant_piola",
+    "double_covariant_piola",
+    "ds",
     "ds_b",
     "ds_t",
     "ds_tb",
     "ds_v",
-    "dS_h",
-    "dS_v",
-    "vertex",
-    "interval",
-    "triangle",
-    "tetrahedron",
-    "prism",
-    "pyramid",
-    "pentatope",
-    "tesseract",
-    "quadrilateral",
-    "hexahedron",
+    "dx",
+    "e",
+    "elem_div",
+    "elem_mult",
+    "elem_op",
+    "elem_pow",
+    "energy_norm",
+    "eq",
+    "erf",
+    "exp",
+    "exterior_derivative",
+    "extract_blocks",
     "facet",
+    "facet_avg",
+    "functional",
+    "ge",
+    "grad",
+    "gt",
+    "hexahedron",
     "i",
+    "identity_pullback",
+    "imag",
+    "indices",
+    "inner",
+    "integral_types",
+    "interpolate",
+    "interval",
+    "inv",
     "j",
+    "jump",
     "k",
     "l",
+    "l2_piola",
+    "l2_piola",
+    "le",
+    "lhs",
+    "ln",
+    "lt",
+    "max_value",
+    "min_value",
+    "nabla_div",
+    "nabla_grad",
+    "ne",
+    "outer",
     "p",
+    "pentatope",
+    "perp",
+    "pi",
+    "prism",
+    "product",
+    "pyramid",
     "q",
+    "quadrilateral",
     "r",
+    "rank",
+    "real",
+    "register_integral_type",
+    "replace",
+    "rhs",
+    "rot",
     "s",
-    "e",
-    "pi",
+    "sensitivity_rhs",
+    "shape",
+    "sign",
+    "sin",
+    "sinh",
+    "skew",
+    "split",
+    "sqrt",
+    "sym",
+    "system",
+    "tan",
+    "tanh",
+    "tesseract",
+    "tetrahedron",
+    "tr",
+    "transpose",
+    "triangle",
+    "unit_matrices",
+    "unit_matrix",
+    "unit_vector",
+    "unit_vectors",
+    "variable",
+    "vertex",
+    "zero",
 ]