import CS python3.12-3.12.1-4.el9
This commit is contained in:
parent
f9ce1a91ae
commit
b9dae68211
@ -16,7 +16,6 @@ LEVELS = (None, 1, 2)
|
|||||||
# list of globs of test and other files that we expect not to have bytecode
|
# list of globs of test and other files that we expect not to have bytecode
|
||||||
not_compiled = [
|
not_compiled = [
|
||||||
'/usr/bin/*',
|
'/usr/bin/*',
|
||||||
'/usr/lib/rpm/redhat/*',
|
|
||||||
'*/test/badsyntax_*.py',
|
'*/test/badsyntax_*.py',
|
||||||
'*/tokenizedata/bad_coding.py',
|
'*/tokenizedata/bad_coding.py',
|
||||||
'*/tokenizedata/bad_coding2.py',
|
'*/tokenizedata/bad_coding2.py',
|
||||||
|
@ -1,171 +0,0 @@
|
|||||||
'''Script to perform import of each module given to %%py_check_import
|
|
||||||
'''
|
|
||||||
import argparse
|
|
||||||
import importlib
|
|
||||||
import fnmatch
|
|
||||||
import os
|
|
||||||
import re
|
|
||||||
import site
|
|
||||||
import sys
|
|
||||||
|
|
||||||
from contextlib import contextmanager
|
|
||||||
from pathlib import Path
|
|
||||||
|
|
||||||
|
|
||||||
def read_modules_files(file_paths):
|
|
||||||
'''Read module names from the files (modules must be newline separated).
|
|
||||||
|
|
||||||
Return the module names list or, if no files were provided, an empty list.
|
|
||||||
'''
|
|
||||||
|
|
||||||
if not file_paths:
|
|
||||||
return []
|
|
||||||
|
|
||||||
modules = []
|
|
||||||
for file in file_paths:
|
|
||||||
file_contents = file.read_text()
|
|
||||||
modules.extend(file_contents.split())
|
|
||||||
return modules
|
|
||||||
|
|
||||||
|
|
||||||
def read_modules_from_cli(argv):
|
|
||||||
'''Read module names from command-line arguments (space or comma separated).
|
|
||||||
|
|
||||||
Return the module names list.
|
|
||||||
'''
|
|
||||||
|
|
||||||
if not argv:
|
|
||||||
return []
|
|
||||||
|
|
||||||
# %%py3_check_import allows to separate module list with comma or whitespace,
|
|
||||||
# we need to unify the output to a list of particular elements
|
|
||||||
modules_as_str = ' '.join(argv)
|
|
||||||
modules = re.split(r'[\s,]+', modules_as_str)
|
|
||||||
# Because of shell expansion in some less typical cases it may happen
|
|
||||||
# that a trailing space will occur at the end of the list.
|
|
||||||
# Remove the empty items from the list before passing it further
|
|
||||||
modules = [m for m in modules if m]
|
|
||||||
return modules
|
|
||||||
|
|
||||||
|
|
||||||
def filter_top_level_modules_only(modules):
|
|
||||||
'''Filter out entries with nested modules (containing dot) ie. 'foo.bar'.
|
|
||||||
|
|
||||||
Return the list of top-level modules.
|
|
||||||
'''
|
|
||||||
|
|
||||||
return [module for module in modules if '.' not in module]
|
|
||||||
|
|
||||||
|
|
||||||
def any_match(text, globs):
|
|
||||||
'''Return True if any of given globs fnmatchcase's the given text.'''
|
|
||||||
|
|
||||||
return any(fnmatch.fnmatchcase(text, g) for g in globs)
|
|
||||||
|
|
||||||
|
|
||||||
def exclude_unwanted_module_globs(globs, modules):
|
|
||||||
'''Filter out entries which match the either of the globs given as argv.
|
|
||||||
|
|
||||||
Return the list of filtered modules.
|
|
||||||
'''
|
|
||||||
|
|
||||||
return [m for m in modules if not any_match(m, globs)]
|
|
||||||
|
|
||||||
|
|
||||||
def read_modules_from_all_args(args):
|
|
||||||
'''Return a joined list of modules from all given command-line arguments.
|
|
||||||
'''
|
|
||||||
|
|
||||||
modules = read_modules_files(args.filename)
|
|
||||||
modules.extend(read_modules_from_cli(args.modules))
|
|
||||||
if args.exclude:
|
|
||||||
modules = exclude_unwanted_module_globs(args.exclude, modules)
|
|
||||||
|
|
||||||
if args.top_level:
|
|
||||||
modules = filter_top_level_modules_only(modules)
|
|
||||||
|
|
||||||
# Error when someone accidentally managed to filter out everything
|
|
||||||
if len(modules) == 0:
|
|
||||||
raise ValueError('No modules to check were left')
|
|
||||||
|
|
||||||
return modules
|
|
||||||
|
|
||||||
|
|
||||||
def import_modules(modules):
|
|
||||||
'''Procedure to perform import check for each module name from the given list of modules.
|
|
||||||
'''
|
|
||||||
|
|
||||||
for module in modules:
|
|
||||||
print('Check import:', module, file=sys.stderr)
|
|
||||||
importlib.import_module(module)
|
|
||||||
|
|
||||||
|
|
||||||
def argparser():
|
|
||||||
parser = argparse.ArgumentParser(
|
|
||||||
description='Generate list of all importable modules for import check.'
|
|
||||||
)
|
|
||||||
parser.add_argument(
|
|
||||||
'modules', nargs='*',
|
|
||||||
help=('Add modules to check the import (space or comma separated).'),
|
|
||||||
)
|
|
||||||
parser.add_argument(
|
|
||||||
'-f', '--filename', action='append', type=Path,
|
|
||||||
help='Add importable module names list from file.',
|
|
||||||
)
|
|
||||||
parser.add_argument(
|
|
||||||
'-t', '--top-level', action='store_true',
|
|
||||||
help='Check only top-level modules.',
|
|
||||||
)
|
|
||||||
parser.add_argument(
|
|
||||||
'-e', '--exclude', action='append',
|
|
||||||
help='Provide modules globs to be excluded from the check.',
|
|
||||||
)
|
|
||||||
return parser
|
|
||||||
|
|
||||||
|
|
||||||
@contextmanager
|
|
||||||
def remove_unwanteds_from_sys_path():
|
|
||||||
'''Remove cwd and this script's parent from sys.path for the import test.
|
|
||||||
Bring the original contents back after import is done (or failed)
|
|
||||||
'''
|
|
||||||
|
|
||||||
cwd_absolute = Path.cwd().absolute()
|
|
||||||
this_file_parent = Path(__file__).parent.absolute()
|
|
||||||
old_sys_path = list(sys.path)
|
|
||||||
for path in old_sys_path:
|
|
||||||
if Path(path).absolute() in (cwd_absolute, this_file_parent):
|
|
||||||
sys.path.remove(path)
|
|
||||||
try:
|
|
||||||
yield
|
|
||||||
finally:
|
|
||||||
sys.path = old_sys_path
|
|
||||||
|
|
||||||
|
|
||||||
def addsitedirs_from_environ():
|
|
||||||
'''Load directories from the _PYTHONSITE environment variable (separated by :)
|
|
||||||
and load the ones already present in sys.path via site.addsitedir()
|
|
||||||
to handle .pth files in them.
|
|
||||||
|
|
||||||
This is needed to properly import old-style namespace packages with nspkg.pth files.
|
|
||||||
See https://bugzilla.redhat.com/2018551 for a more detailed rationale.'''
|
|
||||||
for path in os.getenv('_PYTHONSITE', '').split(':'):
|
|
||||||
if path in sys.path:
|
|
||||||
site.addsitedir(path)
|
|
||||||
|
|
||||||
|
|
||||||
def main(argv=None):
|
|
||||||
|
|
||||||
cli_args = argparser().parse_args(argv)
|
|
||||||
|
|
||||||
if not cli_args.modules and not cli_args.filename:
|
|
||||||
raise ValueError('No modules to check were provided')
|
|
||||||
|
|
||||||
modules = read_modules_from_all_args(cli_args)
|
|
||||||
|
|
||||||
with remove_unwanteds_from_sys_path():
|
|
||||||
addsitedirs_from_environ()
|
|
||||||
import_modules(modules)
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
|
||||||
main()
|
|
@ -1,91 +0,0 @@
|
|||||||
%__python3 /usr/bin/python3.12
|
|
||||||
%python3_pkgversion 3.12
|
|
||||||
|
|
||||||
# The following are macros from macros.python3 in Fedora that are newer/different than those in the python3-rpm-macros package in RHEL 8.
|
|
||||||
# These macros overwrite/supercede some of the macros in the python3-rpm-macros package in RHEL.
|
|
||||||
|
|
||||||
# nb: $RPM_BUILD_ROOT is not set when the macros are expanded (at spec parse time)
|
|
||||||
# so we set it manually (to empty string), making our Python prefer the correct install scheme location
|
|
||||||
# platbase/base is explicitly set to %%{_prefix} to support custom values, such as /app for flatpaks
|
|
||||||
%python3_sitelib %(RPM_BUILD_ROOT= %{__python3} -Ic "import sysconfig; print(sysconfig.get_path('purelib', vars={'platbase': '%{_prefix}', 'base': '%{_prefix}'}))")
|
|
||||||
%python3_sitearch %(RPM_BUILD_ROOT= %{__python3} -Ic "import sysconfig; print(sysconfig.get_path('platlib', vars={'platbase': '%{_prefix}', 'base': '%{_prefix}'}))")
|
|
||||||
%python3_version %(RPM_BUILD_ROOT= %{__python3} -Ic "import sys; sys.stdout.write('{0.major}.{0.minor}'.format(sys.version_info))")
|
|
||||||
%python3_version_nodots %(RPM_BUILD_ROOT= %{__python3} -Ic "import sys; sys.stdout.write('{0.major}{0.minor}'.format(sys.version_info))")
|
|
||||||
%python3_platform %(RPM_BUILD_ROOT= %{__python3} -Ic "import sysconfig; print(sysconfig.get_platform())")
|
|
||||||
%python3_platform_triplet %(RPM_BUILD_ROOT= %{__python3} -Ic "import sysconfig; print(sysconfig.get_config_var('MULTIARCH'))")
|
|
||||||
%python3_ext_suffix %(RPM_BUILD_ROOT= %{__python3} -Ic "import sysconfig; print(sysconfig.get_config_var('EXT_SUFFIX'))")
|
|
||||||
%python3_cache_tag %(RPM_BUILD_ROOT= %{__python3} -Ic "import sys; print(sys.implementation.cache_tag)")
|
|
||||||
|
|
||||||
%_py3_shebang_s s
|
|
||||||
%_py3_shebang_P %(RPM_BUILD_ROOT= %{__python3} -Ic "import sys; print('P' if hasattr(sys.flags, 'safe_path') else '')")
|
|
||||||
%py3_shbang_opts -%{?_py3_shebang_s}%{?_py3_shebang_P}
|
|
||||||
|
|
||||||
%py3_shebang_fix %{expand:\\\
|
|
||||||
if [ -z "%{?py3_shebang_flags}" ]; then
|
|
||||||
shebang_flags="-k"
|
|
||||||
else
|
|
||||||
shebang_flags="-ka%{py3_shebang_flags}"
|
|
||||||
fi
|
|
||||||
%{__python3} -B %{_rpmconfigdir}/redhat/pathfix_py3_12.py -pni %{__python3} $shebang_flags}
|
|
||||||
|
|
||||||
%py3_install() %{expand:\\\
|
|
||||||
CFLAGS="${CFLAGS:-${RPM_OPT_FLAGS}}" LDFLAGS="${LDFLAGS:-${RPM_LD_FLAGS}}"\\\
|
|
||||||
%{__python3} %{py_setup} %{?py_setup_args} install -O1 --skip-build --root %{buildroot} --prefix %{_prefix} %{?*}
|
|
||||||
rm -rfv %{buildroot}%{_bindir}/__pycache__
|
|
||||||
}
|
|
||||||
|
|
||||||
%py3_install_egg() %{expand:\\\
|
|
||||||
mkdir -p %{buildroot}%{python3_sitelib}
|
|
||||||
%{__python3} -m easy_install -m --prefix %{buildroot}%{_prefix} -Z dist/*-py%{python3_version}.egg %{?*}
|
|
||||||
rm -rfv %{buildroot}%{_bindir}/__pycache__
|
|
||||||
}
|
|
||||||
|
|
||||||
%py3_install_wheel() %{expand:\\\
|
|
||||||
%{__python3} -m pip install -I dist/%{1} --root %{buildroot} --prefix %{_prefix} --no-deps --no-index --no-warn-script-location
|
|
||||||
rm -rfv %{buildroot}%{_bindir}/__pycache__
|
|
||||||
for distinfo in %{buildroot}%{python3_sitelib}/*.dist-info %{buildroot}%{python3_sitearch}/*.dist-info; do
|
|
||||||
if [ -f ${distinfo}/direct_url.json ]; then
|
|
||||||
rm -fv ${distinfo}/direct_url.json
|
|
||||||
sed -i '/direct_url.json/d' ${distinfo}/RECORD
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
}
|
|
||||||
|
|
||||||
# With $PATH and $PYTHONPATH set to the %%buildroot,
|
|
||||||
# try to import the Python 3 module(s) given as command-line args or read from file (-f).
|
|
||||||
# Respect the custom values of %%py3_shebang_flags or set nothing if it's undefined.
|
|
||||||
# Filter and check import on only top-level modules using -t flag.
|
|
||||||
# Exclude unwanted modules by passing their globs to -e option.
|
|
||||||
# Useful as a smoke test in %%check when running tests is not feasible.
|
|
||||||
# Use spaces or commas as separators if providing list directly.
|
|
||||||
# Use newlines as separators if providing list in a file.
|
|
||||||
%py3_check_import(e:tf:) %{expand:\\\
|
|
||||||
PATH="%{buildroot}%{_bindir}:$PATH"\\\
|
|
||||||
PYTHONPATH="${PYTHONPATH:-%{buildroot}%{python3_sitearch}:%{buildroot}%{python3_sitelib}}"\\\
|
|
||||||
_PYTHONSITE="%{buildroot}%{python3_sitearch}:%{buildroot}%{python3_sitelib}"\\\
|
|
||||||
PYTHONDONTWRITEBYTECODE=1\\\
|
|
||||||
%{lua:
|
|
||||||
local command = "%{__python3} "
|
|
||||||
if rpm.expand("%{?py3_shebang_flags}") ~= "" then
|
|
||||||
command = command .. "-%{py3_shebang_flags}"
|
|
||||||
end
|
|
||||||
command = command .. " %{_rpmconfigdir}/redhat/import_all_modules_py3_12.py "
|
|
||||||
-- handle multiline arguments correctly, see https://bugzilla.redhat.com/2018809
|
|
||||||
local args=rpm.expand('%{?**}'):gsub("[%s\\\\]*%s+", " ")
|
|
||||||
print(command .. args)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
# Environment variables used by %%pytest, %%tox or standalone, e.g.:
|
|
||||||
# %%{py3_test_envvars} %%{python3} -m unittest
|
|
||||||
%py3_test_envvars %{expand:\\\
|
|
||||||
CFLAGS="${CFLAGS:-${RPM_OPT_FLAGS}}" LDFLAGS="${LDFLAGS:-${RPM_LD_FLAGS}}"\\\
|
|
||||||
PATH="%{buildroot}%{_bindir}:$PATH"\\\
|
|
||||||
PYTHONPATH="${PYTHONPATH:-%{buildroot}%{python3_sitearch}:%{buildroot}%{python3_sitelib}}"\\\
|
|
||||||
PYTHONDONTWRITEBYTECODE=1\\\
|
|
||||||
%{?__pytest_addopts:PYTEST_ADDOPTS="${PYTEST_ADDOPTS:-} %{__pytest_addopts}"}\\\
|
|
||||||
PYTEST_XDIST_AUTO_NUM_WORKERS=%{_smp_build_ncpus}}
|
|
||||||
|
|
||||||
# This is intended for Python 3 only, hence also no Python version in the name.
|
|
||||||
%__pytest /usr/bin/pytest-%{python3_version}
|
|
||||||
%pytest %py3_test_envvars %__pytest
|
|
@ -1,199 +0,0 @@
|
|||||||
#!/usr/bin/env python3
|
|
||||||
|
|
||||||
import sys
|
|
||||||
import os
|
|
||||||
from stat import *
|
|
||||||
import getopt
|
|
||||||
|
|
||||||
err = sys.stderr.write
|
|
||||||
dbg = err
|
|
||||||
rep = sys.stdout.write
|
|
||||||
|
|
||||||
new_interpreter = None
|
|
||||||
preserve_timestamps = False
|
|
||||||
create_backup = True
|
|
||||||
keep_flags = False
|
|
||||||
add_flags = b''
|
|
||||||
|
|
||||||
|
|
||||||
def main():
|
|
||||||
global new_interpreter
|
|
||||||
global preserve_timestamps
|
|
||||||
global create_backup
|
|
||||||
global keep_flags
|
|
||||||
global add_flags
|
|
||||||
|
|
||||||
usage = ('usage: %s -i /interpreter -p -n -k -a file-or-directory ...\n' %
|
|
||||||
sys.argv[0])
|
|
||||||
try:
|
|
||||||
opts, args = getopt.getopt(sys.argv[1:], 'i:a:kpn')
|
|
||||||
except getopt.error as msg:
|
|
||||||
err(str(msg) + '\n')
|
|
||||||
err(usage)
|
|
||||||
sys.exit(2)
|
|
||||||
for o, a in opts:
|
|
||||||
if o == '-i':
|
|
||||||
new_interpreter = a.encode()
|
|
||||||
if o == '-p':
|
|
||||||
preserve_timestamps = True
|
|
||||||
if o == '-n':
|
|
||||||
create_backup = False
|
|
||||||
if o == '-k':
|
|
||||||
keep_flags = True
|
|
||||||
if o == '-a':
|
|
||||||
add_flags = a.encode()
|
|
||||||
if b' ' in add_flags:
|
|
||||||
err("-a option doesn't support whitespaces")
|
|
||||||
sys.exit(2)
|
|
||||||
if not new_interpreter or not new_interpreter.startswith(b'/') or \
|
|
||||||
not args:
|
|
||||||
err('-i option or file-or-directory missing\n')
|
|
||||||
err(usage)
|
|
||||||
sys.exit(2)
|
|
||||||
bad = 0
|
|
||||||
for arg in args:
|
|
||||||
if os.path.isdir(arg):
|
|
||||||
if recursedown(arg): bad = 1
|
|
||||||
elif os.path.islink(arg):
|
|
||||||
err(arg + ': will not process symbolic links\n')
|
|
||||||
bad = 1
|
|
||||||
else:
|
|
||||||
if fix(arg): bad = 1
|
|
||||||
sys.exit(bad)
|
|
||||||
|
|
||||||
|
|
||||||
def ispython(name):
|
|
||||||
return name.endswith('.py')
|
|
||||||
|
|
||||||
|
|
||||||
def recursedown(dirname):
|
|
||||||
dbg('recursedown(%r)\n' % (dirname,))
|
|
||||||
bad = 0
|
|
||||||
try:
|
|
||||||
names = os.listdir(dirname)
|
|
||||||
except OSError as msg:
|
|
||||||
err('%s: cannot list directory: %r\n' % (dirname, msg))
|
|
||||||
return 1
|
|
||||||
names.sort()
|
|
||||||
subdirs = []
|
|
||||||
for name in names:
|
|
||||||
if name in (os.curdir, os.pardir): continue
|
|
||||||
fullname = os.path.join(dirname, name)
|
|
||||||
if os.path.islink(fullname): pass
|
|
||||||
elif os.path.isdir(fullname):
|
|
||||||
subdirs.append(fullname)
|
|
||||||
elif ispython(name):
|
|
||||||
if fix(fullname): bad = 1
|
|
||||||
for fullname in subdirs:
|
|
||||||
if recursedown(fullname): bad = 1
|
|
||||||
return bad
|
|
||||||
|
|
||||||
|
|
||||||
def fix(filename):
|
|
||||||
## dbg('fix(%r)\n' % (filename,))
|
|
||||||
try:
|
|
||||||
f = open(filename, 'rb')
|
|
||||||
except IOError as msg:
|
|
||||||
err('%s: cannot open: %r\n' % (filename, msg))
|
|
||||||
return 1
|
|
||||||
with f:
|
|
||||||
line = f.readline()
|
|
||||||
fixed = fixline(line)
|
|
||||||
if line == fixed:
|
|
||||||
rep(filename+': no change\n')
|
|
||||||
return
|
|
||||||
head, tail = os.path.split(filename)
|
|
||||||
tempname = os.path.join(head, '@' + tail)
|
|
||||||
try:
|
|
||||||
g = open(tempname, 'wb')
|
|
||||||
except IOError as msg:
|
|
||||||
err('%s: cannot create: %r\n' % (tempname, msg))
|
|
||||||
return 1
|
|
||||||
with g:
|
|
||||||
rep(filename + ': updating\n')
|
|
||||||
g.write(fixed)
|
|
||||||
BUFSIZE = 8*1024
|
|
||||||
while 1:
|
|
||||||
buf = f.read(BUFSIZE)
|
|
||||||
if not buf: break
|
|
||||||
g.write(buf)
|
|
||||||
|
|
||||||
# Finishing touch -- move files
|
|
||||||
|
|
||||||
mtime = None
|
|
||||||
atime = None
|
|
||||||
# First copy the file's mode to the temp file
|
|
||||||
try:
|
|
||||||
statbuf = os.stat(filename)
|
|
||||||
mtime = statbuf.st_mtime
|
|
||||||
atime = statbuf.st_atime
|
|
||||||
os.chmod(tempname, statbuf[ST_MODE] & 0o7777)
|
|
||||||
except OSError as msg:
|
|
||||||
err('%s: warning: chmod failed (%r)\n' % (tempname, msg))
|
|
||||||
# Then make a backup of the original file as filename~
|
|
||||||
if create_backup:
|
|
||||||
try:
|
|
||||||
os.rename(filename, filename + '~')
|
|
||||||
except OSError as msg:
|
|
||||||
err('%s: warning: backup failed (%r)\n' % (filename, msg))
|
|
||||||
else:
|
|
||||||
try:
|
|
||||||
os.remove(filename)
|
|
||||||
except OSError as msg:
|
|
||||||
err('%s: warning: removing failed (%r)\n' % (filename, msg))
|
|
||||||
# Now move the temp file to the original file
|
|
||||||
try:
|
|
||||||
os.rename(tempname, filename)
|
|
||||||
except OSError as msg:
|
|
||||||
err('%s: rename failed (%r)\n' % (filename, msg))
|
|
||||||
return 1
|
|
||||||
if preserve_timestamps:
|
|
||||||
if atime and mtime:
|
|
||||||
try:
|
|
||||||
os.utime(filename, (atime, mtime))
|
|
||||||
except OSError as msg:
|
|
||||||
err('%s: reset of timestamp failed (%r)\n' % (filename, msg))
|
|
||||||
return 1
|
|
||||||
# Return success
|
|
||||||
return 0
|
|
||||||
|
|
||||||
|
|
||||||
def parse_shebang(shebangline):
|
|
||||||
shebangline = shebangline.rstrip(b'\n')
|
|
||||||
start = shebangline.find(b' -')
|
|
||||||
if start == -1:
|
|
||||||
return b''
|
|
||||||
return shebangline[start:]
|
|
||||||
|
|
||||||
|
|
||||||
def populate_flags(shebangline):
|
|
||||||
old_flags = b''
|
|
||||||
if keep_flags:
|
|
||||||
old_flags = parse_shebang(shebangline)
|
|
||||||
if old_flags:
|
|
||||||
old_flags = old_flags[2:]
|
|
||||||
if not (old_flags or add_flags):
|
|
||||||
return b''
|
|
||||||
# On Linux, the entire string following the interpreter name
|
|
||||||
# is passed as a single argument to the interpreter.
|
|
||||||
# e.g. "#! /usr/bin/python3 -W Error -s" runs "/usr/bin/python3 "-W Error -s"
|
|
||||||
# so shebang should have single '-' where flags are given and
|
|
||||||
# flag might need argument for that reasons adding new flags is
|
|
||||||
# between '-' and original flags
|
|
||||||
# e.g. #! /usr/bin/python3 -sW Error
|
|
||||||
return b' -' + add_flags + old_flags
|
|
||||||
|
|
||||||
|
|
||||||
def fixline(line):
|
|
||||||
if not line.startswith(b'#!'):
|
|
||||||
return line
|
|
||||||
|
|
||||||
if b"python" not in line:
|
|
||||||
return line
|
|
||||||
|
|
||||||
flags = populate_flags(line)
|
|
||||||
return b'#! ' + new_interpreter + flags + b'\n'
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
|
||||||
main()
|
|
@ -62,6 +62,7 @@ License: Python
|
|||||||
# Whether to use RPM build wheels from the python-{pip,setuptools,wheel}-wheel packages
|
# Whether to use RPM build wheels from the python-{pip,setuptools,wheel}-wheel packages
|
||||||
# Uses upstream bundled prebuilt wheels otherwise
|
# Uses upstream bundled prebuilt wheels otherwise
|
||||||
%bcond_without rpmwheels
|
%bcond_without rpmwheels
|
||||||
|
|
||||||
# If the rpmwheels condition is disabled, we use the bundled wheel packages
|
# If the rpmwheels condition is disabled, we use the bundled wheel packages
|
||||||
# from Python with the versions below.
|
# from Python with the versions below.
|
||||||
# This needs to be manually updated when we update Python.
|
# This needs to be manually updated when we update Python.
|
||||||
@ -313,11 +314,6 @@ Source1: %{url}ftp/python/%{general_version}/Python-%{upstream_version}.tar.xz.a
|
|||||||
# The release manager for Python 3.12 is Thomas Wouters
|
# The release manager for Python 3.12 is Thomas Wouters
|
||||||
Source2: https://github.com/Yhg1s.gpg
|
Source2: https://github.com/Yhg1s.gpg
|
||||||
|
|
||||||
# Sources for the python3.12-rpm-macros
|
|
||||||
Source3: macros.python3.12
|
|
||||||
Source4: import_all_modules_py3_12.py
|
|
||||||
Source5: pathfix_py3_12.py
|
|
||||||
|
|
||||||
# A simple script to check timestamps of bytecode files
|
# A simple script to check timestamps of bytecode files
|
||||||
# Run in check section with Python that is currently being built
|
# Run in check section with Python that is currently being built
|
||||||
# Originally written by bkabrda
|
# Originally written by bkabrda
|
||||||
@ -407,14 +403,6 @@ Patch415: 00415-cve-2023-27043-gh-102988-reject-malformed-addresses-in-email-par
|
|||||||
# Descriptions, and metadata for subpackages
|
# Descriptions, and metadata for subpackages
|
||||||
# ==========================================
|
# ==========================================
|
||||||
|
|
||||||
# Require alternatives version that implements the --keep-foreign flag and fixes rhbz#2203820
|
|
||||||
Requires: alternatives >= 1.19.2-1
|
|
||||||
Requires(post): alternatives >= 1.19.2-1
|
|
||||||
Requires(postun): alternatives >= 1.19.2-1
|
|
||||||
|
|
||||||
# When the user tries to `yum install python`, yum will list this package among
|
|
||||||
# the possible alternatives
|
|
||||||
Provides: alternative-for(python)
|
|
||||||
|
|
||||||
%if %{with main_python}
|
%if %{with main_python}
|
||||||
# Description for the python3X SRPM only:
|
# Description for the python3X SRPM only:
|
||||||
@ -489,7 +477,6 @@ Documentation for Python is provided in the %{pkgname}-docs package.
|
|||||||
Packages containing additional libraries for Python are generally named with
|
Packages containing additional libraries for Python are generally named with
|
||||||
the "%{pkgname}-" prefix.
|
the "%{pkgname}-" prefix.
|
||||||
|
|
||||||
For the unversioned "python" executable, see manual page "unversioned-python".
|
|
||||||
|
|
||||||
%if %{with main_python}
|
%if %{with main_python}
|
||||||
# https://fedoraproject.org/wiki/Changes/Move_usr_bin_python_into_separate_package
|
# https://fedoraproject.org/wiki/Changes/Move_usr_bin_python_into_separate_package
|
||||||
@ -570,12 +557,9 @@ Requires: (python3-rpm-macros if rpm-build)
|
|||||||
# On Fedora, we keep this to avoid one additional round of %%generate_buildrequires.
|
# On Fedora, we keep this to avoid one additional round of %%generate_buildrequires.
|
||||||
%{!?rhel:Requires: (pyproject-rpm-macros if rpm-build)}
|
%{!?rhel:Requires: (pyproject-rpm-macros if rpm-build)}
|
||||||
|
|
||||||
# Require alternatives version that implements the --keep-foreign flag and fixes rhbz#2203820
|
# We provide the python3.12-rpm-macros here to make it possible to
|
||||||
Requires(postun): alternatives >= 1.19.2-1
|
# BuildRequire them in the same manner as RHEL8.
|
||||||
|
Provides: %{pkgname}-rpm-macros = %{version}-%{release}
|
||||||
# python3.12 installs the alternatives master symlink to which we attach a slave
|
|
||||||
Requires(post): %{pkgname}
|
|
||||||
Requires(postun): %{pkgname}
|
|
||||||
|
|
||||||
%unversioned_obsoletes_of_python3_X_if_main devel
|
%unversioned_obsoletes_of_python3_X_if_main devel
|
||||||
|
|
||||||
@ -624,13 +608,6 @@ Provides: idle = %{version}-%{release}
|
|||||||
Provides: %{pkgname}-tools = %{version}-%{release}
|
Provides: %{pkgname}-tools = %{version}-%{release}
|
||||||
Provides: %{pkgname}-tools%{?_isa} = %{version}-%{release}
|
Provides: %{pkgname}-tools%{?_isa} = %{version}-%{release}
|
||||||
|
|
||||||
# Require alternatives version that implements the --keep-foreign flag and fixes rhbz#2203820
|
|
||||||
Requires(postun): alternatives >= 1.19.2-1
|
|
||||||
|
|
||||||
# python3.12 installs the alternatives master symlink to which we attach a slave
|
|
||||||
Requires(post): %{pkgname}
|
|
||||||
Requires(postun): %{pkgname}
|
|
||||||
|
|
||||||
%description -n %{pkgname}-idle
|
%description -n %{pkgname}-idle
|
||||||
IDLE is Python’s Integrated Development and Learning Environment.
|
IDLE is Python’s Integrated Development and Learning Environment.
|
||||||
|
|
||||||
@ -702,13 +679,6 @@ Requires: %{pkgname}-idle%{?_isa} = %{version}-%{release}
|
|||||||
|
|
||||||
%unversioned_obsoletes_of_python3_X_if_main debug
|
%unversioned_obsoletes_of_python3_X_if_main debug
|
||||||
|
|
||||||
# Require alternatives version that implements the --keep-foreign flag and fixes rhbz#2203820
|
|
||||||
Requires(postun): alternatives >= 1.19.2-1
|
|
||||||
|
|
||||||
# python3.12 installs the alternatives master symlink to which we attach a slave
|
|
||||||
Requires(post): %{pkgname}
|
|
||||||
Requires(postun): %{pkgname}
|
|
||||||
|
|
||||||
%description -n %{pkgname}-debug
|
%description -n %{pkgname}-debug
|
||||||
python3-debug provides a version of the Python runtime with numerous debugging
|
python3-debug provides a version of the Python runtime with numerous debugging
|
||||||
features enabled, aimed at advanced Python users such as developers of Python
|
features enabled, aimed at advanced Python users such as developers of Python
|
||||||
@ -727,24 +697,6 @@ The debug runtime additionally supports debug builds of C-API extensions
|
|||||||
%endif # with debug_build
|
%endif # with debug_build
|
||||||
|
|
||||||
|
|
||||||
# We package the python3.12-rpm-macros in RHEL8 as to properly set the
|
|
||||||
# %%__python3 and %%python3_pkgversion macros as well as provide modern
|
|
||||||
# versions the current base macros.
|
|
||||||
%package -n %{pkgname}-rpm-macros
|
|
||||||
Summary: RPM macros for building RPMs with Python %{pybasever}
|
|
||||||
License: MIT
|
|
||||||
Provides: python-modular-rpm-macros == %{pybasever}
|
|
||||||
Conflicts: python-modular-rpm-macros > %{pybasever}
|
|
||||||
Requires: python3-rpm-macros
|
|
||||||
BuildArch: noarch
|
|
||||||
|
|
||||||
%description -n %{pkgname}-rpm-macros
|
|
||||||
RPM macros for building RPMs with Python %{pybasever} from the python%{pyshortver} module.
|
|
||||||
If you want to build an RPM against the python%{pyshortver} module, you need to add:
|
|
||||||
|
|
||||||
BuildRequire: %{pkgname}-rpm-macros.
|
|
||||||
|
|
||||||
|
|
||||||
# ======================================================
|
# ======================================================
|
||||||
# The prep phase of the build:
|
# The prep phase of the build:
|
||||||
# ======================================================
|
# ======================================================
|
||||||
@ -753,6 +705,14 @@ If you want to build an RPM against the python%{pyshortver} module, you need to
|
|||||||
%gpgverify -k2 -s1 -d0
|
%gpgverify -k2 -s1 -d0
|
||||||
%autosetup -S git_am -n Python-%{upstream_version}
|
%autosetup -S git_am -n Python-%{upstream_version}
|
||||||
|
|
||||||
|
# Verify the second level of bundled provides is up to date
|
||||||
|
# Arguably this should be done in %%check, but %%prep has a faster feedback loop
|
||||||
|
# setuptools.whl does not contain the vendored.txt files
|
||||||
|
if [ -f %{_rpmconfigdir}/pythonbundles.py ]; then
|
||||||
|
%{_rpmconfigdir}/pythonbundles.py <(unzip -p Lib/ensurepip/_bundled/pip-*.whl pip/_vendor/vendor.txt) --compare-with '%pip_bundled_provides'
|
||||||
|
%{_rpmconfigdir}/pythonbundles.py <(unzip -p Lib/test/wheel-*.whl wheel/vendored/vendor.txt) --compare-with '%wheel_bundled_provides'
|
||||||
|
fi
|
||||||
|
|
||||||
%if %{with rpmwheels}
|
%if %{with rpmwheels}
|
||||||
rm Lib/ensurepip/_bundled/pip-%{pip_version}-py3-none-any.whl
|
rm Lib/ensurepip/_bundled/pip-%{pip_version}-py3-none-any.whl
|
||||||
rm Lib/test/setuptools-%{setuptools_version}-py3-none-any.whl
|
rm Lib/test/setuptools-%{setuptools_version}-py3-none-any.whl
|
||||||
@ -1059,11 +1019,8 @@ done
|
|||||||
# Switch all shebangs to refer to the specific Python version.
|
# Switch all shebangs to refer to the specific Python version.
|
||||||
# This currently only covers files matching ^[a-zA-Z0-9_]+\.py$,
|
# This currently only covers files matching ^[a-zA-Z0-9_]+\.py$,
|
||||||
# so handle files named using other naming scheme separately.
|
# so handle files named using other naming scheme separately.
|
||||||
# - RHEL 8 note: we use %%{SOURCE5} instead of pathfix.py, because in RHEL 8 we
|
|
||||||
# ship our own versioned pathfix_py3_12.py in this package, but during
|
|
||||||
# bootstrap it's not yet installed.
|
|
||||||
LD_LIBRARY_PATH=./build/optimized ./build/optimized/python \
|
LD_LIBRARY_PATH=./build/optimized ./build/optimized/python \
|
||||||
%{SOURCE5} \
|
%{_rpmconfigdir}/redhat/pathfix.py \
|
||||||
-i "%{_bindir}/python%{pybasever}" -pn \
|
-i "%{_bindir}/python%{pybasever}" -pn \
|
||||||
%{buildroot} \
|
%{buildroot} \
|
||||||
%{buildroot}%{_bindir}/*%{pybasever}.py \
|
%{buildroot}%{_bindir}/*%{pybasever}.py \
|
||||||
@ -1165,29 +1122,6 @@ for file in %{buildroot}%{pylibdir}/pydoc_data/topics.py $(grep --include='*.py'
|
|||||||
rm ${directory}/{__pycache__/${module}.cpython-%{pyshortver}.opt-?.pyc,${module}.py}
|
rm ${directory}/{__pycache__/${module}.cpython-%{pyshortver}.opt-?.pyc,${module}.py}
|
||||||
done
|
done
|
||||||
|
|
||||||
# Python RPM macros for python3.12-rpm-macros
|
|
||||||
mkdir -p %{buildroot}%{rpmmacrodir}/
|
|
||||||
install -m 644 %{SOURCE3} \
|
|
||||||
%{buildroot}/%{rpmmacrodir}/
|
|
||||||
|
|
||||||
# Add scripts that are being used by python3.12-rpm-macros
|
|
||||||
mkdir -p %{buildroot}%{_rpmconfigdir}/redhat
|
|
||||||
install -m 644 %{SOURCE4} %{buildroot}%{_rpmconfigdir}/redhat/
|
|
||||||
install -m 644 %{SOURCE5} %{buildroot}%{_rpmconfigdir}/redhat/
|
|
||||||
|
|
||||||
# All ghost files controlled by alternatives need to exist for the files
|
|
||||||
# section check to succeed
|
|
||||||
# - Don't list /usr/bin/python as a ghost file so `yum install /usr/bin/python`
|
|
||||||
# doesn't install this package
|
|
||||||
touch %{buildroot}%{_bindir}/unversioned-python
|
|
||||||
touch %{buildroot}%{_mandir}/man1/python.1.gz
|
|
||||||
touch %{buildroot}%{_bindir}/python3
|
|
||||||
touch %{buildroot}%{_mandir}/man1/python3.1.gz
|
|
||||||
touch %{buildroot}%{_bindir}/pydoc3
|
|
||||||
touch %{buildroot}%{_bindir}/pydoc-3
|
|
||||||
touch %{buildroot}%{_bindir}/idle3
|
|
||||||
touch %{buildroot}%{_bindir}/python3-config
|
|
||||||
|
|
||||||
# ======================================================
|
# ======================================================
|
||||||
# Checks for packaging issues
|
# Checks for packaging issues
|
||||||
# ======================================================
|
# ======================================================
|
||||||
@ -1272,119 +1206,10 @@ CheckPython optimized
|
|||||||
|
|
||||||
%endif # with tests
|
%endif # with tests
|
||||||
|
|
||||||
# ======================================================
|
|
||||||
# Scriptlets for alternatives on rhel8
|
|
||||||
# ======================================================
|
|
||||||
%post
|
|
||||||
# Alternative for /usr/bin/python -> /usr/bin/python3 + man page
|
|
||||||
alternatives --install %{_bindir}/unversioned-python \
|
|
||||||
python \
|
|
||||||
%{_bindir}/python3 \
|
|
||||||
300 \
|
|
||||||
--slave %{_bindir}/python \
|
|
||||||
unversioned-python \
|
|
||||||
%{_bindir}/python3 \
|
|
||||||
--slave %{_mandir}/man1/python.1.gz \
|
|
||||||
unversioned-python-man \
|
|
||||||
%{_mandir}/man1/python3.1.gz
|
|
||||||
|
|
||||||
# Alternative for /usr/bin/python -> /usr/bin/python3.12 + man page
|
|
||||||
alternatives --install %{_bindir}/unversioned-python \
|
|
||||||
python \
|
|
||||||
%{_bindir}/python3.12 \
|
|
||||||
211 \
|
|
||||||
--slave %{_bindir}/python \
|
|
||||||
unversioned-python \
|
|
||||||
%{_bindir}/python3.12 \
|
|
||||||
--slave %{_mandir}/man1/python.1.gz \
|
|
||||||
unversioned-python-man \
|
|
||||||
%{_mandir}/man1/python3.12.1.gz
|
|
||||||
|
|
||||||
# Alternative for /usr/bin/python3 -> /usr/bin/python3.12 + related files
|
|
||||||
# Create only if it doesn't exist already
|
|
||||||
EXISTS=`alternatives --display python3 | \
|
|
||||||
grep -c "^/usr/bin/python3.12 - priority [0-9]*"`
|
|
||||||
|
|
||||||
if [ $EXISTS -eq 0 ]; then
|
|
||||||
alternatives --install %{_bindir}/python3 \
|
|
||||||
python3 \
|
|
||||||
%{_bindir}/python3.12 \
|
|
||||||
31200 \
|
|
||||||
--slave %{_mandir}/man1/python3.1.gz \
|
|
||||||
python3-man \
|
|
||||||
%{_mandir}/man1/python3.12.1.gz \
|
|
||||||
--slave %{_bindir}/pydoc3 \
|
|
||||||
pydoc3 \
|
|
||||||
%{_bindir}/pydoc3.12 \
|
|
||||||
--slave %{_bindir}/pydoc-3 \
|
|
||||||
pydoc-3 \
|
|
||||||
%{_bindir}/pydoc3.12
|
|
||||||
fi
|
|
||||||
|
|
||||||
%postun
|
|
||||||
# Do this only during uninstall process (not during update)
|
|
||||||
if [ $1 -eq 0 ]; then
|
|
||||||
alternatives --keep-foreign --remove python \
|
|
||||||
%{_bindir}/python3.12
|
|
||||||
|
|
||||||
alternatives --keep-foreign --remove python3 \
|
|
||||||
%{_bindir}/python3.12
|
|
||||||
|
|
||||||
# Remove link python → python3 if no other python3.* exists
|
|
||||||
if ! alternatives --display python3 > /dev/null; then
|
|
||||||
alternatives --keep-foreign --remove python \
|
|
||||||
%{_bindir}/python3
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
%post devel
|
|
||||||
alternatives --add-slave python3 %{_bindir}/python3.12 \
|
|
||||||
%{_bindir}/python3-config \
|
|
||||||
python3-config \
|
|
||||||
%{_bindir}/python3.12-config
|
|
||||||
|
|
||||||
%postun devel
|
|
||||||
# Do this only during uninstall process (not during update)
|
|
||||||
if [ $1 -eq 0 ]; then
|
|
||||||
alternatives --keep-foreign --remove-slave python3 %{_bindir}/python3.12 \
|
|
||||||
python3-config
|
|
||||||
fi
|
|
||||||
|
|
||||||
%post idle
|
|
||||||
alternatives --add-slave python3 %{_bindir}/python3.12 \
|
|
||||||
%{_bindir}/idle3 \
|
|
||||||
idle3 \
|
|
||||||
%{_bindir}/idle3.12
|
|
||||||
|
|
||||||
%postun idle
|
|
||||||
# Do this only during uninstall process (not during update)
|
|
||||||
if [ $1 -eq 0 ]; then
|
|
||||||
alternatives --keep-foreign --remove-slave python3 %{_bindir}/python3.12 \
|
|
||||||
idle3
|
|
||||||
fi
|
|
||||||
|
|
||||||
# ======================================================
|
|
||||||
# Files for each RPM (sub)package
|
|
||||||
# ======================================================
|
|
||||||
|
|
||||||
%files -n %{pkgname}-rpm-macros
|
|
||||||
%{rpmmacrodir}/macros.python%{pybasever}
|
|
||||||
%{_rpmconfigdir}/redhat/import_all_modules_py3_12.py
|
|
||||||
%{_rpmconfigdir}/redhat/pathfix_py3_12.py
|
|
||||||
|
|
||||||
|
|
||||||
%files -n %{pkgname}
|
%files -n %{pkgname}
|
||||||
%doc README.rst
|
%doc README.rst
|
||||||
|
|
||||||
# Alternatives
|
|
||||||
%ghost %{_bindir}/unversioned-python
|
|
||||||
%ghost %{_mandir}/man1/python.1.gz
|
|
||||||
%ghost %{_bindir}/python3
|
|
||||||
%ghost %{_mandir}/man1/python3.1.gz
|
|
||||||
%ghost %{_bindir}/pydoc3
|
|
||||||
%ghost %{_bindir}/pydoc-3
|
|
||||||
|
|
||||||
%if %{with main_python}
|
%if %{with main_python}
|
||||||
%{_bindir}/pydoc*
|
%{_bindir}/pydoc*
|
||||||
%{_bindir}/python3
|
%{_bindir}/python3
|
||||||
@ -1676,9 +1501,6 @@ fi
|
|||||||
%{_bindir}/python%{pybasever}-config
|
%{_bindir}/python%{pybasever}-config
|
||||||
%{_bindir}/python%{LDVERSION_optimized}-config
|
%{_bindir}/python%{LDVERSION_optimized}-config
|
||||||
%{_bindir}/python%{LDVERSION_optimized}-*-config
|
%{_bindir}/python%{LDVERSION_optimized}-*-config
|
||||||
# Alternatives
|
|
||||||
%ghost %{_bindir}/python3-config
|
|
||||||
|
|
||||||
%{_libdir}/libpython%{LDVERSION_optimized}.so
|
%{_libdir}/libpython%{LDVERSION_optimized}.so
|
||||||
%{_libdir}/pkgconfig/python-%{LDVERSION_optimized}.pc
|
%{_libdir}/pkgconfig/python-%{LDVERSION_optimized}.pc
|
||||||
%{_libdir}/pkgconfig/python-%{LDVERSION_optimized}-embed.pc
|
%{_libdir}/pkgconfig/python-%{LDVERSION_optimized}-embed.pc
|
||||||
@ -1691,8 +1513,6 @@ fi
|
|||||||
%{_bindir}/idle*
|
%{_bindir}/idle*
|
||||||
%else
|
%else
|
||||||
%{_bindir}/idle%{pybasever}
|
%{_bindir}/idle%{pybasever}
|
||||||
# Alternatives
|
|
||||||
%ghost %{_bindir}/idle3
|
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%{pylibdir}/idlelib
|
%{pylibdir}/idlelib
|
||||||
@ -1932,4 +1752,3 @@ fi
|
|||||||
Ville Skyttä <ville.skytta@iki.fi>
|
Ville Skyttä <ville.skytta@iki.fi>
|
||||||
Yaakov Selkowitz <yselkowi@redhat.com>
|
Yaakov Selkowitz <yselkowi@redhat.com>
|
||||||
Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
|
Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user