Skip to content

Commit 88ecd7a

Browse files
committed
Revert "Fix more doctests in meson_editable install"
This reverts commit 40c0b19.
1 parent 0b55818 commit 88ecd7a

File tree

5 files changed

+2
-98
lines changed

5 files changed

+2
-98
lines changed

src/sage/doctest/external.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -366,10 +366,6 @@ def external_features():
366366
r"""
367367
Generate the features that are only to be tested if ``--optional=external`` is used.
368368
369-
.. SEEALSO::
370-
371-
:func:`sage.features.all.all_features`
372-
373369
EXAMPLES::
374370
375371
sage: from sage.doctest.external import external_features

src/sage/doctest/sources.py

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -87,18 +87,8 @@ def get_basename(path):
8787
sage: import os
8888
sage: get_basename(sage.doctest.sources.__file__)
8989
'sage.doctest.sources'
90-
91-
::
92-
93-
sage: # optional - !meson_editable
9490
sage: get_basename(os.path.join(sage.structure.__path__[0], 'element.pxd'))
9591
'sage.structure.element.pxd'
96-
97-
TESTS::
98-
99-
sage: # optional - meson_editable
100-
sage: get_basename(os.path.join(os.path.dirname(sage.structure.__file__), 'element.pxd'))
101-
'sage.structure.element.pxd'
10292
"""
10393
if path is None:
10494
return None

src/sage/env.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -319,10 +319,6 @@ def sage_include_directories(use_sources=False):
319319
sage: dirs = sage.env.sage_include_directories(use_sources=True)
320320
sage: any(os.path.isfile(os.path.join(d, file)) for d in dirs)
321321
True
322-
323-
::
324-
325-
sage: # optional - !meson_editable (no need, see :issue:`39275`)
326322
sage: dirs = sage.env.sage_include_directories(use_sources=False)
327323
sage: any(os.path.isfile(os.path.join(d, file)) for d in dirs)
328324
True

src/sage/features/meson_editable.py

Lines changed: 0 additions & 46 deletions
This file was deleted.

src/sage/misc/package_dir.py

Lines changed: 2 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,6 @@ def is_package_or_sage_namespace_package_dir(path, *, distribution_filter=None):
261261
262262
:mod:`sage.cpython` is an ordinary package::
263263
264-
sage: # optional - !meson_editable
265264
sage: from sage.misc.package_dir import is_package_or_sage_namespace_package_dir
266265
sage: directory = sage.cpython.__path__[0]; directory
267266
'.../sage/cpython'
@@ -271,48 +270,24 @@ def is_package_or_sage_namespace_package_dir(path, *, distribution_filter=None):
271270
:mod:`sage.libs.mpfr` only has an ``__init__.pxd`` file, but we consider
272271
it a package directory for consistency with Cython::
273272
274-
sage: # optional - !meson_editable
275273
sage: directory = os.path.join(sage.libs.__path__[0], 'mpfr'); directory
276274
'.../sage/libs/mpfr'
277-
sage: is_package_or_sage_namespace_package_dir(directory)
275+
sage: is_package_or_sage_namespace_package_dir(directory) # known bug (seen in build.yml)
278276
True
279277
280278
:mod:`sage` is designated to become an implicit namespace package::
281279
282-
sage: # optional - !meson_editable
283280
sage: directory = sage.__path__[0]; directory
284281
'.../sage'
285-
sage: is_package_or_sage_namespace_package_dir(directory)
282+
sage: is_package_or_sage_namespace_package_dir(directory) # known bug (seen in build.yml)
286283
True
287284
288285
Not a package::
289286
290-
sage: # optional - !meson_editable
291287
sage: directory = os.path.join(sage.symbolic.__path__[0], 'ginac'); directory # needs sage.symbolic
292288
'.../sage/symbolic/ginac'
293289
sage: is_package_or_sage_namespace_package_dir(directory) # needs sage.symbolic
294290
False
295-
296-
TESTS::
297-
298-
sage: # optional - meson_editable
299-
sage: from sage.misc.package_dir import is_package_or_sage_namespace_package_dir
300-
sage: directory = os.path.dirname(sage.cpython.__file__); directory
301-
'.../sage/cpython'
302-
sage: is_package_or_sage_namespace_package_dir(directory)
303-
True
304-
305-
sage: # optional - meson_editable
306-
sage: directory = os.path.join(os.path.dirname(sage.libs.__file__), 'mpfr'); directory
307-
'.../sage/libs/mpfr'
308-
sage: is_package_or_sage_namespace_package_dir(directory)
309-
True
310-
311-
sage: # optional - meson_editable, sage.symbolic
312-
sage: directory = os.path.join(os.path.dirname(sage.symbolic.__file__), 'ginac'); directory
313-
'.../sage/symbolic/ginac'
314-
sage: is_package_or_sage_namespace_package_dir(directory)
315-
False
316291
"""
317292
if os.path.exists(os.path.join(path, '__init__.py')): # ordinary package
318293
return True
@@ -370,15 +345,8 @@ def walk_packages(path=None, prefix='', onerror=None):
370345
371346
EXAMPLES::
372347
373-
sage: # optional - !meson_editable
374348
sage: sorted(sage.misc.package_dir.walk_packages(sage.misc.__path__)) # a namespace package
375349
[..., ModuleInfo(module_finder=FileFinder('.../sage/misc'), name='package_dir', ispkg=False), ...]
376-
377-
TESTS::
378-
379-
sage: # optional - meson_editable
380-
sage: sorted(sage.misc.package_dir.walk_packages(sage.misc.__path__))
381-
[..., ModuleInfo(module_finder=<...MesonpyPathFinder object...>, name='package_dir', ispkg=False), ...]
382350
"""
383351
# Adapted from https://github.com/python/cpython/blob/3.11/Lib/pkgutil.py
384352

0 commit comments

Comments
 (0)