MAINT Require meson-python >= 0.16 and remove temporary work-arounds #29081

lesteve · 2024-05-22T15:28:18Z

In #28040 we used some work-arounds that are no longer necessary after meson-python 0.16 release (released 17 April 2024), in particular thanks to mesonbuild/meson-python#569.

I am undecided about removing sklearn._BUILT_WITH_MESON. It was previously used to skip a test due to a Meson editable install limitation. sklearn._BUILT_WITH_MESON is not used anymore in this PR, but you never know, it might be handy for troubleshooting user issues at least until we drop setuptools support?

For more details, the code for sklearn._BUILT_WITH_MESON is

scikit-learn/sklearn/meson.build

Lines 147 to 157 in 6a18882

    
           # Write file in Meson build dir to be able to figure out from Python code 
        
           # whether scikit-learn was built with Meson. Adapted from pandas 
        
           # _version_meson.py. 
        
           custom_target('write_built_with_meson_file', 
        
               output: '_built_with_meson.py', 
        
               command: [ 
        
                   py, '-c', 'with open("sklearn/_built_with_meson.py", "w") as f: f.write("")' 
        
               ], 
        
               install: true, 
        
               install_dir: py.get_install_dir() / 'sklearn' 
        
           )

and

scikit-learn/sklearn/__init__.py

Lines 142 to 148 in 6a18882

    
           _BUILT_WITH_MESON = False 
        
           try: 
        
               import sklearn._built_with_meson  # noqa: F401 
        
               _BUILT_WITH_MESON = True 
        
           except ModuleNotFoundError: 
        
               pass

.

github-actions · 2024-05-22T15:29:36Z

✔️ Linting Passed

All linting checks passed. Your pull request is in excellent shape! ☀️

_{Generated for commit: 0d7e4ca. Link to the linter CI: here}

lesteve · 2024-05-22T16:08:31Z

The failures are likely a behaviour change in Pytest 8, likely this one from https://docs.pytest.org/en/8.0.x/changelog.html#other-breaking-changes:

#9288: warns() now re-emits unmatched warnings when the context closes – previously it would consume all warnings, hiding those that were not matched by the function.

Similar Pytest 8 tweaks were already done in #28318, I need to remember what this was all about 😉.

…ll builds

lesteve · 2024-05-23T08:30:32Z

Yet another instance of #28820 in the no-OpenMP build, I restarted the build:

FAILED: sklearn/metrics/_pairwise_distances_reduction/_datasets_pair.cpython-312-darwin.so.p/sklearn/metrics/_pairwise_distances_reduction/_datasets_pair.pyx.cpp
  cython -M --fast-fail -3 --cplus '-X language_level=3' '-X boundscheck=False' '-X wraparound=False' '-X initializedcheck=False' '-X nonecheck=False' '-X cdivision=True' '-X profile=False' --include-dir /Users/runner/work/1/s/build/cp312 sklearn/metrics/_pairwise_distances_reduction/_datasets_pair.pyx -o sklearn/metrics/_pairwise_distances_reduction/_datasets_pair.cpython-312-darwin.so.p/sklearn/metrics/_pairwise_distances_reduction/_datasets_pair.pyx.cpp

  Error compiling Cython file:
  ------------------------------------------------------------
  ...
  from ...utils._typedefs cimport float64_t, float32_t, int32_t, intp_t
  ^
  ------------------------------------------------------------

  sklearn/metrics/_pairwise_distances_reduction/_datasets_pair.pxd:1:0: relative cimport beyond main package is not allowed

jeremiedbb

The changes in test_logistic seem unrelated

lesteve · 2024-05-23T14:35:13Z

The changes in test_logistic seem unrelated

They are actually related in a slightly roundabout way, by updating meson-python we can use Pytest 8 (i.e. remove the pytest<8 pin). Some tests fail with Pytest 8 and I fixed them in this PR, see #29081 (comment).

jeremiedbb · 2024-05-23T14:45:33Z

Weird that the CI didn't fail previously on the FutureWarning... To be consistent with other tests please decorate the test with the following instead

# TODO(1.7): remove filterwarnings after the deprecation of multi_class
@pytest.mark.filterwarnings("ignore:.*'multi_class' was deprecated.*:FutureWarning")

jeremiedbb · 2024-05-23T14:46:19Z

sklearn/linear_model/tests/test_logistic.py

-    assert lr.n_iter_[0] == max_iter
-


We should keep that though

Oops indeed, fixed

