mirror of
https://github.com/python/cpython.git
synced 2025-09-22 00:12:56 +00:00
62972d9d73
This is the initial implementation of PEP 615, the zoneinfo module, ported from the standalone reference implementation (see https://www.python.org/dev/peps/pep-0615/#reference-implementation for a link, which has a more detailed commit history). This includes (hopefully) all functional elements described in the PEP, but documentation is found in a separate PR. This includes: 1. A pure python implementation of the ZoneInfo class 2. A C accelerated implementation of the ZoneInfo class 3. Tests with 100% branch coverage for the Python code (though C code coverage is less than 100%). 4. A compile-time configuration option on Linux (though not on Windows) Differences from the reference implementation: - The module is arranged slightly differently: the accelerated module is `_zoneinfo` rather than `zoneinfo._czoneinfo`, which also necessitates some changes in the test support function. (Suggested by Victor Stinner and Steve Dower.) - The tests are arranged slightly differently and do not include the property tests. The tests live at test/test_zoneinfo/test_zoneinfo.py rather than test/test_zoneinfo.py or test/test_zoneinfo/__init__.py because we may do some refactoring in the future that would likely require this separation anyway; we may: - include the property tests - automatically run all the tests against both pure Python and C, rather than manually constructing C and Python test classes (similar to the way this works with test_datetime.py, which generates C and Python test cases from datetimetester.py). - This includes a compile-time configuration option on Linux (though not on Windows); added with much help from Thomas Wouters. - Integration into the CPython build system is obviously different from building a standalone zoneinfo module wheel. - This includes configuration to install the tzdata package as part of CI, though only on the coverage jobs. Introducing a PyPI dependency as part of the CI build was controversial, and this is seen as less of a major change, since the coverage jobs already depend on pip and PyPI. Additional changes that were introduced as part of this PR, most / all of which were backported to the reference implementation: - Fixed reference and memory leaks With much debugging help from Pablo Galindo - Added smoke tests ensuring that the C and Python modules are built The import machinery can be somewhat fragile, and the "seamlessly falls back to pure Python" nature of this module makes it so that a problem building the C extension or a failure to import the pure Python version might easily go unnoticed. - Adjustments to zoneinfo.__dir__ Suggested by Petr Viktorin. - Slight refactorings as suggested by Steve Dower. - Removed unnecessary if check on std_abbr Discovered this because of a missing line in branch coverage.
132 lines
5.9 KiB
XML
132 lines
5.9 KiB
XML
<?xml version="1.0" encoding="UTF-8"?>
|
|
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
|
|
<?define exts=pyexpat;select;unicodedata;winsound;_bz2;_elementtree;_socket;_ssl;_msi;_ctypes;_hashlib;_multiprocessing;_lzma;_decimal;_overlapped;_sqlite3;_asyncio;_queue;_uuid;_zoneinfo ?>
|
|
<Fragment>
|
|
<DirectoryRef Id="Lib_venv_scripts_nt" />
|
|
|
|
<ComponentGroup Id="lib_extensions">
|
|
<?foreach ext in $(var.exts)?>
|
|
|
|
<Component Id="$(var.ext).pyd" Directory="DLLs" Guid="*">
|
|
<File Name="$(var.ext).pyd" KeyPath="yes" />
|
|
</Component>
|
|
|
|
<?endforeach ?>
|
|
|
|
<Component Id="sqlite3.dll" Directory="DLLs" Guid="*">
|
|
<File Name="sqlite3.dll" KeyPath="yes" />
|
|
</Component>
|
|
<Component Id="libcrypto.dll" Directory="DLLs" Guid="*">
|
|
<File Name="libcrypto$(var.ssltag).dll" KeyPath="yes" />
|
|
</Component>
|
|
<Component Id="libssl.dll" Directory="DLLs" Guid="*">
|
|
<File Name="libssl$(var.ssltag).dll" KeyPath="yes" />
|
|
</Component>
|
|
<Component Id="libffi.dll" Directory="DLLs" Guid="*">
|
|
<File Name="libffi-7.dll" KeyPath="yes" />
|
|
</Component>
|
|
<Component Id="venvlauncher.exe" Directory="Lib_venv_scripts_nt" Guid="*">
|
|
<File Name="python.exe" Source="venvlauncher.exe" KeyPath="yes" />
|
|
</Component>
|
|
<Component Id="venvwlauncher.exe" Directory="Lib_venv_scripts_nt" Guid="*">
|
|
<File Name="pythonw.exe" Source="venvwlauncher.exe" KeyPath="yes" />
|
|
</Component>
|
|
</ComponentGroup>
|
|
</Fragment>
|
|
|
|
<Fragment>
|
|
<!-- The auto-generated directory is not available when building symbols -->
|
|
<DirectoryRef Id="Lib">
|
|
<Directory Id="Lib_venv__pdbs" Name="venv">
|
|
<Directory Id="Lib_venv_scripts__pdbs" Name="scripts">
|
|
<Directory Id="Lib_venv_scripts_nt__pdbs" Name="nt" />
|
|
</Directory>
|
|
</Directory>
|
|
</DirectoryRef>
|
|
|
|
<ComponentGroup Id="lib_extensions_symbols">
|
|
<?foreach ext in $(var.exts)?>
|
|
|
|
<Component Id="$(var.ext).pdb" Directory="DLLs" Guid="*">
|
|
<File Name="$(var.ext).pdb" />
|
|
</Component>
|
|
|
|
<?endforeach ?>
|
|
|
|
<Component Id="sqlite3.pdb" Directory="DLLs" Guid="*">
|
|
<File Name="sqlite3.pdb" />
|
|
</Component>
|
|
<Component Id="libcrypto.pdb" Directory="DLLs" Guid="*">
|
|
<File Name="libcrypto$(var.ssltag).pdb" KeyPath="yes" />
|
|
</Component>
|
|
<Component Id="libssl.pdb" Directory="DLLs" Guid="*">
|
|
<File Name="libssl$(var.ssltag).pdb" KeyPath="yes" />
|
|
</Component>
|
|
<Component Id="venvlauncher.pdb" Directory="Lib_venv_scripts_nt__pdbs" Guid="*">
|
|
<File Name="python.pdb" Source="venvlauncher.pdb" KeyPath="yes" />
|
|
</Component>
|
|
<Component Id="venvwlauncher.pdb" Directory="Lib_venv_scripts_nt__pdbs" Guid="*">
|
|
<File Name="pythonw.pdb" Source="venvwlauncher.pdb" KeyPath="yes" />
|
|
</Component>
|
|
</ComponentGroup>
|
|
</Fragment>
|
|
|
|
<Fragment>
|
|
<!-- The auto-generated directory is not available when building debug binaries -->
|
|
<DirectoryRef Id="Lib">
|
|
<Directory Id="Lib_venv__d" Name="venv">
|
|
<Directory Id="Lib_venv_scripts__d" Name="scripts">
|
|
<Directory Id="Lib_venv_scripts_nt__d" Name="nt" />
|
|
</Directory>
|
|
</Directory>
|
|
</DirectoryRef>
|
|
|
|
<ComponentGroup Id="lib_extensions_d">
|
|
<?foreach ext in $(var.exts)?>
|
|
|
|
<Component Id="$(var.ext)_d.pyd" Directory="DLLs" Guid="*">
|
|
<File Name="$(var.ext)_d.pyd" />
|
|
</Component>
|
|
<Component Id="$(var.ext)_d.pdb" Directory="DLLs" Guid="*">
|
|
<File Name="$(var.ext)_d.pdb" />
|
|
</Component>
|
|
|
|
<?endforeach ?>
|
|
|
|
<Component Id="sqlite3_d.dll" Directory="DLLs" Guid="*">
|
|
<File Name="sqlite3_d.dll" KeyPath="yes" />
|
|
</Component>
|
|
<Component Id="sqlite3_d.pdb" Directory="DLLs" Guid="*">
|
|
<File Name="sqlite3_d.pdb" KeyPath="yes" />
|
|
</Component>
|
|
<Component Id="venvlauncher_d.exe" Directory="Lib_venv_scripts_nt__d" Guid="*">
|
|
<File Name="python_d.exe" Source="venvlauncher_d.exe" KeyPath="yes" />
|
|
</Component>
|
|
<Component Id="venvwlauncher_d.exe" Directory="Lib_venv_scripts_nt__d" Guid="*">
|
|
<File Name="pythonw_d.exe" Source="venvwlauncher_d.exe" KeyPath="yes" />
|
|
</Component>
|
|
</ComponentGroup>
|
|
</Fragment>
|
|
<Fragment>
|
|
<PropertyRef Id="REGISTRYKEY" />
|
|
|
|
<ComponentGroup Id="lib_files">
|
|
<Component Id="PythonPathRegistry" Directory="Lib" Guid="*">
|
|
<RegistryKey Root="HKMU" Key="[REGISTRYKEY]">
|
|
<RegistryValue Key="PythonPath" Type="string" Value="[Lib];[DLLs]" />
|
|
</RegistryKey>
|
|
</Component>
|
|
<Component Id="Lib2to3_pickle_remove" Directory="Lib_lib2to3" Guid="$(var.RemoveLib2to3PickleComponentGuid)">
|
|
<RemoveFile Id="Lib2to3_pickle_remove_files" Name="*.pickle" On="uninstall" />
|
|
<RemoveFolder Id="Lib2to3_pickle_remove_folder" On="uninstall" />
|
|
</Component>
|
|
</ComponentGroup>
|
|
</Fragment>
|
|
<Fragment>
|
|
<ComponentGroup Id="lib_cat">
|
|
<Component Id="lib_cat" Directory="Catalogs" Guid="*">
|
|
<File Name="python_lib.cat" KeyPath="yes" />
|
|
</Component>
|
|
</ComponentGroup>
|
|
</Fragment>
|
|
</Wix>
|