win build: update wine
- the windows build broke with https://github.com/spesmilo/electrum/commit/184e122c36555b23bd466cb7a2521c09a09ce6cc - upstream fix being pulled in is https://github.com/pyinstaller/pyinstaller/pull/6701 log excerpt of failed build: ``` 💬 INFO: Installing PyInstaller. Processing c:\electrum\contrib\build-wine\.cache\win32\pyinstaller Preparing metadata (pyproject.toml) ... error error: subprocess-exited-with-error × Preparing metadata (pyproject.toml) did not run successfully. │ exit code: 1 ╰─> [42 lines of output] Traceback (most recent call last): File "C:\python3\lib\site-packages\pip\_vendor\pep517\in_process\_in_process.py", line 363, in < module> main() File "C:\python3\lib\site-packages\pip\_vendor\pep517\in_process\_in_process.py", line 345, in m ain json_out['return_val'] = hook(**hook_input['kwargs']) File "C:\python3\lib\site-packages\pip\_vendor\pep517\in_process\_in_process.py", line 164, in p repare_metadata_for_build_wheel return hook(metadata_directory, config_settings) File "C:\python3\lib\site-packages\setuptools\build_meta.py", line 188, in prepare_metadata_for_ build_wheel self.run_setup() File "C:\python3\lib\site-packages\setuptools\build_meta.py", line 281, in run_setup super(_BuildMetaLegacyBackend, File "C:\python3\lib\site-packages\setuptools\build_meta.py", line 174, in run_setup exec(compile(code, __file__, 'exec'), locals()) File "setup.py", line 249, in <module> setup( File "C:\python3\lib\site-packages\setuptools\__init__.py", line 87, in setup return distutils.core.setup(**attrs) File "C:\python3\lib\site-packages\setuptools\_distutils\core.py", line 122, in setup dist.parse_config_files() File "C:\python3\lib\site-packages\setuptools\dist.py", line 850, in parse_config_files setupcfg.parse_configuration( File "C:\python3\lib\site-packages\setuptools\config\setupcfg.py", line 167, in parse_configurat ion meta.parse() File "C:\python3\lib\site-packages\setuptools\config\setupcfg.py", line 446, in parse section_parser_method(section_options) File "C:\python3\lib\site-packages\setuptools\config\setupcfg.py", line 417, in parse_section self[name] = value File "C:\python3\lib\site-packages\setuptools\config\setupcfg.py", line 238, in __setitem__ value = parser(value) File "C:\python3\lib\site-packages\setuptools\config\setupcfg.py", line 552, in _parse_version return expand.version(self._parse_attr(value, self.package_dir, self.root_dir)) File "C:\python3\lib\site-packages\setuptools\config\setupcfg.py", line 372, in _parse_attr return expand.read_attr(attr_desc, package_dir, root_dir) File "C:\python3\lib\site-packages\setuptools\config\expand.py", line 194, in read_attr module = _load_spec(spec, module_name) File "C:\python3\lib\site-packages\setuptools\config\expand.py", line 214, in _load_spec spec.loader.exec_module(module) # type: ignore File "<frozen importlib._bootstrap_external>", line 850, in exec_module File "<frozen importlib._bootstrap>", line 228, in _call_with_frames_removed File "C:\electrum\contrib\build-wine\.cache\win32\pyinstaller\PyInstaller.py", line 15, in <modu le> from PyInstaller.__main__ import run ModuleNotFoundError: No module named 'PyInstaller.__main__'; 'PyInstaller' is not a package [end of output] note: This error originates from a subprocess, and is likely not a problem with pip. error: metadata-generation-failed × Encountered error while generating package metadata. ╰─> See above for output. note: This is an issue with the package mentioned above, not pip. hint: See above for details. 🗯 ERROR: prepare-wine failed ```
This commit is contained in:
@@ -6,7 +6,7 @@ NSIS_URL=https://downloads.sourceforge.net/project/nsis/NSIS%203/3.08/$NSIS_FILE
|
||||
NSIS_SHA256=bbc76be36ecb2fc00d493c91befdaf71654226ad8a4fc4dc338458916bf224d0
|
||||
|
||||
PYINSTALLER_REPO="https://github.com/pyinstaller/pyinstaller.git"
|
||||
PYINSTALLER_COMMIT="63438b1842eacd7f081fc53f1f5212bc20b7d02e"
|
||||
PYINSTALLER_COMMIT="0fe956a2c6157e1b276819de1a050c242de70a29"
|
||||
# ^ latest commit from "v4" branch, somewhat after "4.10" tag
|
||||
|
||||
PYTHON_VERSION=3.9.11
|
||||
|
||||
Reference in New Issue
Block a user