Use non alternate name for Kyiv#108533
Conversation
tzdata provides Kiev as an alternative to Kyiv: https://sources.debian.org/src/tzdata/2023c-10/backward/?hl=314#L314 But Debian moved it to the tzdata-legacy package breaking the test: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1050530 This patch switches to the name provided by tzdata.
Sorry, something went wrong.
|
Most changes to Python require a NEWS entry. Please add it using the blurb_it web app or the blurb command-line tool. |
Sorry, something went wrong.
|
This change looks reasonable, the timezone was renamed in IANA's Time Zone Database release 2022b:
https://data.iana.org/time-zones/tzdb/NEWS The original test was added long before this in 2012: With the intent to not test alternative names but different UTC offsets at different points in history:
|
Sorry, something went wrong.
|
Thanks @jspricke for the PR, and @serhiy-storchaka for merging it 🌮🎉.. I'm working now to backport this PR to: 3.11, 3.12. |
Sorry, something went wrong.
This comment was marked as outdated.
This comment was marked as outdated.
tzdata provides Kiev as an alternative to Kyiv: https://sources.debian.org/src/tzdata/2023c-10/backward/?hl=314GH-L314 But Debian moved it to the tzdata-legacy package breaking the test: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1050530 This patch switches to the name provided by tzdata. (cherry picked from commit 7659128) Co-authored-by: Jochen Sprickerhof <github@jochen.sprickerhof.de>
tzdata provides Kiev as an alternative to Kyiv: https://sources.debian.org/src/tzdata/2023c-10/backward/?hl=314GH-L314 But Debian moved it to the tzdata-legacy package breaking the test: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1050530 This patch switches to the name provided by tzdata. (cherry picked from commit 7659128) Co-authored-by: Jochen Sprickerhof <github@jochen.sprickerhof.de>
|
@jspricke Thanks for the PR! It looks like the CLA bot is a bit confused, see #108533 (comment) and #108640 (comment). I think this might be because you used different email addresses for the commit and for your profile? The easiest thing is probably if you could also sign the CLA with |
Sorry, something went wrong.
|
@hugovk done. I usually use git@ for my commits, not sure where the github@ is coming from. |
Sorry, something went wrong.
⚠️⚠️⚠️ Buildbot failure ⚠️⚠️⚠️Hi! The buildbot ARM64 macOS 3.x has failed when building commit 7659128. What do you need to do:
You can take a look at the buildbot page here: https://buildbot.python.org/all/#builders/725/builds/5430 Failed tests:
Failed subtests:
Summary of the results of the build (if available): == Tests result: FAILURE then FAILURE == 438 tests OK. 10 slowest tests:
1 test failed: 21 tests skipped: 1 re-run test: Total duration: 8 min 47 sec Click to see traceback logsTraceback (most recent call last):
File "/Users/buildbot/buildarea/3.x.pablogsal-macos-m1.macos-with-brew/build/Lib/test/support/__init__.py", line 863, in inner
return func(*args, **kwds)
^^^^^^^^^^^^^^^^^^^
File "/Users/buildbot/buildarea/3.x.pablogsal-macos-m1.macos-with-brew/build/Lib/test/test_email/test_utils.py", line 155, in test_variable_tzname
self.assertEqual(t1.tzname(), 'MSK')
AssertionError: 'UTC' != 'MSK'
- UTC
+ MSK
|
Sorry, something went wrong.
⚠️⚠️⚠️ Buildbot failure ⚠️⚠️⚠️Hi! The buildbot AMD64 Debian PGO 3.x has failed when building commit 7659128. What do you need to do:
You can take a look at the buildbot page here: https://buildbot.python.org/all/#builders/249/builds/6135 Failed tests:
Failed subtests:
Summary of the results of the build (if available): == Tests result: FAILURE then FAILURE == 447 tests OK. 10 slowest tests:
1 test failed: 15 tests skipped: 1 re-run test: Total duration: 10 min 9 sec Click to see traceback logsTraceback (most recent call last):
File "/var/lib/buildbot/workers/enable-optimizations-bot/3.x.gps-debian-profile-opt.pgo/build/Lib/test/support/__init__.py", line 863, in inner
return func(*args, **kwds)
^^^^^^^^^^^^^^^^^^^
File "/var/lib/buildbot/workers/enable-optimizations-bot/3.x.gps-debian-profile-opt.pgo/build/Lib/test/test_email/test_utils.py", line 155, in test_variable_tzname
self.assertEqual(t1.tzname(), 'MSK')
AssertionError: 'Europe' != 'MSK'
- Europe
+ MSK
|
Sorry, something went wrong.
⚠️⚠️⚠️ Buildbot failure ⚠️⚠️⚠️Hi! The buildbot aarch64 Debian Clang LTO + PGO 3.x has failed when building commit 7659128. What do you need to do:
You can take a look at the buildbot page here: https://buildbot.python.org/all/#builders/1084/builds/1794 Failed tests:
Failed subtests:
Summary of the results of the build (if available): == Tests result: FAILURE then FAILURE == 447 tests OK. 10 slowest tests:
1 test failed: 15 tests skipped: 1 re-run test: Total duration: 3 min 59 sec Click to see traceback logsTraceback (most recent call last):
File "/var/lib/buildbot/workers/arm64-clang/3.x.gps-arm64-debian.clang.lto-pgo/build/Lib/test/support/__init__.py", line 863, in inner
return func(*args, **kwds)
^^^^^^^^^^^^^^^^^^^
File "/var/lib/buildbot/workers/arm64-clang/3.x.gps-arm64-debian.clang.lto-pgo/build/Lib/test/test_email/test_utils.py", line 155, in test_variable_tzname
self.assertEqual(t1.tzname(), 'MSK')
AssertionError: 'Europe' != 'MSK'
- Europe
+ MSK
|
Sorry, something went wrong.
tzdata provides Kiev as an alternative to Kyiv: https://sources.debian.org/src/tzdata/2023c-10/backward/?hl=314GH-L314 But Debian moved it to the tzdata-legacy package breaking the test: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1050530 This patch switches to the name provided by tzdata. (cherry picked from commit 7659128) Co-authored-by: Jochen Sprickerhof <github@jochen.sprickerhof.de>
⚠️⚠️⚠️ Buildbot failure ⚠️⚠️⚠️Hi! The buildbot ARM64 macOS 3.11 has failed when building commit 34f84f2. What do you need to do:
You can take a look at the buildbot page here: https://buildbot.python.org/all/#builders/1030/builds/1313 Failed tests:
Failed subtests:
Summary of the results of the build (if available): == Tests result: FAILURE then FAILURE == 413 tests OK. 10 slowest tests:
1 test failed: 17 tests skipped: 1 re-run test: Total duration: 6 min 56 sec Click to see traceback logsTraceback (most recent call last):
File "/Users/buildbot/buildarea/3.11.pablogsal-macos-m1.macos-with-brew/build/Lib/multiprocessing/resource_tracker.py", line 209, in main
cache[rtype].remove(name)
KeyError: '/psm_37c4ec7f'
Traceback (most recent call last):
File "/Users/buildbot/buildarea/3.11.pablogsal-macos-m1.macos-with-brew/build/Lib/multiprocessing/resource_tracker.py", line 209, in main
cache[rtype].remove(name)
KeyError: '/psm_04e5971b'
Traceback (most recent call last):
File "/Users/buildbot/buildarea/3.11.pablogsal-macos-m1.macos-with-brew/build/Lib/test/support/__init__.py", line 847, in inner
return func(*args, **kwds)
^^^^^^^^^^^^^^^^^^^
File "/Users/buildbot/buildarea/3.11.pablogsal-macos-m1.macos-with-brew/build/Lib/test/test_email/test_utils.py", line 155, in test_variable_tzname
self.assertEqual(t1.tzname(), 'MSK')
AssertionError: 'UTC' != 'MSK'
- UTC
+ MSK
|
Sorry, something went wrong.
⚠️⚠️⚠️ Buildbot failure ⚠️⚠️⚠️Hi! The buildbot AMD64 Debian root 3.x has failed when building commit 7659128. What do you need to do:
You can take a look at the buildbot page here: https://buildbot.python.org/all/#builders/345/builds/5667 Failed tests:
Failed subtests:
Summary of the results of the build (if available): == Tests result: FAILURE then FAILURE == 442 tests OK. 10 slowest tests:
1 test failed: 20 tests skipped: 1 re-run test: Total duration: 36 min 18 sec Click to see traceback logsTraceback (most recent call last):
File "/root/buildarea/3.x.angelico-debian-amd64/build/Lib/test/support/__init__.py", line 863, in inner
return func(*args, **kwds)
^^^^^^^^^^^^^^^^^^^
File "/root/buildarea/3.x.angelico-debian-amd64/build/Lib/test/test_email/test_utils.py", line 155, in test_variable_tzname
self.assertEqual(t1.tzname(), 'MSK')
AssertionError: 'Europe' != 'MSK'
- Europe
+ MSK
|
Sorry, something went wrong.
⚠️⚠️⚠️ Buildbot failure ⚠️⚠️⚠️Hi! The buildbot AMD64 Debian PGO 3.11 has failed when building commit 34f84f2. What do you need to do:
You can take a look at the buildbot page here: https://buildbot.python.org/all/#builders/1024/builds/1107 Failed tests:
Failed subtests:
Summary of the results of the build (if available): == Tests result: FAILURE then FAILURE == 419 tests OK. 10 slowest tests:
1 test failed: 14 tests skipped: 1 re-run test: Total duration: 9 min 11 sec Click to see traceback logsTraceback (most recent call last):
File "/var/lib/buildbot/workers/enable-optimizations-bot/3.11.gps-debian-profile-opt.pgo/build/Lib/multiprocessing/resource_tracker.py", line 209, in main
cache[rtype].remove(name)
KeyError: '/psm_841de619'
Traceback (most recent call last):
File "/var/lib/buildbot/workers/enable-optimizations-bot/3.11.gps-debian-profile-opt.pgo/build/Lib/multiprocessing/resource_tracker.py", line 209, in main
cache[rtype].remove(name)
KeyError: '/psm_91a5ce23'
Traceback (most recent call last):
File "/var/lib/buildbot/workers/enable-optimizations-bot/3.11.gps-debian-profile-opt.pgo/build/Lib/multiprocessing/resource_tracker.py", line 209, in main
cache[rtype].remove(name)
KeyError: '/psm_52bcd614'
Traceback (most recent call last):
File "/var/lib/buildbot/workers/enable-optimizations-bot/3.11.gps-debian-profile-opt.pgo/build/Lib/test/support/__init__.py", line 847, in inner
return func(*args, **kwds)
^^^^^^^^^^^^^^^^^^^
File "/var/lib/buildbot/workers/enable-optimizations-bot/3.11.gps-debian-profile-opt.pgo/build/Lib/test/test_email/test_utils.py", line 155, in test_variable_tzname
self.assertEqual(t1.tzname(), 'MSK')
AssertionError: 'Europe' != 'MSK'
- Europe
+ MSK
|
Sorry, something went wrong.
⚠️⚠️⚠️ Buildbot failure ⚠️⚠️⚠️Hi! The buildbot aarch64 Debian Clang LTO + PGO 3.11 has failed when building commit 34f84f2. What do you need to do:
You can take a look at the buildbot page here: https://buildbot.python.org/all/#builders/1085/builds/359 Failed tests:
Failed subtests:
Summary of the results of the build (if available): == Tests result: FAILURE then FAILURE == 419 tests OK. 10 slowest tests:
1 test failed: 14 tests skipped: 1 re-run test: Total duration: 3 min 21 sec Click to see traceback logsTraceback (most recent call last):
File "/var/lib/buildbot/workers/arm64-clang/3.11.gps-arm64-debian.clang.lto-pgo/build/Lib/multiprocessing/resource_tracker.py", line 209, in main
cache[rtype].remove(name)
KeyError: '/psm_e6134afd'
Traceback (most recent call last):
File "/var/lib/buildbot/workers/arm64-clang/3.11.gps-arm64-debian.clang.lto-pgo/build/Lib/test/support/__init__.py", line 847, in inner
return func(*args, **kwds)
^^^^^^^^^^^^^^^^^^^
File "/var/lib/buildbot/workers/arm64-clang/3.11.gps-arm64-debian.clang.lto-pgo/build/Lib/test/test_email/test_utils.py", line 155, in test_variable_tzname
self.assertEqual(t1.tzname(), 'MSK')
AssertionError: 'Europe' != 'MSK'
- Europe
+ MSK
Traceback (most recent call last):
File "/var/lib/buildbot/workers/arm64-clang/3.11.gps-arm64-debian.clang.lto-pgo/build/Lib/multiprocessing/resource_tracker.py", line 209, in main
cache[rtype].remove(name)
KeyError: '/psm_25700c27'
Traceback (most recent call last):
File "/var/lib/buildbot/workers/arm64-clang/3.11.gps-arm64-debian.clang.lto-pgo/build/Lib/multiprocessing/resource_tracker.py", line 209, in main
cache[rtype].remove(name)
KeyError: '/psm_70edd915'
|
Sorry, something went wrong.
⚠️⚠️⚠️ Buildbot failure ⚠️⚠️⚠️Hi! The buildbot ARM Raspbian 3.11 has failed when building commit 34f84f2. What do you need to do:
You can take a look at the buildbot page here: https://buildbot.python.org/all/#builders/980/builds/981 Failed tests:
Failed subtests:
Summary of the results of the build (if available): == Tests result: FAILURE then FAILURE == 416 tests OK. 10 slowest tests:
1 test failed: 17 tests skipped: 1 re-run test: Total duration: 35 min 32 sec Click to see traceback logsTraceback (most recent call last):
File "/var/lib/buildbot/workers/3.11.gps-raspbian.nondebug/build/Lib/test/support/__init__.py", line 847, in inner
return func(*args, **kwds)
^^^^^^^^^^^^^^^^^^^
File "/var/lib/buildbot/workers/3.11.gps-raspbian.nondebug/build/Lib/test/test_email/test_utils.py", line 155, in test_variable_tzname
self.assertEqual(t1.tzname(), 'MSK')
AssertionError: 'Europe' != 'MSK'
- Europe
+ MSK
|
Sorry, something went wrong.
This reverts commit 7659128.
⚠️⚠️⚠️ Buildbot failure ⚠️⚠️⚠️Hi! The buildbot AMD64 Debian root 3.11 has failed when building commit 34f84f2. What do you need to do:
You can take a look at the buildbot page here: https://buildbot.python.org/all/#builders/1007/builds/992 Failed tests:
Failed subtests:
Summary of the results of the build (if available): == Tests result: FAILURE then FAILURE == 414 tests OK. 10 slowest tests:
1 test failed: 19 tests skipped: 1 re-run test: Total duration: 32 min 37 sec Click to see traceback logsTraceback (most recent call last):
File "/root/buildarea/3.11.angelico-debian-amd64/build/Lib/multiprocessing/resource_tracker.py", line 209, in main
cache[rtype].remove(name)
KeyError: '/psm_af8fd709'
Traceback (most recent call last):
File "/root/buildarea/3.11.angelico-debian-amd64/build/Lib/multiprocessing/resource_tracker.py", line 209, in main
cache[rtype].remove(name)
KeyError: '/psm_003b3bfe'
Traceback (most recent call last):
File "/root/buildarea/3.11.angelico-debian-amd64/build/Lib/test/support/__init__.py", line 847, in inner
return func(*args, **kwds)
^^^^^^^^^^^^^^^^^^^
File "/root/buildarea/3.11.angelico-debian-amd64/build/Lib/test/test_email/test_utils.py", line 155, in test_variable_tzname
self.assertEqual(t1.tzname(), 'MSK')
AssertionError: 'Europe' != 'MSK'
- Europe
+ MSK
Traceback (most recent call last):
File "/root/buildarea/3.11.angelico-debian-amd64/build/Lib/multiprocessing/resource_tracker.py", line 209, in main
cache[rtype].remove(name)
KeyError: '/psm_7b7dc960'
|
Sorry, something went wrong.
…honGH-108641)" This reverts commit 34f84f2.
|
Something goes wrong, so I'm reverting the change. Different failures on different platforms. Debian: It is no longer a trivial change. Please open an issue for further investigation. |
Sorry, something went wrong.
* main: pythongh-108520: Fix bad fork detection in nested multiprocessing use case (python#108568) pythongh-108590: Revert pythongh-108657 (commit 400a1ce) (python#108686) pythongh-108494: Argument Clinic: Document how to generate code that uses the limited C API (python#108584) Document Python build requirements (python#108646) pythongh-101100: Fix Sphinx warnings in the Logging Cookbook (python#108678) Fix typo in multiprocessing docs (python#108666) pythongh-108669: unittest: Fix documentation for TestResult.collectedDurations (python#108670) pythongh-108590: Fix sqlite3.iterdump for invalid Unicode in TEXT columns (python#108657) Revert "pythongh-103224: Use the realpath of the Python executable in `test_venv` (pythonGH-103243)" (pythonGH-108667) pythongh-106320: Remove private _Py_ForgetReference() (python#108664) Mention Ellipsis pickling in the docs (python#103660) Revert "Use non alternate name for Kyiv (pythonGH-108533)" (pythonGH-108649) pythongh-108278: Deprecate passing the first param of sqlite3.Connection callback APIs by keyword (python#108632) pythongh-108455: peg_generator: install two stubs packages before running mypy (python#108637) pythongh-107801: Improve the accuracy of io.IOBase.seek docs (python#108268)
- Add loongarch support. Addresses: #1049963.
- Address CVE-2023-41105, CVE-2023-40217.
* libpython3.12-stdlib: Depend on tzdata. Closes: #1050529.
* Add proposed patch to avoid tzdata-legacy, and drop again the
dependency on it. See python/cpython#108533.
dependency on it. See python/cpython#108533.
tzdata provides Kiev as an alternative to Kyiv:
https://sources.debian.org/src/tzdata/2023c-10/backward/?hl=314#L314
But Debian moved it to the tzdata-legacy package breaking the test:
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1050530
This patch switches to the name provided by tzdata.