jeremiedbb

LGTM

lesteve added 4 commits May 22, 2024 17:06

MAINT Use meson-python 0.16 and remove temporary work-arounds

959938d

[scipy-dev] [arm] [pypy] [pyodide] [azure parallel] trigger all builds

c4c3771

Update nogil

b868d21

[scipy-dev] [arm] [pypy] [pyodide] [azure parallel] trigger all builds

09ee0d4

lesteve added the No Changelog Needed label May 22, 2024

lesteve added 3 commits May 22, 2024 18:32

Fix

a9b1ca2

[scipy-dev] [arm] [pypy] [pyodide] [nogil] [azure parallel] trigger a…

031a82a

…ll builds

Fix no-OpenMP build

79fdb14

lesteve mentioned this pull request May 23, 2024

BLD Fix yet another meson.build dependency #29087

Merged

jeremiedbb reviewed May 23, 2024

View reviewed changes

fix

0d7e4ca

adrinjalali approved these changes May 23, 2024

View reviewed changes

jeremiedbb approved these changes May 24, 2024

View reviewed changes

jeremiedbb merged commit a63b021 into scikit-learn:main May 24, 2024
30 checks passed

lesteve deleted the meson-python-0.16 branch May 24, 2024 11:42

jeremiedbb pushed a commit to jeremiedbb/scikit-learn that referenced this pull request Jul 2, 2024

MAINT Require meson-python >= 0.16 and remove temporary work-arounds (s…

1d19af9

…cikit-learn#29081)

jeremiedbb mentioned this pull request Jul 2, 2024

Release 1.5.1 #29382

Merged

11 tasks

jeremiedbb pushed a commit that referenced this pull request Jul 2, 2024

MAINT Require meson-python >= 0.16 and remove temporary work-arounds (#…

74678bd

…29081)

glemaitre added a commit to glemaitre/scikit-learn that referenced this pull request Sep 9, 2024

MAINT Require meson-python >= 0.16 and remove temporary work-arounds (s…

3003da7

…cikit-learn#29081)

glemaitre added a commit that referenced this pull request Sep 11, 2024

MAINT Require meson-python >= 0.16 and remove temporary work-arounds (#…

5731b70

…29081)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

MAINT Require meson-python >= 0.16 and remove temporary work-arounds #29081

MAINT Require meson-python >= 0.16 and remove temporary work-arounds #29081

lesteve commented May 22, 2024 •

edited

Loading

github-actions bot commented May 22, 2024 •

edited

Loading

lesteve commented May 22, 2024 •

edited

Loading

lesteve commented May 23, 2024

jeremiedbb left a comment

lesteve commented May 23, 2024 •

edited

Loading

jeremiedbb commented May 23, 2024

jeremiedbb May 23, 2024

lesteve May 23, 2024

jeremiedbb left a comment

	# Write file in Meson build dir to be able to figure out from Python code
	# whether scikit-learn was built with Meson. Adapted from pandas
	# _version_meson.py.
	custom_target('write_built_with_meson_file',
	output: '_built_with_meson.py',
	command: [
	py, '-c', 'with open("sklearn/_built_with_meson.py", "w") as f: f.write("")'
	],
	install: true,
	install_dir: py.get_install_dir() / 'sklearn'
	)

	_BUILT_WITH_MESON = False
	try:
	import sklearn._built_with_meson # noqa: F401

	_BUILT_WITH_MESON = True
	except ModuleNotFoundError:
	pass

MAINT Require meson-python >= 0.16 and remove temporary work-arounds #29081

MAINT Require meson-python >= 0.16 and remove temporary work-arounds #29081

Conversation

lesteve commented May 22, 2024 • edited Loading

github-actions bot commented May 22, 2024 • edited Loading

✔️ Linting Passed

lesteve commented May 22, 2024 • edited Loading

lesteve commented May 23, 2024

jeremiedbb left a comment

Choose a reason for hiding this comment

lesteve commented May 23, 2024 • edited Loading

jeremiedbb commented May 23, 2024

jeremiedbb May 23, 2024

Choose a reason for hiding this comment

lesteve May 23, 2024

Choose a reason for hiding this comment

jeremiedbb left a comment

Choose a reason for hiding this comment

lesteve commented May 22, 2024 •

edited

Loading

github-actions bot commented May 22, 2024 •

edited

Loading

lesteve commented May 22, 2024 •

edited

Loading

lesteve commented May 23, 2024 •

edited

Loading