Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-pyinstaller-hooks-contrib for openSUSE:Factory checked in at 2023-02-16 16:55:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-pyinstaller-hooks-contrib (Old) and /work/SRC/openSUSE:Factory/.python-pyinstaller-hooks-contrib.new.22824 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-pyinstaller-hooks-contrib" Thu Feb 16 16:55:43 2023 rev:5 rq:1065968 version:2023.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-pyinstaller-hooks-contrib/python-pyinstaller-hooks-contrib.changes 2022-12-15 19:25:04.536012064 +0100 +++ /work/SRC/openSUSE:Factory/.python-pyinstaller-hooks-contrib.new.22824/python-pyinstaller-hooks-contrib.changes 2023-02-16 16:55:57.734727090 +0100 @@ -1,0 +2,22 @@ +Wed Feb 15 11:35:07 UTC 2023 - Daniel Garcia <daniel.gar...@suse.com> + +- Disable broken sklearn tests gh#pyinstaller/pyinstaller-hooks-contrib#547 +- Update to version 2023.0 + * Add hook for minecraft-launcher-lib (#536) + * Add hook for nbt (#537) + * Have fiona hook collect the package's data files (e.g., the projections + database). (#541) + * Update fiona hook for compatibility with fiona 1.9.0. (#541) +- Update to version 2022.15 + * Add a hook for easyocr, which imports recognition backends via + imporlib.import_module() and has a number of datafiles for different + languages. + * Users can set which languages to include datafiles for with a hook option. + (#530) + * Add hook for charset-normalizer to fix ModuleNotFoundError: No module + named 'charset_normalizer.md__mypyc'. (#534) + * Update shapely hook for compatibility with shapely >= 2.0.0. (#527) + * Added hooks-config.rst document which documents hook options. It is + referred to from README.md. (#530) + +------------------------------------------------------------------- Old: ---- pyinstaller-hooks-contrib-2022.14.tar.gz New: ---- pyinstaller-hooks-contrib-2023.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-pyinstaller-hooks-contrib.spec ++++++ --- /var/tmp/diff_new_pack.9nYRJs/_old 2023-02-16 16:55:58.366729616 +0100 +++ /var/tmp/diff_new_pack.9nYRJs/_new 2023-02-16 16:55:58.370729633 +0100 @@ -1,7 +1,7 @@ # # spec file # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,7 +16,6 @@ # -%{?!python_module:%define python_module() python-%{**} python3-%{**}} %global flavor @BUILD_FLAVOR@%{nil} %if "%{flavor}" == "test" %define psuffix -%{flavor} @@ -26,7 +25,7 @@ %bcond_with test %endif Name: python-pyinstaller-hooks-contrib%{psuffix} -Version: 2022.14 +Version: 2023.0 Release: 0 Summary: Community maintained hooks for PyInstaller License: Apache-2.0 OR GPL-2.0-only @@ -44,7 +43,10 @@ BuildRequires: timezone # SECTION optional, the depending tests would be skipped without these # most of the libraries enable only two tests, so adding just scikit-learn to run at least any tests -BuildRequires: %{python_module scikit-learn} +# +# Disabled because it's broken with the latest release 1.2.1 +# gh#pyinstaller/pyinstaller-hooks-contrib#547 +# BuildRequires: %{python_module scikit-learn} # /SECTION %endif %python_subpackages @@ -53,7 +55,7 @@ Community maintained hooks for PyInstaller %prep -%setup -q -n pyinstaller-hooks-contrib-%{version} +%autosetup -p1 -n pyinstaller-hooks-contrib-%{version} %build %python_build @@ -73,7 +75,8 @@ %files %{python_files} %doc README.md %license LICENSE LICENSE.APL.txt LICENSE.GPL.txt -%{python_sitelib}/* +%{python_sitelib}/_pyinstaller_hooks_contrib +%{python_sitelib}/pyinstaller_hooks_contrib-%{version}*-info %endif %changelog ++++++ pyinstaller-hooks-contrib-2022.14.tar.gz -> pyinstaller-hooks-contrib-2023.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyinstaller-hooks-contrib-2022.14/PKG-INFO new/pyinstaller-hooks-contrib-2023.0/PKG-INFO --- old/pyinstaller-hooks-contrib-2022.14/PKG-INFO 2022-12-04 16:12:11.688008500 +0100 +++ new/pyinstaller-hooks-contrib-2023.0/PKG-INFO 2023-02-13 20:50:12.372752000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: pyinstaller-hooks-contrib -Version: 2022.14 +Version: 2023.0 Summary: Community maintained hooks for PyInstaller Home-page: https://github.com/pyinstaller/pyinstaller-hooks-contrib Download-URL: https://pypi.org/project/pyinstaller-hooks-contrib @@ -49,6 +49,12 @@ please see below. +## Hook configuration (options) + +Hooks that support configuration (options) and their options are documented in +[Supported hooks and options](hooks-config.rst). + + ## I want to help! If you've got a hook you want to share then great! diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyinstaller-hooks-contrib-2022.14/README.md new/pyinstaller-hooks-contrib-2023.0/README.md --- old/pyinstaller-hooks-contrib-2022.14/README.md 2022-12-04 16:12:01.000000000 +0100 +++ new/pyinstaller-hooks-contrib-2023.0/README.md 2023-02-13 20:50:02.000000000 +0100 @@ -28,6 +28,12 @@ please see below. +## Hook configuration (options) + +Hooks that support configuration (options) and their options are documented in +[Supported hooks and options](hooks-config.rst). + + ## I want to help! If you've got a hook you want to share then great! diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyinstaller-hooks-contrib-2022.14/src/_pyinstaller_hooks_contrib/__init__.py new/pyinstaller-hooks-contrib-2023.0/src/_pyinstaller_hooks_contrib/__init__.py --- old/pyinstaller-hooks-contrib-2022.14/src/_pyinstaller_hooks_contrib/__init__.py 2022-12-04 16:12:01.000000000 +0100 +++ new/pyinstaller-hooks-contrib-2023.0/src/_pyinstaller_hooks_contrib/__init__.py 2023-02-13 20:50:02.000000000 +0100 @@ -10,6 +10,6 @@ # SPDX-License-Identifier: GPL-2.0-or-later # ------------------------------------------------------------------ -__version__ = '2022.14' +__version__ = '2023.0' __maintainer__ = 'Legorooj, bwoodsend' __uri__ = 'https://github.com/pyinstaller/pyinstaller-hooks-contrib' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyinstaller-hooks-contrib-2022.14/src/_pyinstaller_hooks_contrib/hooks/stdhooks/hook-charset_normalizer.py new/pyinstaller-hooks-contrib-2023.0/src/_pyinstaller_hooks_contrib/hooks/stdhooks/hook-charset_normalizer.py --- old/pyinstaller-hooks-contrib-2022.14/src/_pyinstaller_hooks_contrib/hooks/stdhooks/hook-charset_normalizer.py 1970-01-01 01:00:00.000000000 +0100 +++ new/pyinstaller-hooks-contrib-2023.0/src/_pyinstaller_hooks_contrib/hooks/stdhooks/hook-charset_normalizer.py 2023-02-13 20:50:02.000000000 +0100 @@ -0,0 +1,16 @@ +# ------------------------------------------------------------------ +# Copyright (c) 2023 PyInstaller Development Team. +# +# This file is distributed under the terms of the GNU General Public +# License (version 2.0 or later). +# +# The full license is available in LICENSE.GPL.txt, distributed with +# this software. +# +# SPDX-License-Identifier: GPL-2.0-or-later +# ------------------------------------------------------------------ + +from PyInstaller.utils.hooks import is_module_satisfies + +if is_module_satisfies("charset_normalizer >= 3.0.1"): + hiddenimports = ["charset_normalizer.md__mypyc"] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyinstaller-hooks-contrib-2022.14/src/_pyinstaller_hooks_contrib/hooks/stdhooks/hook-easyocr.py new/pyinstaller-hooks-contrib-2023.0/src/_pyinstaller_hooks_contrib/hooks/stdhooks/hook-easyocr.py --- old/pyinstaller-hooks-contrib-2022.14/src/_pyinstaller_hooks_contrib/hooks/stdhooks/hook-easyocr.py 1970-01-01 01:00:00.000000000 +0100 +++ new/pyinstaller-hooks-contrib-2023.0/src/_pyinstaller_hooks_contrib/hooks/stdhooks/hook-easyocr.py 2023-02-13 20:50:02.000000000 +0100 @@ -0,0 +1,18 @@ +from PyInstaller.utils.hooks import collect_data_files, get_hook_config + +# Recognition backends are imported with `importlib.import_module()`. +hiddenimports = ['easyocr.model.vgg_model', 'easyocr.model.model'] + + +def hook(hook_api): + lang_codes = get_hook_config(hook_api, 'easyocr', 'lang_codes') + if not lang_codes: + lang_codes = ['*'] + + extra_datas = list() + extra_datas += collect_data_files('easyocr', include_py_files=False, subdir='character', + includes=[f'{lang_code}_char.txt' for lang_code in lang_codes]) + extra_datas += collect_data_files('easyocr', include_py_files=False, subdir='dict', + includes=[f'{lang_code}.txt' for lang_code in lang_codes]) + + hook_api.add_datas(extra_datas) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyinstaller-hooks-contrib-2022.14/src/_pyinstaller_hooks_contrib/hooks/stdhooks/hook-fiona.py new/pyinstaller-hooks-contrib-2023.0/src/_pyinstaller_hooks_contrib/hooks/stdhooks/hook-fiona.py --- old/pyinstaller-hooks-contrib-2022.14/src/_pyinstaller_hooks_contrib/hooks/stdhooks/hook-fiona.py 2022-12-04 16:12:01.000000000 +0100 +++ new/pyinstaller-hooks-contrib-2023.0/src/_pyinstaller_hooks_contrib/hooks/stdhooks/hook-fiona.py 2023-02-13 20:50:02.000000000 +0100 @@ -10,8 +10,17 @@ # SPDX-License-Identifier: GPL-2.0-or-later # ------------------------------------------------------------------ +from PyInstaller.utils.hooks import collect_data_files, is_module_satisfies + hiddenimports = [ "fiona._shim", "fiona.schema", "json", ] + +# As of fiona 1.9.0, `fiona.enums` is also a hidden import, made in cythonized `fiona.crs`. +if is_module_satisfies("fiona >= 1.9.0"): + hiddenimports.append("fiona.enums") + +# Collect data files that are part of the package (e.g., projections database) +datas = collect_data_files("fiona") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyinstaller-hooks-contrib-2022.14/src/_pyinstaller_hooks_contrib/hooks/stdhooks/hook-minecraft_launcher_lib.py new/pyinstaller-hooks-contrib-2023.0/src/_pyinstaller_hooks_contrib/hooks/stdhooks/hook-minecraft_launcher_lib.py --- old/pyinstaller-hooks-contrib-2022.14/src/_pyinstaller_hooks_contrib/hooks/stdhooks/hook-minecraft_launcher_lib.py 1970-01-01 01:00:00.000000000 +0100 +++ new/pyinstaller-hooks-contrib-2023.0/src/_pyinstaller_hooks_contrib/hooks/stdhooks/hook-minecraft_launcher_lib.py 2023-02-13 20:50:02.000000000 +0100 @@ -0,0 +1,14 @@ +# ------------------------------------------------------------------ +# Copyright (c) 2023 PyInstaller Development Team. +# +# This file is distributed under the terms of the GNU General Public +# License (version 2.0 or later). +# +# The full license is available in LICENSE.GPL.txt, distributed with +# this software. +# +# SPDX-License-Identifier: GPL-2.0-or-later +# ------------------------------------------------------------------ +from PyInstaller.utils.hooks import collect_data_files + +datas = collect_data_files("minecraft_launcher_lib") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyinstaller-hooks-contrib-2022.14/src/_pyinstaller_hooks_contrib/hooks/stdhooks/hook-nbt.py new/pyinstaller-hooks-contrib-2023.0/src/_pyinstaller_hooks_contrib/hooks/stdhooks/hook-nbt.py --- old/pyinstaller-hooks-contrib-2022.14/src/_pyinstaller_hooks_contrib/hooks/stdhooks/hook-nbt.py 1970-01-01 01:00:00.000000000 +0100 +++ new/pyinstaller-hooks-contrib-2023.0/src/_pyinstaller_hooks_contrib/hooks/stdhooks/hook-nbt.py 2023-02-13 20:50:02.000000000 +0100 @@ -0,0 +1,12 @@ +# ------------------------------------------------------------------ +# Copyright (c) 2023 PyInstaller Development Team. +# +# This file is distributed under the terms of the GNU General Public +# License (version 2.0 or later). +# +# The full license is available in LICENSE.GPL.txt, distributed with +# this software. +# +# SPDX-License-Identifier: GPL-2.0-or-later +# ------------------------------------------------------------------ +hiddenimports = ["nbt.nbt", "nbt.world", "nbt.region", "nbt.chunk"] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyinstaller-hooks-contrib-2022.14/src/_pyinstaller_hooks_contrib/hooks/stdhooks/hook-shapely.py new/pyinstaller-hooks-contrib-2023.0/src/_pyinstaller_hooks_contrib/hooks/stdhooks/hook-shapely.py --- old/pyinstaller-hooks-contrib-2022.14/src/_pyinstaller_hooks_contrib/hooks/stdhooks/hook-shapely.py 2022-12-04 16:12:01.000000000 +0100 +++ new/pyinstaller-hooks-contrib-2023.0/src/_pyinstaller_hooks_contrib/hooks/stdhooks/hook-shapely.py 2023-02-13 20:50:02.000000000 +0100 @@ -20,8 +20,13 @@ # Necessary when using the vectorized subpackage hiddenimports = ['shapely.prepared'] -pkg_base, pkg_dir = get_package_paths('shapely') +if is_module_satisfies('shapely >= 2.0.0'): + # An import made in the `shapely.geometry_helpers` extension; both `shapely.geometry_helpers` and `shapely._geos` + # extensions were introduced in v2.0.0. + hiddenimports += ['shapely._geos'] + +pkg_base, pkg_dir = get_package_paths('shapely') binaries = [] datas = [] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyinstaller-hooks-contrib-2022.14/src/_pyinstaller_hooks_contrib/tests/test_libraries.py new/pyinstaller-hooks-contrib-2023.0/src/_pyinstaller_hooks_contrib/tests/test_libraries.py --- old/pyinstaller-hooks-contrib-2022.14/src/_pyinstaller_hooks_contrib/tests/test_libraries.py 2022-12-04 16:12:01.000000000 +0100 +++ new/pyinstaller-hooks-contrib-2023.0/src/_pyinstaller_hooks_contrib/tests/test_libraries.py 2023-02-13 20:50:02.000000000 +0100 @@ -28,6 +28,38 @@ ''' ) + +@importorskip('fiona') +def test_fiona_transform(pyi_builder): + # Test that fiona in frozen application has access to its projections database. If projection data is unavailable, + # the transform becomes an identity transform. + pyi_builder.test_source( + """ + from fiona.transform import transform_geom + from fiona.crs import from_epsg + + eiffel_tower = { + 'type': 'Point', + 'coordinates': (2.294694, 48.858093), + } + + crs_source = from_epsg(4326) # WGS84 + crs_target = from_epsg(25831) # ETRS89 / UTM zone 31N + + transformed = transform_geom(crs_source, crs_target, eiffel_tower) + print(f"Transformed point: {transformed}") + + # Expected coordinates: obtained by manually running this program unfrozen + EXPECTED_COORDINATES = (448265.9146792292, 5411920.651338793) + EPS = 1e-6 + + delta = [abs(value - expected) for value, expected in zip(transformed["coordinates"], EXPECTED_COORDINATES)] + print(f"Delta: {delta}") + assert all([value < EPS for value in delta]), f"Delta {delta} exceeds threshold!" + """ + ) + + @importorskip('jinxed') def test_jinxed(pyi_builder): pyi_builder.test_source( @@ -1426,6 +1458,16 @@ """) +@importorskip('charset_normalizer') +def test_charset_normalizer(pyi_builder): + pyi_builder.test_source(""" + import base64 + import charset_normalizer + message = base64.b64decode(b"yUCEmYWBlIWEQIFAhJmFgZRAloZAgUCUlpmFQKKFlaKJgpOFQJeBg5KBh4U=") + print(charset_normalizer.from_bytes(message).best()) + """) + + @importorskip('cf_units') def test_cf_units(pyi_builder): pyi_builder.test_source(""" @@ -1467,3 +1509,20 @@ print("Return value:", return_value) print("Errors occurred:", errors) """, app_args=[str(input_file)]) + + +@importorskip('nbt') +def test_nbt(pyi_builder): + pyi_builder.test_source(""" + import nbt + """) + + +@importorskip('minecraft_launcher_lib') +def test_minecraft_launcher_lib(pyi_builder): + pyi_builder.test_source( + ''' + import minecraft_launcher_lib + assert isinstance(minecraft_launcher_lib.utils.get_library_version(), str) + ''' + ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyinstaller-hooks-contrib-2022.14/src/pyinstaller_hooks_contrib.egg-info/PKG-INFO new/pyinstaller-hooks-contrib-2023.0/src/pyinstaller_hooks_contrib.egg-info/PKG-INFO --- old/pyinstaller-hooks-contrib-2022.14/src/pyinstaller_hooks_contrib.egg-info/PKG-INFO 2022-12-04 16:12:11.000000000 +0100 +++ new/pyinstaller-hooks-contrib-2023.0/src/pyinstaller_hooks_contrib.egg-info/PKG-INFO 2023-02-13 20:50:12.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: pyinstaller-hooks-contrib -Version: 2022.14 +Version: 2023.0 Summary: Community maintained hooks for PyInstaller Home-page: https://github.com/pyinstaller/pyinstaller-hooks-contrib Download-URL: https://pypi.org/project/pyinstaller-hooks-contrib @@ -49,6 +49,12 @@ please see below. +## Hook configuration (options) + +Hooks that support configuration (options) and their options are documented in +[Supported hooks and options](hooks-config.rst). + + ## I want to help! If you've got a hook you want to share then great! diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyinstaller-hooks-contrib-2022.14/src/pyinstaller_hooks_contrib.egg-info/SOURCES.txt new/pyinstaller-hooks-contrib-2023.0/src/pyinstaller_hooks_contrib.egg-info/SOURCES.txt --- old/pyinstaller-hooks-contrib-2022.14/src/pyinstaller_hooks_contrib.egg-info/SOURCES.txt 2022-12-04 16:12:11.000000000 +0100 +++ new/pyinstaller-hooks-contrib-2023.0/src/pyinstaller_hooks_contrib.egg-info/SOURCES.txt 2023-02-13 20:50:12.000000000 +0100 @@ -69,6 +69,7 @@ src/_pyinstaller_hooks_contrib/hooks/stdhooks/hook-certifi.py src/_pyinstaller_hooks_contrib/hooks/stdhooks/hook-cf_units.py src/_pyinstaller_hooks_contrib/hooks/stdhooks/hook-cftime.py +src/_pyinstaller_hooks_contrib/hooks/stdhooks/hook-charset_normalizer.py src/_pyinstaller_hooks_contrib/hooks/stdhooks/hook-cloudscraper.py src/_pyinstaller_hooks_contrib/hooks/stdhooks/hook-clr.py src/_pyinstaller_hooks_contrib/hooks/stdhooks/hook-clr_loader.py @@ -96,6 +97,7 @@ src/_pyinstaller_hooks_contrib/hooks/stdhooks/hook-docx.py src/_pyinstaller_hooks_contrib/hooks/stdhooks/hook-docx2pdf.py src/_pyinstaller_hooks_contrib/hooks/stdhooks/hook-dynaconf.py +src/_pyinstaller_hooks_contrib/hooks/stdhooks/hook-easyocr.py src/_pyinstaller_hooks_contrib/hooks/stdhooks/hook-eel.py src/_pyinstaller_hooks_contrib/hooks/stdhooks/hook-enchant.py src/_pyinstaller_hooks_contrib/hooks/stdhooks/hook-enzyme.parsers.ebml.core.py @@ -177,6 +179,7 @@ src/_pyinstaller_hooks_contrib/hooks/stdhooks/hook-metpy.py src/_pyinstaller_hooks_contrib/hooks/stdhooks/hook-migrate.py src/_pyinstaller_hooks_contrib/hooks/stdhooks/hook-mimesis.py +src/_pyinstaller_hooks_contrib/hooks/stdhooks/hook-minecraft_launcher_lib.py src/_pyinstaller_hooks_contrib/hooks/stdhooks/hook-mnemonic.py src/_pyinstaller_hooks_contrib/hooks/stdhooks/hook-mpl_toolkits.basemap.py src/_pyinstaller_hooks_contrib/hooks/stdhooks/hook-msoffcrypto.py @@ -186,6 +189,7 @@ src/_pyinstaller_hooks_contrib/hooks/stdhooks/hook-nbconvert.py src/_pyinstaller_hooks_contrib/hooks/stdhooks/hook-nbdime.py src/_pyinstaller_hooks_contrib/hooks/stdhooks/hook-nbformat.py +src/_pyinstaller_hooks_contrib/hooks/stdhooks/hook-nbt.py src/_pyinstaller_hooks_contrib/hooks/stdhooks/hook-ncclient.py src/_pyinstaller_hooks_contrib/hooks/stdhooks/hook-netCDF4.py src/_pyinstaller_hooks_contrib/hooks/stdhooks/hook-nltk.py