dmoonfire/dosage
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Activity

Merge pull request #327 from webcomics/windows-py-3.12

Browse source 
Update Windows build to Python 3.12
This commit is contained in:
Tobias Gruetzmacher 2024-06-13 23:59:28 +02:00 committed by GitHub
commit e7858373f6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Jenkinsfile vendored
View file

@ -74,7 +74,7 @@ pys.each { py ->
parallel(tasks) parallel(tasks)
parallel modern: { parallel modern: {
stage('Modern Windows binary') { stage('Modern Windows binary') {
windowsBuild('3.11', 'dosage.exe') windowsBuild('3.12', 'dosage.exe')
} }
}, },
legacy: { legacy: {

30
scripts/dosage.spec
View file

@ -1,28 +1,30 @@
# SPDX-License-Identifier: MIT # SPDX-License-Identifier: MIT
# Copyright (C) 2017-2020 Tobias Gruetzmacher # SPDX-FileCopyrightText: © 2017 Tobias Gruetzmacher
import re
from importlib import metadata
# Idea from # Idea from
# https://github.com/pyinstaller/pyinstaller/wiki/Recipe-Setuptools-Entry-Point, # https://github.com/pyinstaller/pyinstaller/wiki/Recipe-Setuptools-Entry-Point,
# but with importlib # but with importlib
def Entrypoint(group, name, **kwargs): def entrypoint(group, name, **kwargs):
import re
try:
from importlib.metadata import entry_points
except ImportError:
from importlib_metadata import entry_points
# get the entry point # get the entry point
eps = entry_points()[group] eps = metadata.entry_points()
ep = next(ep for ep in eps if ep.name == name) if 'select' in dir(eps):
module, attr = re.split(r'\s*:\s*', ep.value, 1) # modern
ep = eps.select(group=group)[name]
else:
# legacy (pre-3.10)
ep = next(ep for ep in eps[group] if ep.name == name)
module, attr = re.split(r'\s*:\s*', ep.value, maxsplit=1)
# script name must not be a valid module name to avoid name clashes on import # script name must not be a valid module name to avoid name clashes on import
script_path = os.path.join(workpath, name + '-script.py') script_path = os.path.join(workpath, name + '-script.py')
print("creating script for entry point", group, name) print("creating script for entry point", group, name)
with open(script_path, 'w') as fh: with open(script_path, mode='w', encoding='utf-8') as fh:
print("import sys", file=fh) print("import sys", file=fh)
print("import", module, file=fh) print("import", module, file=fh)
print("sys.exit(%s.%s())" % (module, attr), file=fh) print(f"sys.exit({module}.{attr}())", file=fh)
return Analysis( return Analysis(
[script_path] + kwargs.get('scripts', []), [script_path] + kwargs.get('scripts', []),
@ -30,7 +32,7 @@ def Entrypoint(group, name, **kwargs):
) )
a = Entrypoint('console_scripts', 'dosage') a = entrypoint('console_scripts', 'dosage')
a.binaries = [x for x in a.binaries if not x[1].lower().startswith(r'c:\windows')] a.binaries = [x for x in a.binaries if not x[1].lower().startswith(r'c:\windows')]