Skip to content

gh-100238: Use setuptools in peg-generator and reenable tests #104798

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lysnikolaou merged 9 commits into from
May 26, 2023
Merged

gh-100238: Use setuptools in peg-generator and reenable tests #104798

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
88edfa7
gh-100238: Use setuptools in peg-generator and reenable tests
lysnikolaou May 23, 2023
c750365
Merge branch 'main' into setuptools-peg-generator
lysnikolaou May 24, 2023
907eae8
Roll back changes re. newline in tokenizer
lysnikolaou May 24, 2023
3e8c0aa
Fix test_pegen tests after changes in the Python tokenizer
lysnikolaou May 24, 2023
1c905d7
Take fixup_build_ext from 3.11 to use in the peg-generator
lysnikolaou May 24, 2023
339e592
Use full path in venv python executable
lysnikolaou May 25, 2023
672e463
Add another verbose print
lysnikolaou May 25, 2023
dc89e7b
Use sys.executable to find name of venv executable
lysnikolaou May 26, 2023
b3ab1a9
Check sysconfig for site-packages path
lysnikolaou May 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Take fixup_build_ext from 3.11 to use in the peg-generator
  • Loading branch information
@lysnikolaou
lysnikolaou committed May 24, 2023
commit 1c905d77cd527c69b1022f73dadfb83f294222c4
42 changes: 42 additions & 0 deletions Tools/peg_generator/pegen/build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import itertools
import os
import pathlib
import sys
import sysconfig
Expand Down Expand Up @@ -27,6 +28,46 @@ def get_extra_flags(compiler_flags: str, compiler_py_flags_nodist: str) -> List[
return f"{flags} {py_flags_nodist}".split()


def fixup_build_ext(cmd):
"""Function needed to make build_ext tests pass.

When Python was built with --enable-shared on Unix, -L. is not enough to
find libpython<blah>.so, because regrtest runs in a tempdir, not in the
source directory where the .so lives.

When Python was built with in debug mode on Windows, build_ext commands
need their debug attribute set, and it is not done automatically for
some reason.

This function handles both of these things. Example use:

cmd = build_ext(dist)
support.fixup_build_ext(cmd)
cmd.ensure_finalized()

Unlike most other Unix platforms, Mac OS X embeds absolute paths
to shared libraries into executables, so the fixup is not needed there.

Taken from distutils (was part of the CPython stdlib until Python 3.11)
"""
if os.name == 'nt':
cmd.debug = sys.executable.endswith('_d.exe')
elif sysconfig.get_config_var('Py_ENABLE_SHARED'):
# To further add to the shared builds fun on Unix, we can't just add
# library_dirs to the Extension() instance because that doesn't get
# plumbed through to the final compiler command.
runshared = sysconfig.get_config_var('RUNSHARED')
if runshared is None:
cmd.library_dirs = ['.']
else:
if sys.platform == 'darwin':
cmd.library_dirs = []
else:
name, equals, value = runshared.partition('=')
cmd.library_dirs = [d for d in value.split(os.pathsep) if d]



def compile_c_extension(
generated_source_path: str,
build_dir: Optional[str] = None,
Expand Down Expand Up @@ -99,6 +140,7 @@ def compile_c_extension(
)
dist = Distribution({"name": extension_name, "ext_modules": [extension]})
cmd = dist.get_command_obj("build_ext")
fixup_build_ext(cmd)
cmd.build_lib = str(source_file_path.parent)
cmd.include_dirs = include_dirs
if build_dir:
Expand Down