Release Manager · Release Manager · commit c866092a43bd · 2024-12-20T22:46:03.000+01:00
gh-39139: Meson: install `__init__` files       As proposed in #39030 (comment). Namespace support is still not there for all tools (cython, pytest, ...), so it's a good idea to still distribute these `__init__.py` files for now until the ecosystem catches up. Also fixes failures of the meson workflow due to a missing python file. ### 📝 Checklist  - [ ] The title is concise and informative. - [ ] The description explains in detail what this PR is about. - [ ] I have linked a relevant issue or discussion. - [ ] I have created tests covering the changes. - [ ] I have updated the documentation and checked the documentation preview. ### ⌛ Dependencies    - #39140 URL: #39139 Reported by: Tobias Diez Reviewer(s): Dima Pasechnik
diff --git a/.github/workflows/ci-meson.yml b/.github/workflows/ci-meson.yml
@@ -47,7 +47,7 @@ jobs:
           key: ${{ runner.os }}-meson-${{ matrix.python }}
 
       - name: Setup Conda environment
-        uses: conda-incubator/setup-miniconda@v2
+        uses: conda-incubator/setup-miniconda@v3
         with:
           python-version: ${{ matrix.python }}
           miniforge-version: latest
diff --git a/src/sage/algebras/finite_dimensional_algebras/meson.build b/src/sage/algebras/finite_dimensional_algebras/meson.build
@@ -1,4 +1,5 @@
 py.install_sources(
+  '__init__.py',
   'all.py',
   'finite_dimensional_algebra.py',
   'finite_dimensional_algebra_element.pxd',
diff --git a/src/sage/algebras/fusion_rings/meson.build b/src/sage/algebras/fusion_rings/meson.build
@@ -1,4 +1,5 @@
 py.install_sources(
+  '__init__.py',
   'all.py',
   'f_matrix.py',
   'fast_parallel_fmats_methods.pxd',
diff --git a/src/sage/algebras/letterplace/meson.build b/src/sage/algebras/letterplace/meson.build
@@ -1,4 +1,5 @@
 py.install_sources(
+  '__init__.py',
   'all.py',
   'free_algebra_element_letterplace.pxd',
   'free_algebra_letterplace.pxd',
diff --git a/src/sage/algebras/lie_algebras/meson.build b/src/sage/algebras/lie_algebras/meson.build
@@ -1,4 +1,5 @@
 py.install_sources(
+  '__init__.py',
   'abelian.py',
   'affine_lie_algebra.py',
   'all.py',
diff --git a/src/sage/algebras/meson.build b/src/sage/algebras/meson.build
@@ -1,4 +1,5 @@
 py.install_sources(
+  '__init__.py',
   'affine_nil_temperley_lieb.py',
   'algebra.py',
   'all.py',
diff --git a/src/sage/algebras/quatalg/meson.build b/src/sage/algebras/quatalg/meson.build
@@ -1,4 +1,5 @@
 py.install_sources(
+  '__init__.py',
   'all.py',
   'quaternion_algebra.py',
   'quaternion_algebra_element.pxd',
diff --git a/src/sage/arith/meson.build b/src/sage/arith/meson.build
@@ -1,4 +1,5 @@
 py.install_sources(
+  '__init__.py',
   'all.py',
   'all__sagemath_objects.py',
   'constants.pxd',
diff --git a/src/sage/calculus/meson.build b/src/sage/calculus/meson.build
@@ -1,4 +1,5 @@
 py.install_sources(
+  '__init__.py',
   'all.py',
   'calculus.py',
   'desolvers.py',
diff --git a/src/sage/calculus/transforms/meson.build b/src/sage/calculus/transforms/meson.build
@@ -1,4 +1,5 @@
 py.install_sources(
+  '__init__.py',
   'all.py',
   'dft.py',
   'dwt.pxd',
diff --git a/src/sage/categories/examples/meson.build b/src/sage/categories/examples/meson.build
@@ -1,4 +1,5 @@
 py.install_sources(
+  '__init__.py',
   'algebras_with_basis.py',
   'all.py',
   'commutative_additive_monoids.py',
diff --git a/src/sage/categories/meson.build b/src/sage/categories/meson.build
@@ -1,4 +1,5 @@
 py.install_sources(
+  '__init__.py',
   'action.pxd',
   'additive_groups.py',
   'additive_magmas.py',
diff --git a/src/sage/coding/codecan/meson.build b/src/sage/coding/codecan/meson.build
@@ -1,4 +1,9 @@
-py.install_sources('all.py', 'codecan.pxd', subdir: 'sage/coding/codecan')
+py.install_sources(
+  '__init__.py',
+  'all.py',
+  'codecan.pxd',
+  subdir: 'sage/coding/codecan',
+)
 
 extension_data = {
   'autgroup_can_label' : files('autgroup_can_label.pyx'),
diff --git a/src/sage/coding/meson.build b/src/sage/coding/meson.build
@@ -1,4 +1,5 @@
 py.install_sources(
+  '__init__.py',
   'abstract_code.py',
   'ag_code.py',
   'all.py',
diff --git a/src/sage/combinat/crystals/meson.build b/src/sage/combinat/crystals/meson.build
@@ -1,4 +1,5 @@
 py.install_sources(
+  '__init__.py',
   'affine.py',
   'affine_factorization.py',
   'affinization.py',
diff --git a/src/sage/combinat/designs/meson.build b/src/sage/combinat/designs/meson.build
@@ -1,5 +1,6 @@
 py.install_sources(
   'MOLS_handbook_data.py',
+  '__init__.py',
   'all.py',
   'bibd.py',
   'block_design.py',
diff --git a/src/sage/combinat/matrices/meson.build b/src/sage/combinat/matrices/meson.build
@@ -1,4 +1,5 @@
 py.install_sources(
+  '__init__.py',
   'all.py',
   'dlxcpp.py',
   'hadamard_matrix.py',
diff --git a/src/sage/combinat/meson.build b/src/sage/combinat/meson.build
@@ -1,5 +1,6 @@
 py.install_sources(
   'SJT.py',
+  '__init__.py',
   'abstract_tree.py',
   'affine_permutation.py',
   'algebraic_combinatorics.py',
diff --git a/src/sage/combinat/posets/meson.build b/src/sage/combinat/posets/meson.build
@@ -1,4 +1,5 @@
 py.install_sources(
+  '__init__.py',
   'all.py',
   'cartesian_product.py',
   'd_complete.py',
diff --git a/src/sage/combinat/rigged_configurations/meson.build b/src/sage/combinat/rigged_configurations/meson.build
@@ -1,4 +1,5 @@
 py.install_sources(
+  '__init__.py',
   'all.py',
   'bij_abstract_class.py',
   'bij_infinity.py',
diff --git a/src/sage/combinat/root_system/meson.build b/src/sage/combinat/root_system/meson.build
@@ -1,4 +1,5 @@
 py.install_sources(
+  '__init__.py',
   'all.py',
   'ambient_space.py',
   'associahedron.py',
diff --git a/src/sage/combinat/words/meson.build b/src/sage/combinat/words/meson.build
@@ -1,4 +1,5 @@
 py.install_sources(
+  '__init__.py',
   'abstract_word.py',
   'all.py',
   'alphabet.py',
diff --git a/src/sage/data_structures/meson.build b/src/sage/data_structures/meson.build
@@ -1,4 +1,5 @@
 py.install_sources(
+  '__init__.py',
   'all.py',
   'binary_matrix.pxd',
   'binary_search.pxd',
diff --git a/src/sage/dynamics/arithmetic_dynamics/meson.build b/src/sage/dynamics/arithmetic_dynamics/meson.build
@@ -1,4 +1,5 @@
 py.install_sources(
+  '__init__.py',
   'affine_ds.py',
   'all.py',
   'berkovich_ds.py',
diff --git a/src/sage/dynamics/complex_dynamics/meson.build b/src/sage/dynamics/complex_dynamics/meson.build
@@ -1,4 +1,5 @@
 py.install_sources(
+  '__init__.py',
   'all.py',
   'mandel_julia.py',
   subdir: 'sage/dynamics/complex_dynamics',
diff --git a/src/sage/dynamics/meson.build b/src/sage/dynamics/meson.build
@@ -1,4 +1,5 @@
 py.install_sources(
+  '__init__.py',
   'all.py',
   'finite_dynamical_system.py',
   'finite_dynamical_system_catalog.py',
diff --git a/src/sage/ext/meson.build b/src/sage/ext/meson.build
@@ -1,4 +1,5 @@
 py.install_sources(
+  '__init__.py',
   'all__sagemath_objects.py',
   'ccobject.h',
   'cplusplus.pxd',
diff --git a/src/sage/functions/meson.build b/src/sage/functions/meson.build
@@ -1,4 +1,5 @@
 py.install_sources(
+  '__init__.py',
   'airy.py',
   'all.py',
   'bessel.py',
diff --git a/src/sage/games/meson.build b/src/sage/games/meson.build
@@ -1,4 +1,5 @@
 py.install_sources(
+  '__init__.py',
   'all.py',
   'hexad.py',
   'quantumino.py',
diff --git a/src/sage/geometry/meson.build b/src/sage/geometry/meson.build
@@ -1,4 +1,5 @@
 py.install_sources(
+  '__init__.py',
   'all.py',
   'cone.py',
   'cone_catalog.py',
diff --git a/src/sage/geometry/polyhedron/combinatorial_polyhedron/meson.build b/src/sage/geometry/polyhedron/combinatorial_polyhedron/meson.build
@@ -1,4 +1,5 @@
 py.install_sources(
+  '__init__.py',
   'all.py',
   'base.pxd',
   'combinatorial_face.pxd',
diff --git a/src/sage/geometry/polyhedron/meson.build b/src/sage/geometry/polyhedron/meson.build
@@ -1,4 +1,5 @@
 py.install_sources(
+  '__init__.py',
   'all.py',
   'backend_cdd.py',
   'backend_cdd_rdf.py',
diff --git a/src/sage/geometry/triangulation/meson.build b/src/sage/geometry/triangulation/meson.build
@@ -1,4 +1,5 @@
 py.install_sources(
+  '__init__.py',
   'all.py',
   'data.pxd',
   'element.py',
diff --git a/src/sage/graphs/base/meson.build b/src/sage/graphs/base/meson.build
@@ -1,4 +1,5 @@
 py.install_sources(
+  '__init__.py',
   'all.py',
   'boost_graph.pxd',
   'c_graph.pxd',
diff --git a/src/sage/graphs/generators/meson.build b/src/sage/graphs/generators/meson.build
@@ -1,4 +1,5 @@
 py.install_sources(
+  '__init__.py',
   'all.py',
   'basic.py',
   'chessboard.py',
diff --git a/src/sage/graphs/graph_decompositions/meson.build b/src/sage/graphs/graph_decompositions/meson.build
@@ -8,6 +8,7 @@ endif
 rw = cc.find_library('rw')
 
 py.install_sources(
+  '__init__.py',
   'all.py',
   'all__sagemath_tdlib.py',
   'fast_digraph.pxd',
diff --git a/src/sage/graphs/meson.build b/src/sage/graphs/meson.build
@@ -11,6 +11,7 @@ cliquer = cc.find_library('cliquer')
 planarity = cc.find_library('planarity')
 
 py.install_sources(
+  '__init__.py',
   'all.py',
   'all__sagemath_bliss.py',
   'all__sagemath_mcqd.py',
diff --git a/src/sage/groups/matrix_gps/meson.build b/src/sage/groups/matrix_gps/meson.build
@@ -1,4 +1,5 @@
 py.install_sources(
+  '__init__.py',
   'all.py',
   'binary_dihedral.py',
   'catalog.py',
diff --git a/src/sage/groups/meson.build b/src/sage/groups/meson.build
@@ -1,4 +1,5 @@
 py.install_sources(
+  '__init__.py',
   'all.py',
   'artin.py',
   'braid.py',
diff --git a/src/sage/groups/perm_gps/meson.build b/src/sage/groups/perm_gps/meson.build
@@ -1,4 +1,5 @@
 py.install_sources(
+  '__init__.py',
   'all.py',
   'constructor.py',
   'cubegroup.py',
diff --git a/src/sage/groups/perm_gps/partn_ref/meson.build b/src/sage/groups/perm_gps/partn_ref/meson.build
@@ -1,4 +1,5 @@
 py.install_sources(
+  '__init__.py',
   'all.py',
   'automorphism_group_canonical_label.pxd',
   'canonical_augmentation.pxd',
diff --git a/src/sage/groups/perm_gps/partn_ref2/meson.build b/src/sage/groups/perm_gps/partn_ref2/meson.build
@@ -1,4 +1,5 @@
 py.install_sources(
+  '__init__.py',
   'all.py',
   'refinement_generic.pxd',
   subdir: 'sage/groups/perm_gps/partn_ref2',
diff --git a/src/sage/groups/semimonomial_transformations/meson.build b/src/sage/groups/semimonomial_transformations/meson.build
@@ -1,4 +1,5 @@
 py.install_sources(
+  '__init__.py',
   'all.py',
   'semimonomial_transformation.pxd',
   'semimonomial_transformation_group.py',
diff --git a/src/sage/interacts/meson.build b/src/sage/interacts/meson.build
@@ -1,4 +1,5 @@
 py.install_sources(
+  '__init__.py',
   'algebra.py',
   'all.py',
   'calculus.py',
diff --git a/src/sage/interfaces/meson.build b/src/sage/interfaces/meson.build
@@ -1,4 +1,5 @@
 py.install_sources(
+  '__init__.py',
   'abc.py',
   'all.py',
   'all__sagemath_polyhedra.py',
diff --git a/src/sage/lfunctions/meson.build b/src/sage/lfunctions/meson.build
@@ -1,4 +1,5 @@
 py.install_sources(
+  '__init__.py',
   'all.py',
   'dokchitser.py',
   'lcalc.py',
diff --git a/src/sage/libs/gap/meson.build b/src/sage/libs/gap/meson.build
@@ -1,4 +1,5 @@
 py.install_sources(
+  '__init__.py',
   'all.py',
   'all_documented_functions.py',
   'assigned_names.py',
diff --git a/src/sage/libs/meson.build b/src/sage/libs/meson.build
@@ -6,6 +6,7 @@ gc = cc.find_library('gc')
 homfly = cc.find_library('homfly', has_headers: ['homfly.h'])
 
 py.install_sources(
+  '__init__.py',
   'all.py',
   'all__sagemath_coxeter3.py',
   'all__sagemath_meataxe.py',
diff --git a/src/sage/matrix/meson.build b/src/sage/matrix/meson.build
@@ -2,6 +2,7 @@ iml = cc.find_library('iml')
 
 
 py.install_sources(
+  '__init__.py',
   'action.pxd',
   'all.py',
   'all__sagemath_meataxe.py',
diff --git a/src/sage/matroids/meson.build b/src/sage/matroids/meson.build
@@ -1,4 +1,5 @@
 py.install_sources(
+  '__init__.py',
   'advanced.py',
   'all.py',
   'basis_exchange_matroid.pxd',
diff --git a/src/sage/meson.build b/src/sage/meson.build
@@ -86,6 +86,7 @@ foreach package : no_processing
 endforeach
 
 py.install_sources(
+  '__init__.py',
   'all.py',
   'all__sagemath_bliss.py',
   'all__sagemath_categories.py',
diff --git a/src/sage/misc/cython.py b/src/sage/misc/cython.py
@@ -226,17 +226,6 @@ def cython(filename, verbose=0, compile_message=False,
         ....: from sage.misc.cachefunc cimport cache_key
         ....: ''')
 
-    In Cython 0.29.33 using `from PACKAGE cimport MODULE` is broken
-    when `PACKAGE` is a namespace package, see :issue:`35322`::
-
-        sage: cython('''
-        ....: from sage.misc cimport cachefunc
-        ....: ''')
-        Traceback (most recent call last):
-        ...
-        RuntimeError: Error compiling Cython file:
-        ...
-        ...: 'sage/misc.pxd' not found
     """
     if not filename.endswith('pyx'):
         print("Warning: file (={}) should have extension .pyx".format(filename), file=sys.stderr)
diff --git a/src/sage/misc/meson.build b/src/sage/misc/meson.build
@@ -1,4 +1,5 @@
 py.install_sources(
+  '__init__.py',
   'abstract_method.py',
   'all.py',
   'all__sagemath_environment.py',
diff --git a/src/sage/modular/arithgroup/meson.build b/src/sage/modular/arithgroup/meson.build
@@ -1,4 +1,5 @@
 py.install_sources(
+  '__init__.py',
   'all.py',
   'arithgroup_generic.py',
   'arithgroup_perm.py',
diff --git a/src/sage/modular/meson.build b/src/sage/modular/meson.build
@@ -1,4 +1,5 @@
 py.install_sources(
+  '__init__.py',
   'all.py',
   'buzzard.py',
   'congroup.py',
diff --git a/src/sage/modular/modform/meson.build b/src/sage/modular/modform/meson.build
@@ -1,4 +1,5 @@
 py.install_sources(
+  '__init__.py',
   'all.py',
   'ambient.py',
   'ambient_R.py',
diff --git a/src/sage/modular/modsym/meson.build b/src/sage/modular/modsym/meson.build
@@ -1,4 +1,5 @@
 py.install_sources(
+  '__init__.py',
   'all.py',
   'ambient.py',
   'apply.pxd',
diff --git a/src/sage/modular/pollack_stevens/meson.build b/src/sage/modular/pollack_stevens/meson.build
@@ -1,4 +1,5 @@
 py.install_sources(
+  '__init__.py',
   'all.py',
   'dist.pxd',
   'distributions.py',
diff --git a/src/sage/modules/meson.build b/src/sage/modules/meson.build
@@ -1,4 +1,5 @@
 py.install_sources(
+  '__init__.py',
   'all.py',
   'complex_double_vector.py',
   'diamond_cutting.py',
@@ -16,6 +17,7 @@ py.install_sources(
   'module.pxd',
   'module_functors.py',
   'multi_filtered_vector_space.py',
+  'numpy_util.pxd',
   'quotient_module.py',
   'real_double_vector.py',
   'submodule.py',
diff --git a/src/sage/modules/with_basis/meson.build b/src/sage/modules/with_basis/meson.build
@@ -1,4 +1,5 @@
 py.install_sources(
+  '__init__.py',
   'all.py',
   'cell_module.py',
   'indexed_element.pxd',
diff --git a/src/sage/monoids/meson.build b/src/sage/monoids/meson.build
diff --git a/src/sage/numerical/backends/meson.build b/src/sage/numerical/backends/meson.build
diff --git a/src/sage/numerical/meson.build b/src/sage/numerical/meson.build
diff --git a/src/sage/plot/meson.build b/src/sage/plot/meson.build
diff --git a/src/sage/plot/plot3d/meson.build b/src/sage/plot/plot3d/meson.build
diff --git a/src/sage/probability/meson.build b/src/sage/probability/meson.build
diff --git a/src/sage/quadratic_forms/meson.build b/src/sage/quadratic_forms/meson.build
diff --git a/src/sage/quivers/meson.build b/src/sage/quivers/meson.build
diff --git a/src/sage/rings/convert/meson.build b/src/sage/rings/convert/meson.build
diff --git a/src/sage/rings/finite_rings/meson.build b/src/sage/rings/finite_rings/meson.build
diff --git a/src/sage/rings/function_field/meson.build b/src/sage/rings/function_field/meson.build
diff --git a/src/sage/rings/meson.build b/src/sage/rings/meson.build
diff --git a/src/sage/rings/number_field/meson.build b/src/sage/rings/number_field/meson.build
diff --git a/src/sage/rings/padics/meson.build b/src/sage/rings/padics/meson.build
diff --git a/src/sage/rings/polynomial/meson.build b/src/sage/rings/polynomial/meson.build
diff --git a/src/sage/rings/polynomial/weil/meson.build b/src/sage/rings/polynomial/weil/meson.build
diff --git a/src/sage/rings/semirings/meson.build b/src/sage/rings/semirings/meson.build
diff --git a/src/sage/sat/meson.build b/src/sage/sat/meson.build
diff --git a/src/sage/schemes/elliptic_curves/meson.build b/src/sage/schemes/elliptic_curves/meson.build
diff --git a/src/sage/schemes/hyperelliptic_curves/meson.build b/src/sage/schemes/hyperelliptic_curves/meson.build
diff --git a/src/sage/schemes/meson.build b/src/sage/schemes/meson.build
diff --git a/src/sage/schemes/toric/meson.build b/src/sage/schemes/toric/meson.build
diff --git a/src/sage/sets/meson.build b/src/sage/sets/meson.build
diff --git a/src/sage/stats/distributions/meson.build b/src/sage/stats/distributions/meson.build
diff --git a/src/sage/stats/hmm/meson.build b/src/sage/stats/hmm/meson.build
diff --git a/src/sage/stats/meson.build b/src/sage/stats/meson.build
diff --git a/src/sage/symbolic/meson.build b/src/sage/symbolic/meson.build
diff --git a/tools/update-meson.py b/tools/update-meson.py

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`py.install_sources(`
	`2`	`+ '__init__.py',`
`2`	`3`	`'all.py',`
`3`	`4`	`'finite_dimensional_algebra.py',`
`4`	`5`	`'finite_dimensional_algebra_element.pxd',`