gh-127146: Emscripten Include compiler version in _PYTHON_HOST_PLATFORM - #127992
gh-127146: Emscripten Include compiler version in _PYTHON_HOST_PLATFORM#127992freakboy3742 merged 3 commits into
Conversation
Sorry, something went wrong.
…PLATFORM `test_sysconfigdata_json` is failing. This doesn't entirely fix it but it moves the failure later -- before it doesn't even find the sysconfigdata file because of a descrepancy between what `uname()` returns and what `configure.ac` sets `_PYTHON_HOST_PLATFORM` to. After, there are some small differences.
|
To actually fix the test, we could either skip the check for prefix-related keys or regenerate the sysconfigdata with the cli after the build is completed. The first change would look like: @@ -651,9 +652,13 @@ def test_sysconfigdata_json(self):
system_config_vars = get_config_vars()
# Ignore keys in the check
- for key in ('projectbase', 'srcdir'):
- json_config_vars.pop(key)
- system_config_vars.pop(key)
+ ignore_keys = ('projectbase', 'srcdir')
+ if is_emscripten:
+ ignore_keys += ("exec_prefix", "installed_base", "installed_platbase", "prefix", "platbase", "userbase")
+
+ for key in ignore_keys:
+ json_config_vars.pop(key, None)
+ system_config_vars.pop(key, None)
self.assertEqual(system_config_vars, json_config_vars)@freakboy3742 maybe we could do this for android and ios too? |
Sorry, something went wrong.
Co-authored-by: Kleis Auke Wolthuizen <github@kleisauke.nl>
freakboy3742
left a comment
There was a problem hiding this comment.
The change itself makes sense; one note inline about formatting, and it looks like CI is failing because autoreconf hasn't been run since your most recent update.
Sorry, something went wrong.
|
A Python core developer has requested some changes be made to your pull request before we can consider merging it. If you could please address their requests along with any other requests in other reviews from core developers that would be appreciated. Once you have made the requested changes, please leave a comment on this pull request containing the phrase I have made the requested changes; please review again. I will then notify any core developers who have left a review that you're ready for them to take another look at this pull request. |
Sorry, something went wrong.
|
I have made the requested changes; please review again |
Sorry, something went wrong.
|
Thanks for making the requested changes! @freakboy3742: please review the changes made to this pull request. |
Sorry, something went wrong.
freakboy3742
left a comment
There was a problem hiding this comment.
Thanks for those fixes - looks great!
Sorry, something went wrong.
⚠️⚠️⚠️ Buildbot failure ⚠️⚠️⚠️Hi! The buildbot AMD64 Windows Server 2022 NoGIL 3.x has failed when building commit b92f101. What do you need to do:
You can take a look at the buildbot page here: https://buildbot.python.org/#/builders/1241/builds/4076 Failed tests:
Summary of the results of the build (if available): == Click to see traceback logsTraceback (most recent call last):
File "C:\Users\Administrator\buildarea\3.x.itamaro-win64-srv-22-aws.x64.nogil\build\Lib\test\test_venv.py", line 615, in test_multiprocessing
out, err = check_output([self.envpy(real_env_dir=True), '-c',
~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
'from multiprocessing import Pool; '
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
'pool = Pool(1); '
^^^^^^^^^^^^^^^^^^
'print(pool.apply_async("Python".lower).get(3)); '
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
'pool.terminate()'])
^^^^^^^^^^^^^^^^^^^^
File "C:\Users\Administrator\buildarea\3.x.itamaro-win64-srv-22-aws.x64.nogil\build\Lib\test\test_venv.py", line 58, in check_output
raise subprocess.CalledProcessError(
p.returncode, cmd, out, err)
subprocess.CalledProcessError: Command '['C:\\Users\\Administrator\\AppData\\Local\\Temp\\test_python_sfi65_yv\\tmpjhxztw7a\\Scripts\\python3.14t_d.exe', '-c', 'from multiprocessing import Pool; pool = Pool(1); print(pool.apply_async("Python".lower).get(3)); pool.terminate()']' returned non-zero exit status 1.
Traceback (most recent call last):
File "C:\Users\Administrator\buildarea\3.x.itamaro-win64-srv-22-aws.x64.nogil\build\Lib\test\test_venv.py", line 615, in test_multiprocessing
out, err = check_output([self.envpy(real_env_dir=True), '-c',
~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
'from multiprocessing import Pool; '
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
'pool = Pool(1); '
^^^^^^^^^^^^^^^^^^
'print(pool.apply_async("Python".lower).get(3)); '
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
'pool.terminate()'])
^^^^^^^^^^^^^^^^^^^^
File "C:\Users\Administrator\buildarea\3.x.itamaro-win64-srv-22-aws.x64.nogil\build\Lib\test\test_venv.py", line 58, in check_output
raise subprocess.CalledProcessError(
p.returncode, cmd, out, err)
subprocess.CalledProcessError: Command '['C:\\Users\\Administrator\\AppData\\Local\\Temp\\test_python_juj1et4h\\tmp36bh_36p\\Scripts\\python3.14t_d.exe', '-c', 'from multiprocessing import Pool; pool = Pool(1); print(pool.apply_async("Python".lower).get(3)); pool.terminate()']' returned non-zero exit status 1.
Traceback (most recent call last):
|
Sorry, something went wrong.
|
I can't see why this change would have any impact on Windows being unable to start multiprocessing... |
Sorry, something went wrong.
|
Presumably a flake =) |
Sorry, something went wrong.
…PLATFORM (python#127992) Modifies _PYTHON_HOST_PLATFORM to include the compiler version under Emscripten. The Emscripten compiler version is the platform version compatibility identifier.
test_sysconfigdata_json is failing. This doesn't entirely fix it but it moves the failure later -- before this change it doesn't even find the sysconfigdata file because of a descrepancy between what uname() returns and what configure.ac sets _PYTHON_HOST_PLATFORM to. After, there are some small differences.