Compare commits
1 commit
| Author | SHA1 | Date | |
|---|---|---|---|
|
ea2cded122 |
19 changed files with 146 additions and 621 deletions
|
|
@ -1 +0,0 @@
|
|||
1
|
||||
|
|
@ -1,18 +1,20 @@
|
|||
#!/bin/bash -eu
|
||||
#!/bin/bash -e
|
||||
|
||||
# If using normal root, avoid changing anything.
|
||||
if [[ -z "${RPM_BUILD_ROOT:-}" ]] || [[ "${RPM_BUILD_ROOT:-}" = "/" ]]; then
|
||||
if [ -z "$RPM_BUILD_ROOT" -o "$RPM_BUILD_ROOT" = "/" ]; then
|
||||
exit 0
|
||||
fi
|
||||
|
||||
# Defined as %py_reproducible_pyc_path macro and passed here as
|
||||
# the first command-line argument
|
||||
path_to_fix=${1:?}
|
||||
path_to_fix=$1
|
||||
|
||||
# First, check that the parser is available:
|
||||
if [[ ! -x /usr/bin/marshalparser ]]; then
|
||||
if [ ! -x /usr/bin/marshalparser ]; then
|
||||
echo "ERROR: If %py_reproducible_pyc_path is defined, you have to also BuildRequire: /usr/bin/marshalparser !"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
find "$path_to_fix" -type f -name '*.pyc' -exec /usr/bin/marshalparser --fix --overwrite '{}' '+'
|
||||
# Set pipefail so if $path_to_fix does not exist, the build fails
|
||||
set -o pipefail
|
||||
find "$path_to_fix" -type f -name "*.pyc" | xargs /usr/bin/marshalparser --fix --overwrite
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ errors_terminate=$2
|
|||
# Therefore $1 ($default_python) is not needed and is invoked with "" by default.
|
||||
# $default_python stays in the arguments for backward compatibility and $extra for the following check:
|
||||
extra=$3
|
||||
if [[ 0"$extra" -eq 1 ]]; then
|
||||
if [ 0$extra -eq 1 ]; then
|
||||
echo -e "%_python_bytecompile_extra is discontinued, use %py_byte_compile instead.\nSee: https://fedoraproject.org/wiki/Changes/No_more_automagic_Python_bytecompilation_phase_3" >/dev/stderr
|
||||
exit 1
|
||||
fi
|
||||
|
|
@ -14,7 +14,7 @@ fi
|
|||
compileall_flags="$4"
|
||||
|
||||
# If using normal root, avoid changing anything.
|
||||
if [[ -z "$RPM_BUILD_ROOT" ]] || [[ "$RPM_BUILD_ROOT" = "/" ]]; then
|
||||
if [ -z "$RPM_BUILD_ROOT" -o "$RPM_BUILD_ROOT" = "/" ]; then
|
||||
exit 0
|
||||
fi
|
||||
|
||||
|
|
@ -36,7 +36,7 @@ function python_bytecompile()
|
|||
{
|
||||
local options=$1
|
||||
local python_binary=$2
|
||||
# local exclude=$3 # No longer used
|
||||
local exclude=$3
|
||||
local python_libdir="$4"
|
||||
local compileall_flags="$5"
|
||||
|
||||
|
|
@ -45,14 +45,14 @@ function python_bytecompile()
|
|||
#
|
||||
# Python 3.4 and higher
|
||||
#
|
||||
if [[ "$python_version" -ge 34 ]]; then
|
||||
if [ "$python_version" -ge 34 ]; then
|
||||
|
||||
# We compile all opt levels in one go: only when $options is empty.
|
||||
if [[ -n "$options" ]]; then
|
||||
if [ -n "$options" ]; then
|
||||
return
|
||||
fi
|
||||
|
||||
if [[ "$python_version" -ge 39 ]]; then
|
||||
if [ "$python_version" -ge 39 ]; then
|
||||
# For Pyhon 3.9+, use the standard library
|
||||
compileall_module=compileall
|
||||
else
|
||||
|
|
@ -60,7 +60,7 @@ function python_bytecompile()
|
|||
compileall_module=compileall2
|
||||
fi
|
||||
|
||||
if [[ "$python_version" -ge 37 ]]; then
|
||||
if [ "$python_version" -ge 37 ]; then
|
||||
# Force the TIMESTAMP invalidation mode
|
||||
invalidation_option=--invalidation-mode=timestamp
|
||||
else
|
||||
|
|
@ -69,14 +69,18 @@ function python_bytecompile()
|
|||
invalidation_option=
|
||||
fi
|
||||
|
||||
[ ! -z $exclude ] && exclude="-x '$exclude'"
|
||||
|
||||
# PYTHONPATH is needed for compileall2, but doesn't hurt for the stdlib
|
||||
# -o 0 -o 1 are the optimization levels
|
||||
# -q disables verbose output
|
||||
# -f forces the process to overwrite existing compiled files
|
||||
# -x excludes paths defined by regex
|
||||
# -e excludes symbolic links pointing outside the build root
|
||||
# -x and -e together implements the same functionality as the Filter class below
|
||||
# -s strips $RPM_BUILD_ROOT from the path
|
||||
# -p prepends the leading slash to the path to make it absolute
|
||||
PYTHONPATH=/usr/lib/rpm/redhat/ $python_binary -B -m $compileall_module $compileall_flags -o 0 -o 1 -q -f -s "$RPM_BUILD_ROOT" -p / --hardlink-dupes $invalidation_option -e "$RPM_BUILD_ROOT" "$python_libdir"
|
||||
PYTHONPATH=/usr/lib/rpm/redhat/ $python_binary -B -m $compileall_module $compileall_flags -o 0 -o 1 -q -f $exclude -s "$RPM_BUILD_ROOT" -p / --hardlink-dupes $invalidation_option -e "$RPM_BUILD_ROOT" "$python_libdir"
|
||||
|
||||
else
|
||||
#
|
||||
|
|
@ -92,10 +96,13 @@ python_libdir = "$python_libdir"
|
|||
depth = sys.getrecursionlimit()
|
||||
real_libdir = "$real_libdir"
|
||||
build_root = "$RPM_BUILD_ROOT"
|
||||
exclude = r"$exclude"
|
||||
|
||||
class Filter:
|
||||
def search(self, path):
|
||||
ret = not os.path.realpath(path).startswith(build_root)
|
||||
if exclude:
|
||||
ret = ret or re.search(exclude, path)
|
||||
return ret
|
||||
|
||||
sys.exit(not compileall.compile_dir(python_libdir, depth, real_libdir, force=1, rx=Filter(), quiet=1))
|
||||
|
|
@ -130,12 +137,12 @@ do
|
|||
|
||||
# Generate normal (.pyc) byte-compiled files.
|
||||
python_clamp_source_mtime "" "$python_binary" "" "$python_libdir" ""
|
||||
if [[ $? -ne 0 ]] && [[ 0"$errors_terminate" -ne 0 ]]; then
|
||||
if [ $? -ne 0 -a 0$errors_terminate -ne 0 ]; then
|
||||
# One or more of the files had inaccessible mtime
|
||||
exit 1
|
||||
fi
|
||||
python_bytecompile "" "$python_binary" "" "$python_libdir" "$compileall_flags"
|
||||
if [[ $? -ne 0 ]] && [[ 0"$errors_terminate" -ne 0 ]]; then
|
||||
if [ $? -ne 0 -a 0$errors_terminate -ne 0 ]; then
|
||||
# One or more of the files had a syntax error
|
||||
exit 1
|
||||
fi
|
||||
|
|
@ -143,7 +150,7 @@ do
|
|||
# Generate optimized (.pyo) byte-compiled files.
|
||||
# N.B. For Python 3.4+, this call does nothing
|
||||
python_bytecompile "-O" "$python_binary" "" "$python_libdir" "$compileall_flags"
|
||||
if [[ $? -ne 0 ]] && [[ 0"$errors_terminate" -ne 0 ]]; then
|
||||
if [ $? -ne 0 -a 0$errors_terminate -ne 0 ]; then
|
||||
# One or more of the files had a syntax error
|
||||
exit 1
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -1,15 +0,0 @@
|
|||
#!/usr/bin/bash
|
||||
|
||||
set -eu
|
||||
# If using normal root, avoid changing anything.
|
||||
if [[ "${RPM_BUILD_ROOT:-/}" = "/" ]] ; then
|
||||
exit 0
|
||||
fi
|
||||
|
||||
find "$RPM_BUILD_ROOT" -name 'INSTALLER' -type f -print0|grep -z -E "/usr/lib(64)?/python3\.[0-9]+/site-packages/[^/]+\.dist-info/INSTALLER" | while read -d "" installer ; do
|
||||
if cmp -s <(echo pip) "$installer" ; then
|
||||
echo "rpm" > "$installer"
|
||||
rm -f "$(dirname "$installer")/RECORD"
|
||||
fi
|
||||
done
|
||||
exit 0
|
||||
|
|
@ -4,7 +4,7 @@ When called as a script with arguments, this compiles the directories
|
|||
given as arguments recursively; the -l option prevents it from
|
||||
recursing into directories.
|
||||
|
||||
Without arguments, it compiles all modules on sys.path, without
|
||||
Without arguments, if compiles all modules on sys.path, without
|
||||
recursing into subdirectories. (Even though it should do so for
|
||||
packages -- for now, you'll have to deal with packages separately.)
|
||||
|
||||
|
|
@ -36,11 +36,11 @@ PY35 = sys.version_info[0:2] >= (3, 5)
|
|||
# introduced in Python 3.7. These cases are covered by variables here or by PY37
|
||||
# variable itself.
|
||||
if PY37:
|
||||
pyc_struct_format = '<4sLL'
|
||||
pyc_struct_format = '<4sll'
|
||||
pyc_header_lenght = 12
|
||||
pyc_header_format = (pyc_struct_format, importlib.util.MAGIC_NUMBER, 0)
|
||||
else:
|
||||
pyc_struct_format = '<4sL'
|
||||
pyc_struct_format = '<4sl'
|
||||
pyc_header_lenght = 8
|
||||
pyc_header_format = (pyc_struct_format, importlib.util.MAGIC_NUMBER)
|
||||
|
||||
|
|
@ -106,7 +106,7 @@ def compile_dir(dir, maxlevels=None, ddir=None, force=False,
|
|||
workers: maximum number of parallel workers
|
||||
invalidation_mode: how the up-to-dateness of the pyc will be checked
|
||||
stripdir: part of path to left-strip from source file path
|
||||
prependdir: path to prepend to beginning of original file path, applied
|
||||
prependdir: path to prepend to beggining of original file path, applied
|
||||
after stripdir
|
||||
limit_sl_dest: ignore symlinks if they are pointing outside of
|
||||
the defined path
|
||||
|
|
@ -120,34 +120,23 @@ def compile_dir(dir, maxlevels=None, ddir=None, force=False,
|
|||
stripdir = dir
|
||||
prependdir = ddir
|
||||
ddir = None
|
||||
if workers < 0:
|
||||
raise ValueError('workers must be greater or equal to 0')
|
||||
if workers != 1:
|
||||
# Check if this is a system where ProcessPoolExecutor can function.
|
||||
from concurrent.futures.process import _check_system_limits
|
||||
try:
|
||||
_check_system_limits()
|
||||
except NotImplementedError:
|
||||
workers = 1
|
||||
else:
|
||||
from concurrent.futures import ProcessPoolExecutor
|
||||
if workers is not None:
|
||||
if workers < 0:
|
||||
raise ValueError('workers must be greater or equal to 0')
|
||||
elif workers != 1:
|
||||
try:
|
||||
# Only import when needed, as low resource platforms may
|
||||
# fail to import it
|
||||
from concurrent.futures import ProcessPoolExecutor
|
||||
except ImportError:
|
||||
workers = 1
|
||||
if maxlevels is None:
|
||||
maxlevels = sys.getrecursionlimit()
|
||||
files = _walk_dir(dir, quiet=quiet, maxlevels=maxlevels)
|
||||
success = True
|
||||
if workers != 1 and ProcessPoolExecutor is not None:
|
||||
mp_context_arg = {}
|
||||
if PY37:
|
||||
import multiprocessing
|
||||
if multiprocessing.get_start_method() == 'fork':
|
||||
mp_context = multiprocessing.get_context('forkserver')
|
||||
else:
|
||||
mp_context = None
|
||||
mp_context_arg = {"mp_context": mp_context}
|
||||
# If workers == 0, let ProcessPoolExecutor choose
|
||||
if workers is not None and workers != 1 and ProcessPoolExecutor is not None:
|
||||
workers = workers or None
|
||||
with ProcessPoolExecutor(max_workers=workers,
|
||||
**mp_context_arg) as executor:
|
||||
with ProcessPoolExecutor(max_workers=workers) as executor:
|
||||
results = executor.map(partial(compile_file,
|
||||
ddir=ddir, force=force,
|
||||
rx=rx, quiet=quiet,
|
||||
|
|
@ -189,7 +178,7 @@ def compile_file(fullname, ddir=None, force=False, rx=None, quiet=0,
|
|||
files each with one optimization level.
|
||||
invalidation_mode: how the up-to-dateness of the pyc will be checked
|
||||
stripdir: part of path to left-strip from source file path
|
||||
prependdir: path to prepend to beginning of original file path, applied
|
||||
prependdir: path to prepend to beggining of original file path, applied
|
||||
after stripdir
|
||||
limit_sl_dest: ignore symlinks if they are pointing outside of
|
||||
the defined path.
|
||||
|
|
@ -201,8 +190,10 @@ def compile_file(fullname, ddir=None, force=False, rx=None, quiet=0,
|
|||
"in combination with stripdir or prependdir"))
|
||||
|
||||
success = True
|
||||
fullname = os.fspath(fullname)
|
||||
stripdir = os.fspath(stripdir) if stripdir is not None else None
|
||||
if PY36 and quiet < 2 and isinstance(fullname, os.PathLike):
|
||||
fullname = os.fspath(fullname)
|
||||
else:
|
||||
fullname = str(fullname)
|
||||
name = os.path.basename(fullname)
|
||||
|
||||
dfile = None
|
||||
|
|
@ -215,13 +206,13 @@ def compile_file(fullname, ddir=None, force=False, rx=None, quiet=0,
|
|||
if stripdir is not None:
|
||||
fullname_parts = fullname.split(os.path.sep)
|
||||
stripdir_parts = stripdir.split(os.path.sep)
|
||||
ddir_parts = list(fullname_parts)
|
||||
|
||||
if stripdir_parts != fullname_parts[:len(stripdir_parts)]:
|
||||
if quiet < 2:
|
||||
print("The stripdir path {!r} is not a valid prefix for "
|
||||
"source path {!r}; ignoring".format(stripdir, fullname))
|
||||
else:
|
||||
dfile = os.path.join(*fullname_parts[len(stripdir_parts):])
|
||||
for spart, opart in zip(stripdir_parts, fullname_parts):
|
||||
if spart == opart:
|
||||
ddir_parts.remove(spart)
|
||||
|
||||
dfile = os.path.join(*ddir_parts)
|
||||
|
||||
if prependdir is not None:
|
||||
if dfile is None:
|
||||
|
|
@ -267,7 +258,7 @@ def compile_file(fullname, ddir=None, force=False, rx=None, quiet=0,
|
|||
if not force:
|
||||
try:
|
||||
mtime = int(os.stat(fullname).st_mtime)
|
||||
expect = struct.pack(*(pyc_header_format + (mtime & 0xFFFF_FFFF,)))
|
||||
expect = struct.pack(*(pyc_header_format + (mtime,)))
|
||||
for cfile in opt_cfiles.values():
|
||||
with open(cfile, 'rb') as chandle:
|
||||
actual = chandle.read(pyc_header_lenght)
|
||||
|
|
@ -310,8 +301,9 @@ def compile_file(fullname, ddir=None, force=False, rx=None, quiet=0,
|
|||
else:
|
||||
print('*** ', end='')
|
||||
# escape non-printable characters in msg
|
||||
encoding = sys.stdout.encoding or sys.getdefaultencoding()
|
||||
msg = err.msg.encode(encoding, errors='backslashreplace').decode(encoding)
|
||||
msg = err.msg.encode(sys.stdout.encoding,
|
||||
errors='backslashreplace')
|
||||
msg = msg.decode(sys.stdout.encoding)
|
||||
print(msg)
|
||||
except (SyntaxError, UnicodeError, OSError) as e:
|
||||
success = False
|
||||
|
|
@ -416,8 +408,8 @@ def main():
|
|||
type=int, help='Run compileall concurrently')
|
||||
parser.add_argument('-o', action='append', type=int, dest='opt_levels',
|
||||
help=('Optimization levels to run compilation with. '
|
||||
'Default is -1 which uses the optimization level '
|
||||
'of the Python interpreter itself (see -O).'))
|
||||
'Default is -1 which uses optimization level of '
|
||||
'Python interpreter itself (specified by -O).'))
|
||||
parser.add_argument('-e', metavar='DIR', dest='limit_sl_dest',
|
||||
help='Ignore symlinks pointing outsite of the DIR')
|
||||
parser.add_argument('--hardlink-dupes', action='store_true',
|
||||
|
|
@ -464,8 +456,7 @@ def main():
|
|||
# if flist is provided then load it
|
||||
if args.flist:
|
||||
try:
|
||||
with (sys.stdin if args.flist=='-' else
|
||||
open(args.flist, encoding="utf-8")) as f:
|
||||
with (sys.stdin if args.flist=='-' else open(args.flist)) as f:
|
||||
for line in f:
|
||||
compile_dests.append(line.strip())
|
||||
except OSError:
|
||||
|
|
@ -473,6 +464,9 @@ def main():
|
|||
print("Error reading file list {}".format(args.flist))
|
||||
return False
|
||||
|
||||
if args.workers is not None:
|
||||
args.workers = args.workers or None
|
||||
|
||||
if PY37 and args.invalidation_mode:
|
||||
ivl_mode = args.invalidation_mode.replace('-', '_').upper()
|
||||
invalidation_mode = py_compile.PycInvalidationMode[ivl_mode]
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@ import os
|
|||
import re
|
||||
import site
|
||||
import sys
|
||||
import traceback
|
||||
|
||||
from contextlib import contextmanager
|
||||
from pathlib import Path
|
||||
|
|
@ -94,24 +93,11 @@ def read_modules_from_all_args(args):
|
|||
|
||||
def import_modules(modules):
|
||||
'''Procedure to perform import check for each module name from the given list of modules.
|
||||
|
||||
Return a list of failed modules.
|
||||
'''
|
||||
|
||||
failed_modules = []
|
||||
|
||||
for module in modules:
|
||||
print('Check import:', module, file=sys.stderr)
|
||||
try:
|
||||
importlib.import_module(module)
|
||||
except Exception:
|
||||
traceback.print_exc(file=sys.stderr)
|
||||
failed_modules.append(module)
|
||||
|
||||
if failed_modules:
|
||||
print(f'Failed to import: {", ".join(failed_modules)}', file=sys.stderr)
|
||||
|
||||
return failed_modules
|
||||
importlib.import_module(module)
|
||||
|
||||
|
||||
def argparser():
|
||||
|
|
@ -178,10 +164,7 @@ def main(argv=None):
|
|||
|
||||
with remove_unwanteds_from_sys_path():
|
||||
addsitedirs_from_environ()
|
||||
failed_modules = import_modules(modules)
|
||||
|
||||
if failed_modules:
|
||||
raise SystemExit(1)
|
||||
import_modules(modules)
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
|
|
|
|||
|
|
@ -23,23 +23,6 @@ end
|
|||
print(_python_macro_cache[cache_key][name])
|
||||
}
|
||||
|
||||
# Deprecation wrapper, warns only once per macro
|
||||
# Options:
|
||||
# -n - The name of the macro that is deprecated
|
||||
%_python_deprecated(n:) %{lua:
|
||||
if not _python_deprecated_warned then
|
||||
-- This is intentionally a global lua table
|
||||
_python_deprecated_warned = {}
|
||||
end
|
||||
if not _python_deprecated_warned[opt.n] then
|
||||
_python_deprecated_warned[opt.n] = true
|
||||
local msg = "The %" .. opt.n .. " macro is deprecated and will likely stop working in Fedora 44. " ..
|
||||
"See the current Python packaging guidelines: " ..
|
||||
"https://docs.fedoraproject.org/en-US/packaging-guidelines/Python/"
|
||||
macros.warn({msg})
|
||||
end
|
||||
}
|
||||
|
||||
# unversioned macros: used with user defined __python, no longer part of rpm >= 4.15
|
||||
# __python is defined to error by default in the srpm macros
|
||||
# nb: $RPM_BUILD_ROOT is not set when the macros are expanded (at spec parse time)
|
||||
|
|
@ -86,17 +69,17 @@ end
|
|||
|
||||
# Use the slashes after expand so that the command starts on the same line as
|
||||
# the macro
|
||||
%py_build() %{_python_deprecated -n py_build}%{expand:\\\
|
||||
%py_build() %{expand:\\\
|
||||
CFLAGS="${CFLAGS:-${RPM_OPT_FLAGS}}" LDFLAGS="${LDFLAGS:-${RPM_LD_FLAGS}}"\\\
|
||||
%{__python} %{py_setup} %{?py_setup_args} build --executable="%{__python} %{py_shbang_opts}" %{?*}
|
||||
}
|
||||
|
||||
%py_build_wheel() %{_python_deprecated -n py_build_wheel}%{expand:\\\
|
||||
%py_build_wheel() %{expand:\\\
|
||||
CFLAGS="${CFLAGS:-${RPM_OPT_FLAGS}}" LDFLAGS="${LDFLAGS:-${RPM_LD_FLAGS}}"\\\
|
||||
%{__python} %{py_setup} %{?py_setup_args} bdist_wheel %{?*}
|
||||
}
|
||||
|
||||
%py_install() %{_python_deprecated -n py_install}%{expand:\\\
|
||||
%py_install() %{expand:\\\
|
||||
CFLAGS="${CFLAGS:-${RPM_OPT_FLAGS}}" LDFLAGS="${LDFLAGS:-${RPM_LD_FLAGS}}"\\\
|
||||
%{__python} %{py_setup} %{?py_setup_args} install -O1 --skip-build --root %{buildroot} --prefix %{_prefix} %{?*}
|
||||
rm -rfv %{buildroot}%{_bindir}/__pycache__
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
# There are two macros:
|
||||
#
|
||||
# This always contains the major.minor version (with dots), default for %%python3_version.
|
||||
%__default_python3_version 3.14
|
||||
%__default_python3_version 3.12
|
||||
#
|
||||
# The pkgname version that determines the alternative provide name (e.g. python3.9-foo),
|
||||
# set to the same as above, but historically hasn't included the dot.
|
||||
|
|
@ -66,8 +66,6 @@
|
|||
|
||||
### BRP scripts (and related macros)
|
||||
|
||||
## Modifies installation method in .dist-info/INSTALLER file to rpm
|
||||
%python_rpm_in_distinfo 1
|
||||
## Automatically compile python files
|
||||
%py_auto_byte_compile 1
|
||||
## Should python bytecompilation errors terminate a build?
|
||||
|
|
@ -80,19 +78,16 @@
|
|||
%__env_unset_source_date_epoch_if_not_clamp_mtime %[0%{?clamp_mtime_to_source_date_epoch} == 0 ? "env -u SOURCE_DATE_EPOCH" : "env"]
|
||||
|
||||
## The individual BRP scripts
|
||||
%__brp_python_rpm_in_distinfo %{_rpmconfigdir}/redhat/brp-python-rpm-in-distinfo
|
||||
%__brp_python_bytecompile %{__env_unset_source_date_epoch_if_not_clamp_mtime} %{_rpmconfigdir}/redhat/brp-python-bytecompile "" "%{?_python_bytecompile_errors_terminate_build}" "%{?_python_bytecompile_extra}" "%{?_smp_build_ncpus:-j%{_smp_build_ncpus}}"
|
||||
%__brp_fix_pyc_reproducibility %{_rpmconfigdir}/redhat/brp-fix-pyc-reproducibility
|
||||
%__brp_python_hardlink %{_rpmconfigdir}/redhat/brp-python-hardlink
|
||||
|
||||
## This macro is included in redhat-rpm-config's %%__os_install_post
|
||||
# Note that the order matters:
|
||||
# 1. brp-python-rpm-in-distinfo modifies .dist-info/INSTALLER file
|
||||
# 2. brp-python-bytecompile can create (or replace) pyc files
|
||||
# 3. brp-fix-pyc-reproducibility can modify the pyc files from above
|
||||
# 4. brp-python-hardlink de-duplicates identical pyc files
|
||||
# 1. brp-python-bytecompile can create (or replace) pyc files
|
||||
# 2. brp-fix-pyc-reproducibility can modify the pyc files from above
|
||||
# 3. brp-python-hardlink de-duplicates identical pyc files
|
||||
%__os_install_post_python \
|
||||
%{?python_rpm_in_distinfo:%{?__brp_python_rpm_in_distinfo}} \
|
||||
%{?py_auto_byte_compile:%{?__brp_python_bytecompile}} \
|
||||
%{?py_reproducible_pyc_path:%{?__brp_fix_pyc_reproducibility} "%{py_reproducible_pyc_path}"} \
|
||||
%{?__brp_python_hardlink} \
|
||||
|
|
@ -230,7 +225,7 @@
|
|||
end
|
||||
}
|
||||
|
||||
%python_extras_subpkg(n:i:f:FaAv:) %{expand:%{lua:
|
||||
%python_extras_subpkg(n:i:f:FaA) %{expand:%{lua:
|
||||
local option_n = '-n (name of the base package)'
|
||||
local option_i = '-i (buildroot path to metadata)'
|
||||
local option_f = '-f (builddir path to a filelist)'
|
||||
|
|
@ -243,7 +238,6 @@
|
|||
local value_F = rpm.expand('%{-F}')
|
||||
local value_a = rpm.expand('%{-a}')
|
||||
local value_A = rpm.expand('%{-A}')
|
||||
local value_v = rpm.expand('%{-v}')
|
||||
local args = rpm.expand('%{*}')
|
||||
if value_n == '' then
|
||||
rpm.expand('%{error:%%%0: missing option ' .. option_n .. '}')
|
||||
|
|
@ -266,8 +260,7 @@
|
|||
if args == '' then
|
||||
rpm.expand('%{error:%%%0 requires at least one argument with "extras" name}')
|
||||
end
|
||||
local verrel = rpm.expand('%{?-v*}%{!?-v:%{version}-%{release}}')
|
||||
local requires = 'Requires: ' .. value_n .. ' = %{?epoch:%{epoch}:}' .. verrel
|
||||
local requires = 'Requires: ' .. value_n .. ' = %{?epoch:%{epoch}:}%{version}-%{release}'
|
||||
for extras in args:gmatch('[^%s,]+') do
|
||||
local rpmname = value_n .. '+' .. extras
|
||||
local pkgdef = '%package -n ' .. rpmname
|
||||
|
|
@ -287,7 +280,7 @@
|
|||
'It makes sure the dependencies are installed.\\\n'
|
||||
local files = ''
|
||||
if value_i ~= '' then
|
||||
files = '%files -n ' .. rpmname .. '\\\n' .. '%ghost %dir ' .. value_i
|
||||
files = '%files -n ' .. rpmname .. '\\\n' .. '%ghost ' .. value_i
|
||||
elseif value_f ~= '' then
|
||||
files = '%files -n ' .. rpmname .. ' -f ' .. value_f
|
||||
end
|
||||
|
|
|
|||
|
|
@ -1,124 +0,0 @@
|
|||
# The macros in this file are used to add SBOM to wheel files that we ship.
|
||||
# Majority of Python packages will not need to do that,
|
||||
# as they only use wheels as an intermediate artifact.
|
||||
# The macros will be used by packages installing wheel to %%python_wheel_dir
|
||||
# or by Python interpreters bundling their own (patched) wheels.
|
||||
#
|
||||
# The runtime dependencies are not Required by the python-rpm-macros package,
|
||||
# users of this macro need to specify them on their own or rely on the fact that
|
||||
# they are all available in the default buildroot.
|
||||
#
|
||||
# Usage: %%python_wheel_inject_sbom PATHS_TO_WHEELS
|
||||
#
|
||||
# The wheels are modified in-place.
|
||||
|
||||
|
||||
# Path of the SBOM file in the PEP 770 .dist-info/sboms directory
|
||||
# This filename is explicitly mentioned in https://cyclonedx.org/specification/overview/
|
||||
# section Recognized file patterns
|
||||
%__python_wheel_sbom_filename bom.json
|
||||
|
||||
|
||||
# The SBOM content to put to the file
|
||||
# This is a CycloneDX component as recommended in https://discuss.python.org/t/97436/7
|
||||
%__python_wheel_sbom_content %{expand:{
|
||||
"bomFormat": "CycloneDX",
|
||||
"specVersion": "1.6",
|
||||
"components": [
|
||||
{
|
||||
"type": "library",
|
||||
"name": "%{name}",
|
||||
"version": "%{version}-%{release}",
|
||||
"purl": "%{__python_wheel_purl}"
|
||||
}
|
||||
]
|
||||
}}
|
||||
|
||||
|
||||
# The purl used above
|
||||
# We use the src package name (which is easier to get and more useful to consumers).
|
||||
# Note that epoch needs special handling, see https://github.com/package-url/purl-spec/issues/69
|
||||
# and https://redhatproductsecurity.github.io/security-data-guidelines/purl/
|
||||
%__python_wheel_purl pkg:rpm/%{__python_wheel_dist_purl_namespace}/%{name}@%{version}-%{release}?%{?epoch:epoch=%{epoch}&}arch=src
|
||||
|
||||
|
||||
# The purl namespace used above
|
||||
# https://lists.fedoraproject.org/archives/list/packaging@lists.fedoraproject.org/thread/GTRCTAF3R3SSBVEJYFCATKNRT7RYVFQI/
|
||||
# Distributors, define %%dist_purl_namespace to set this.
|
||||
# The rest of the code is fallback for distributions without it (relying on %%dist_name).
|
||||
%__python_wheel_dist_purl_namespace %{?dist_purl_namespace}%{!?dist_purl_namespace:%{lua:
|
||||
if macros.epel then
|
||||
-- being epel beats the %%dist_name value
|
||||
-- added in https://src.fedoraproject.org/rpms/epel-rpm-macros/pull-request/86
|
||||
print("epel")
|
||||
else
|
||||
local dist_map = {
|
||||
-- fedora is in the purl-spec examples https://github.com/package-url/purl-spec/blob/main/PURL-TYPES.rst#rpm
|
||||
-- added in https://src.fedoraproject.org/rpms/fedora-release/pull-request/385
|
||||
["Fedora Linux"] = "fedora",
|
||||
-- added in https://gitlab.com/redhat/centos-stream/rpms/centos-stream-release/-/merge_requests/7
|
||||
["CentOS Stream"] = "centos",
|
||||
-- documented at https://redhatproductsecurity.github.io/security-data-guidelines/purl/
|
||||
["Red Hat Enterprise Linux"] = "redhat",
|
||||
-- documented at https://wiki.almalinux.org/documentation/sbom-guide.html
|
||||
["AlmaLinux"] = "almalinux",
|
||||
-- from https://github.com/google/osv.dev/pull/2939
|
||||
["Rocky Linux"] = "rocky-linux",
|
||||
}
|
||||
print(dist_map[macros.dist_name] or "unknown")
|
||||
end
|
||||
}}
|
||||
|
||||
|
||||
# A Bash scriptlet to inject the SBOM file into the wheel(s)
|
||||
# The macro takes positional nargs+ with wheel paths
|
||||
# For each wheel, it
|
||||
# 1. aborts if the SBOM file is already there (it won't override)
|
||||
# 2. inserts the SBOM file to .dist-info/sboms
|
||||
# 3. amends .dist-info/RECORD with the added SBOM file
|
||||
%python_wheel_inject_sbom() %{expand:(
|
||||
%[%# ? "" : "%{error:%%%0: At least one argument (wheel path) is required}"]
|
||||
|
||||
set -eu -o pipefail
|
||||
export LANG=C.utf-8
|
||||
|
||||
tmpdir=$(mktemp -d)
|
||||
trap 'rm -rf "$tmpdir"' EXIT
|
||||
pwd0=$(pwd)
|
||||
ret=0
|
||||
|
||||
for whl in %{*}; do
|
||||
cd "$tmpdir"
|
||||
if [[ "$whl" != /* ]]; then
|
||||
whl="$pwd0/$whl"
|
||||
fi
|
||||
|
||||
record=$(zipinfo -1 "$whl" | grep -E '^[^/]+-[^/]+\.dist-info/RECORD$')
|
||||
distinfo="${record%%/RECORD}"
|
||||
bom="$distinfo/sboms/%{__python_wheel_sbom_filename}"
|
||||
|
||||
if zipinfo -1 "$whl" | grep -qFx "$bom"; then
|
||||
echo -e "\\n\\nERROR %%%%%0: $whl already has $bom, aborting\\n\\n" >&2
|
||||
ret=1
|
||||
continue
|
||||
fi
|
||||
|
||||
unzip "$whl" "$record"
|
||||
mkdir "$distinfo/sboms"
|
||||
echo '%{__python_wheel_sbom_content}' > "$bom"
|
||||
checksum="sha256=$(sha256sum "$bom" | cut -f1 -d' ')"
|
||||
size="$(wc --bytes "$bom" | cut -f1 -d' ')"
|
||||
echo "$bom,$checksum,$size" >> "$record"
|
||||
|
||||
if [[ -n "${SOURCE_DATE_EPOCH:-}" ]]; then
|
||||
touch --date="@$SOURCE_DATE_EPOCH" "$bom" "$record"
|
||||
fi
|
||||
|
||||
zip -r "$whl" "$record" "$bom"
|
||||
rm -rf "$distinfo"
|
||||
cd "$pwd0"
|
||||
done
|
||||
|
||||
exit $ret
|
||||
)}
|
||||
|
||||
|
|
@ -43,17 +43,17 @@
|
|||
|
||||
# Use the slashes after expand so that the command starts on the same line as
|
||||
# the macro
|
||||
%py3_build() %{_python_deprecated -n py3_build}%{expand:\\\
|
||||
%py3_build() %{expand:\\\
|
||||
CFLAGS="${CFLAGS:-${RPM_OPT_FLAGS}}" LDFLAGS="${LDFLAGS:-${RPM_LD_FLAGS}}"\\\
|
||||
%{__python3} %{py_setup} %{?py_setup_args} build --executable="%{__python3} %{py3_shbang_opts}" %{?*}
|
||||
}
|
||||
|
||||
%py3_build_wheel() %{_python_deprecated -n py3_build_wheel}%{expand:\\\
|
||||
%py3_build_wheel() %{expand:\\\
|
||||
CFLAGS="${CFLAGS:-${RPM_OPT_FLAGS}}" LDFLAGS="${LDFLAGS:-${RPM_LD_FLAGS}}"\\\
|
||||
%{__python3} %{py_setup} %{?py_setup_args} bdist_wheel %{?*}
|
||||
}
|
||||
|
||||
%py3_install() %{_python_deprecated -n py3_install}%{expand:\\\
|
||||
%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__
|
||||
|
|
|
|||
|
|
@ -56,6 +56,7 @@ def main():
|
|||
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)
|
||||
|
|
|
|||
40
plan.fmf
40
plan.fmf
|
|
@ -1,40 +0,0 @@
|
|||
execute:
|
||||
how: tmt
|
||||
|
||||
discover:
|
||||
- name: same_repo
|
||||
how: shell
|
||||
tests:
|
||||
- name: pytest
|
||||
test: PYTHONPATH=/usr/lib/rpm/redhat ALTERNATE_PYTHON_VERSION=3.6 pytest -v
|
||||
- name: manual_byte_compilation_clamp_mtime_off
|
||||
path: /tests
|
||||
test: rpmbuild --define 'dist .clamp0' --define 'clamp_mtime_to_source_date_epoch 0' -ba pythontest.spec
|
||||
- name: manual_byte_compilation_clamp_mtime_on
|
||||
path: /tests
|
||||
test: rpmbuild --define 'dist .clamp1' --define 'clamp_mtime_to_source_date_epoch 1' -ba pythontest.spec
|
||||
- name: rpmlint_clamp_mtime_off
|
||||
test: rpmlint ~/rpmbuild/RPMS/x86_64/pythontest-0-0.clamp0.x86_64.rpm | grep python-bytecode-inconsistent-mtime || exit 0 && exit 1
|
||||
- name: rpmlint_clamp_mtime_on
|
||||
test: rpmlint ~/rpmbuild/RPMS/x86_64/pythontest-0-0.clamp1.x86_64.rpm | grep python-bytecode-inconsistent-mtime || exit 0 && exit 1
|
||||
- name: python_wheel_inject_sbom
|
||||
path: /tests
|
||||
test: rpmbuild -ba testwheel.spec
|
||||
|
||||
prepare:
|
||||
- name: Install dependencies
|
||||
how: install
|
||||
package:
|
||||
- rpm-build
|
||||
- rpmlint
|
||||
- python-rpm-macros
|
||||
- python3-rpm-macros
|
||||
- python3-devel
|
||||
- python3-setuptools
|
||||
- python3-pip
|
||||
- python3-pytest
|
||||
- python3.6
|
||||
- dnf
|
||||
- name: Update packages
|
||||
how: shell
|
||||
script: dnf upgrade -y
|
||||
|
|
@ -8,13 +8,12 @@ Source101: macros.python
|
|||
Source102: macros.python-srpm
|
||||
Source104: macros.python3
|
||||
Source105: macros.pybytecompile
|
||||
Source106: macros.python-wheel-sbom
|
||||
|
||||
# Lua files
|
||||
Source201: python.lua
|
||||
|
||||
# Python code
|
||||
%global compileall2_version 0.8.0
|
||||
%global compileall2_version 0.7.1
|
||||
Source301: https://github.com/fedora-python/compileall2/raw/v%{compileall2_version}/compileall2.py
|
||||
Source302: import_all_modules.py
|
||||
%global pathfix_version 1.0.0
|
||||
|
|
@ -34,8 +33,6 @@ Source402: brp-python-hardlink
|
|||
# This one is from redhat-rpm-config < 190
|
||||
# It has no upstream yet
|
||||
Source403: brp-fix-pyc-reproducibility
|
||||
# brp script to write "rpm" string into the .dist-info/INSTALLER file
|
||||
Source404: brp-python-rpm-in-distinfo
|
||||
|
||||
# macros and lua: MIT
|
||||
# import_all_modules.py: MIT
|
||||
|
|
@ -56,7 +53,7 @@ elseif posix.stat('macros.python-srpm') then
|
|||
end
|
||||
}
|
||||
Version: %{__default_python3_version}
|
||||
Release: 9%{?dist}
|
||||
Release: 8%{?dist}
|
||||
|
||||
BuildArch: noarch
|
||||
|
||||
|
|
@ -139,7 +136,6 @@ install -m 755 brp-* %{buildroot}%{_rpmconfigdir}/redhat/
|
|||
%global __brp_python_bytecompile %{add_buildroot __brp_python_bytecompile}
|
||||
%global __brp_python_hardlink %{add_buildroot __brp_python_hardlink}
|
||||
%global __brp_fix_pyc_reproducibility %{add_buildroot __brp_fix_pyc_reproducibility}
|
||||
%global __brp_python_rpm_in_distinfo %{add_buildroot __brp_python_rpm_in_distinfo}
|
||||
|
||||
|
||||
%check
|
||||
|
|
@ -150,7 +146,6 @@ grep -E '^#[^%%]*%%[^%%]' %{buildroot}%{rpmmacrodir}/macros.* && exit 1 || true
|
|||
%files
|
||||
%{rpmmacrodir}/macros.python
|
||||
%{rpmmacrodir}/macros.pybytecompile
|
||||
%{rpmmacrodir}/macros.python-wheel-sbom
|
||||
%{_rpmconfigdir}/redhat/import_all_modules.py
|
||||
%{_rpmconfigdir}/redhat/pathfix.py
|
||||
|
||||
|
|
@ -161,7 +156,6 @@ grep -E '^#[^%%]*%%[^%%]' %{buildroot}%{rpmmacrodir}/macros.* && exit 1 || true
|
|||
%{_rpmconfigdir}/redhat/brp-python-bytecompile
|
||||
%{_rpmconfigdir}/redhat/brp-python-hardlink
|
||||
%{_rpmconfigdir}/redhat/brp-fix-pyc-reproducibility
|
||||
%{_rpmconfigdir}/redhat/brp-python-rpm-in-distinfo
|
||||
%{_rpmluadir}/fedora/srpm/python.lua
|
||||
|
||||
%files -n python3-rpm-macros
|
||||
|
|
@ -169,58 +163,9 @@ grep -E '^#[^%%]*%%[^%%]' %{buildroot}%{rpmmacrodir}/macros.* && exit 1 || true
|
|||
|
||||
|
||||
%changelog
|
||||
* Thu Oct 16 2025 Miro Hrončok <mhroncok@redhat.com> - 3.14-9
|
||||
- %%python_extras_subpkg: Only %%ghost the egg-info/dist-info directory, not the content
|
||||
- That way, accidentally unpackaged files within are reported as errors
|
||||
|
||||
* Tue Sep 09 2025 Miro Hrončok <mhroncok@redhat.com> - 3.14-8
|
||||
- %%python_extras_subpkg: Add -v option to specify the required version(-release)
|
||||
- This is useful when the extras are built from a different specfile (e.g. in EPEL for a RHEL base package)
|
||||
|
||||
* Fri Aug 29 2025 Miro Hrončok <mhroncok@redhat.com> - 3.14-7
|
||||
- %%python_wheel_inject_sbom: Don't accidentally alter nested .dist-infos
|
||||
|
||||
* Wed Aug 13 2025 Miro Hrončok <mhroncok@redhat.com> - 3.14-6
|
||||
- Introduce %%python_wheel_inject_sbom
|
||||
|
||||
* Mon Aug 11 2025 Lumír Balhar <lbalhar@redhat.com> - 3.14-5
|
||||
- import_all_modules: Add error handling for import failures
|
||||
|
||||
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org>
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
|
||||
|
||||
* Mon Jul 21 2025 Íñigo Huguet <ihuguet@riseup.net> - 3.14-3
|
||||
- pathfix.py: Don't fail on symbolic links
|
||||
|
||||
* Sun Jun 29 2025 Miro Hrončok <mhroncok@redhat.com> - 3.14-2
|
||||
- Deprecate %%py3_build, %%py3_build_wheel, and %%py3_install
|
||||
- Deprecate %%py_build, %%py_build_wheel, and %%py_install
|
||||
- https://fedoraproject.org/wiki/Changes/DeprecateSetuppyMacros
|
||||
|
||||
* Wed May 28 2025 Karolina Surma <ksurma@redhat.com> - 3.14-1
|
||||
- Update main Python to 3.14
|
||||
|
||||
* Mon Feb 10 2025 Tomáš Hrnčiar <thrnciar@redhat.com> - 3.13-5
|
||||
- Add brp script to modify .dist-info/INSTALLER file
|
||||
|
||||
* Sat Jan 18 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.13-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
|
||||
|
||||
* Fri Jul 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.12-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
|
||||
|
||||
* Tue Jun 25 2024 Cristian Le <fedora@lecris.me> - 3.13-2
|
||||
* Tue Jun 25 2024 Cristian Le <fedora@lecris.me> - 3.12-8
|
||||
- %%python_extras_subpkg: Add option -a to include BuildArch: noarch
|
||||
|
||||
* Thu Jun 06 2024 Karolina Surma <ksurma@redhat.com> - 3.13-1
|
||||
- Update main Python to 3.13
|
||||
|
||||
* Thu Mar 28 2024 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 3.12-9
|
||||
- Minor improvements to brp-fix-pyc-reproducibility
|
||||
|
||||
* Fri Mar 22 2024 Lumír Balhar <lbalhar@redhat.com> - 3.12-8
|
||||
- Update bundled compileall2 to version 0.8.0
|
||||
|
||||
* Thu Jan 25 2024 Miro Hrončok <mhroncok@redhat.com> - 3.12-7
|
||||
- %%py3_test_envvars: Only set $PYTEST_XDIST_AUTO_NUM_WORKERS if not already set
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,9 @@
|
|||
%global basedir /opt/test/byte_compilation
|
||||
|
||||
# We have 3 different ways of bytecompiling: for 3.9+, 3.4-3.8, and 2.7
|
||||
# Test with a representative of each, except 2.7 which we no longer have
|
||||
# Test with a representative of each.
|
||||
%global python36_sitelib /usr/lib/python3.6/site-packages
|
||||
%global python27_sitelib /usr/lib/python2.7/site-packages
|
||||
|
||||
Name: pythontest
|
||||
Version: 0
|
||||
|
|
@ -11,6 +12,7 @@ Summary: ...
|
|||
License: MIT
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: python3.6
|
||||
BuildRequires: python2.7
|
||||
|
||||
%description
|
||||
...
|
||||
|
|
@ -31,19 +33,23 @@ echo "print()" > %{buildroot}%{python3_sitelib}/directory/file.py
|
|||
mkdir -p %{buildroot}%{python36_sitelib}/directory/
|
||||
echo "print()" > %{buildroot}%{python36_sitelib}/directory/file.py
|
||||
|
||||
mkdir -p %{buildroot}%{python27_sitelib}/directory/
|
||||
echo "print()" > %{buildroot}%{python27_sitelib}/directory/file.py
|
||||
|
||||
%check
|
||||
LOCATIONS="
|
||||
%{buildroot}%{basedir}
|
||||
%{buildroot}%{python3_sitelib}/directory/
|
||||
%{buildroot}%{python36_sitelib}/directory/
|
||||
%{buildroot}%{python27_sitelib}/directory/
|
||||
"
|
||||
|
||||
# Count .py and .pyc files
|
||||
PY=$(find $LOCATIONS -name "*.py" | wc -l)
|
||||
PYC=$(find $LOCATIONS -name "*.py[co]" | wc -l)
|
||||
|
||||
# We should have 4 .py files (3 for python3, one for 3.6)
|
||||
test $PY -eq 4
|
||||
# We should have 5 .py files (3 for python3, one each for 3.6 & 2.7)
|
||||
test $PY -eq 5
|
||||
|
||||
# Every .py file should be byte-compiled to two .pyc files (optimization level 0 and 1)
|
||||
# so we should have two times more .pyc files than .py files
|
||||
|
|
@ -64,6 +70,7 @@ test $PY -ge $INODES
|
|||
%pycached %{basedir}/directory/to/test/recursion/file_in_dir.py
|
||||
%pycached %{python3_sitelib}/directory/file.py
|
||||
%pycached %{python36_sitelib}/directory/file.py
|
||||
%{python27_sitelib}/directory/file.py*
|
||||
|
||||
|
||||
%changelog
|
||||
|
|
|
|||
|
|
@ -551,7 +551,7 @@ def test_python_extras_subpkg_i():
|
|||
It makes sure the dependencies are installed.
|
||||
|
||||
%files -n python3-setuptools_scm+toml
|
||||
%ghost %dir /usr/lib/python{X_Y}/site-packages/*.egg-info
|
||||
%ghost /usr/lib/python{X_Y}/site-packages/*.egg-info
|
||||
|
||||
%package -n python3-setuptools_scm+yaml
|
||||
Summary: Metapackage for python3-setuptools_scm: yaml extras
|
||||
|
|
@ -562,7 +562,7 @@ def test_python_extras_subpkg_i():
|
|||
It makes sure the dependencies are installed.
|
||||
|
||||
%files -n python3-setuptools_scm+yaml
|
||||
%ghost %dir /usr/lib/python{X_Y}/site-packages/*.egg-info
|
||||
%ghost /usr/lib/python{X_Y}/site-packages/*.egg-info
|
||||
""").lstrip().splitlines()
|
||||
assert lines == expected
|
||||
|
||||
|
|
@ -658,21 +658,6 @@ def test_python_extras_subpkg_aA():
|
|||
'BuildArch: noarch (default)) options are not possible')
|
||||
|
||||
|
||||
def test_python_extras_subpkg_v():
|
||||
lines = rpm_eval('%python_extras_subpkg -n python3-setuptools_scm -A -v 1.2.3 -F toml',
|
||||
version='6', release='7')
|
||||
expected = textwrap.dedent(f"""
|
||||
%package -n python3-setuptools_scm+toml
|
||||
Summary: Metapackage for python3-setuptools_scm: toml extras
|
||||
Requires: python3-setuptools_scm = 1.2.3
|
||||
%description -n python3-setuptools_scm+toml
|
||||
This is a metapackage bringing in toml extras requires for
|
||||
python3-setuptools_scm.
|
||||
It makes sure the dependencies are installed.
|
||||
""").lstrip().splitlines()
|
||||
assert lines == expected
|
||||
|
||||
|
||||
def test_python_extras_subpkg_underscores():
|
||||
lines = rpm_eval('%python_extras_subpkg -n python3-webscrapbook -F adhoc_ssl',
|
||||
version='0.33.3', release='1.fc33')
|
||||
|
|
@ -775,9 +760,6 @@ unversioned_macros = pytest.mark.parametrize('macro', [
|
|||
@unversioned_macros
|
||||
def test_unversioned_python_errors(macro):
|
||||
lines = rpm_eval(macro, fails=True)
|
||||
# strip the deprecation message
|
||||
if 'deprecated' in lines[0]:
|
||||
lines = lines[1:]
|
||||
assert lines[0] == (
|
||||
'error: attempt to use unversioned python, '
|
||||
'define %__python to /usr/bin/python2 or /usr/bin/python3 explicitly'
|
||||
|
|
@ -795,9 +777,7 @@ def test_unversioned_python_errors(macro):
|
|||
@unversioned_macros
|
||||
def test_unversioned_python_works_when_defined(macro):
|
||||
macro3 = macro.replace('python', 'python3').replace('py_', 'py3_')
|
||||
unverisoned = rpm_eval(macro, __python='/usr/bin/python3')
|
||||
expected = [l.replace(macro3, macro) for l in rpm_eval(macro3)]
|
||||
assert unverisoned == expected
|
||||
assert rpm_eval(macro, __python='/usr/bin/python3') == rpm_eval(macro3)
|
||||
|
||||
|
||||
# we could rework the test for multiple architectures, but the Fedora CI currently only runs on x86_64
|
||||
|
|
@ -978,30 +958,3 @@ def test_multi_python3(alt_x_y):
|
|||
lines = rpm_eval(evals)
|
||||
lines = [l for l in lines if l] # strip empty lines generated by %global
|
||||
assert lines == [X_Y, alt_x_y, X_Y, X_Y]
|
||||
|
||||
|
||||
@pytest.mark.parametrize('macro', [
|
||||
'%py3_build',
|
||||
'%py3_build_wheel',
|
||||
'%py3_install',
|
||||
])
|
||||
def test_deprecation(macro):
|
||||
lines = rpm_eval(macro)
|
||||
assert "is deprecated" in lines[0]
|
||||
assert f"{macro} " in lines[0]
|
||||
|
||||
|
||||
def test_multiple_deprecation():
|
||||
source = '%{py3_build}' * 10 + '%{py3_build_wheel}' * 10 + '%{py3_install}' * 10 + '%{py3_build}'
|
||||
lines = rpm_eval(source)
|
||||
|
||||
assert "is deprecated" in lines[0]
|
||||
assert "%py3_build " in lines[0]
|
||||
|
||||
assert "is deprecated" in lines[1]
|
||||
assert "%py3_build_wheel " in lines[1]
|
||||
|
||||
assert "is deprecated" in lines[2]
|
||||
assert "%py3_install " in lines[2]
|
||||
|
||||
assert "is deprecated" not in '\n'.join(lines[3:])
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
from import_all_modules import argparser, exclude_unwanted_module_globs, import_modules
|
||||
from import_all_modules import argparser, exclude_unwanted_module_globs
|
||||
from import_all_modules import main as modules_main
|
||||
from import_all_modules import read_modules_from_cli, filter_top_level_modules_only
|
||||
|
||||
|
|
@ -119,7 +119,7 @@ def test_import_all_modules_does_not_import():
|
|||
# We already imported it in this file once, make sure it's not imported
|
||||
# from the cache
|
||||
sys.modules.pop('import_all_modules')
|
||||
with pytest.raises(SystemExit):
|
||||
with pytest.raises(ModuleNotFoundError):
|
||||
modules_main(['import_all_modules'])
|
||||
|
||||
|
||||
|
|
@ -127,7 +127,7 @@ def test_modules_from_cwd_not_found(tmp_path, monkeypatch):
|
|||
test_module = tmp_path / 'this_is_a_module_in_cwd.py'
|
||||
test_module.write_text('')
|
||||
monkeypatch.chdir(tmp_path)
|
||||
with pytest.raises(SystemExit):
|
||||
with pytest.raises(ModuleNotFoundError):
|
||||
modules_main(['this_is_a_module_in_cwd'])
|
||||
|
||||
|
||||
|
|
@ -160,22 +160,22 @@ def test_modules_from_files_are_found(tmp_path):
|
|||
test_file_3 = tmp_path / 'this_is_a_file_in_tmp_path_3.txt'
|
||||
|
||||
test_file_1.write_text('math\nwave\n')
|
||||
test_file_2.write_text('csv\nnetrc\n')
|
||||
test_file_2.write_text('csv\npathlib\n')
|
||||
test_file_3.write_text('logging\ncsv\n')
|
||||
|
||||
# Make sure the tested modules are not already in sys.modules
|
||||
for m in ('math', 'wave', 'csv', 'netrc', 'logging'):
|
||||
for m in ('math', 'wave', 'csv', 'pathlib', 'logging'):
|
||||
sys.modules.pop(m, None)
|
||||
|
||||
modules_main(['-f', str(test_file_1), '-f', str(test_file_2), '-f', str(test_file_3), ])
|
||||
for module in ('csv', 'math', 'wave', 'netrc', 'logging'):
|
||||
for module in ('csv', 'math', 'wave', 'pathlib', 'logging'):
|
||||
assert module in sys.modules
|
||||
|
||||
|
||||
def test_nonexisting_modules_raise_exception_on_import(tmp_path):
|
||||
test_file = tmp_path / 'this_is_a_file_in_tmp_path.txt'
|
||||
test_file.write_text('nonexisting_module\nanother\n')
|
||||
with pytest.raises(SystemExit):
|
||||
with pytest.raises(ModuleNotFoundError):
|
||||
modules_main(['-f', str(test_file)])
|
||||
|
||||
|
||||
|
|
@ -203,7 +203,7 @@ def test_nested_modules_found_when_expected(tmp_path, monkeypatch, capsys):
|
|||
sys.path.append(str(tmp_path))
|
||||
monkeypatch.chdir(cwd_path)
|
||||
|
||||
with pytest.raises(SystemExit):
|
||||
with pytest.raises(ModuleNotFoundError):
|
||||
modules_main([
|
||||
'this_is_a_module_in_level_0',
|
||||
'nested.this_is_a_module_in_level_1',
|
||||
|
|
@ -253,70 +253,24 @@ def test_non_existing_module_raises_exception(tmp_path):
|
|||
test_module_1.write_text('')
|
||||
sys.path.append(str(tmp_path))
|
||||
|
||||
with pytest.raises(SystemExit):
|
||||
with pytest.raises(ModuleNotFoundError):
|
||||
modules_main([
|
||||
'this_is_a_module_in_tmp_path_1',
|
||||
'this_is_a_module_in_tmp_path_2',
|
||||
])
|
||||
|
||||
|
||||
def test_import_module_returns_failed_modules(tmp_path):
|
||||
test_module_1 = tmp_path / 'this_is_a_module_in_tmp_path_1.py'
|
||||
test_module_1.write_text('')
|
||||
sys.path.append(str(tmp_path))
|
||||
|
||||
failed_modules = import_modules([
|
||||
'this_is_a_module_in_tmp_path_1',
|
||||
'this_is_a_module_in_tmp_path_2',
|
||||
])
|
||||
|
||||
assert failed_modules == ['this_is_a_module_in_tmp_path_2']
|
||||
|
||||
|
||||
def test_module_with_error_propagates_exception(tmp_path, capsys):
|
||||
def test_module_with_error_propagates_exception(tmp_path):
|
||||
|
||||
test_module_1 = tmp_path / 'this_is_a_module_in_tmp_path_1.py'
|
||||
test_module_1.write_text('0/0')
|
||||
sys.path.append(str(tmp_path))
|
||||
|
||||
with pytest.raises(SystemExit):
|
||||
# The correct exception must be raised
|
||||
with pytest.raises(ZeroDivisionError):
|
||||
modules_main([
|
||||
'this_is_a_module_in_tmp_path_1',
|
||||
])
|
||||
_, err = capsys.readouterr()
|
||||
assert "ZeroDivisionError" in err
|
||||
|
||||
|
||||
def test_import_module_returns_empty_list_when_no_modules_failed(tmp_path):
|
||||
test_module_1 = tmp_path / 'this_is_a_module_in_tmp_path_1.py'
|
||||
test_module_1.write_text('')
|
||||
sys.path.append(str(tmp_path))
|
||||
|
||||
failed_modules = import_modules(['this_is_a_module_in_tmp_path_1'])
|
||||
assert failed_modules == []
|
||||
|
||||
|
||||
def test_all_modules_are_imported(tmp_path, capsys):
|
||||
test_module_1 = tmp_path / 'this_is_a_module_in_tmp_path_1.py'
|
||||
test_module_2 = tmp_path / 'this_is_a_module_in_tmp_path_2.py'
|
||||
test_module_3 = tmp_path / 'this_is_a_module_in_tmp_path_3.py'
|
||||
|
||||
for module in (test_module_1, test_module_2, test_module_3):
|
||||
module.write_text('')
|
||||
|
||||
sys.path.append(str(tmp_path))
|
||||
|
||||
with pytest.raises(SystemExit):
|
||||
modules_main([
|
||||
'this_is_a_module_in_tmp_path_1',
|
||||
'missing_module',
|
||||
'this_is_a_module_in_tmp_path_2',
|
||||
'this_is_a_module_in_tmp_path_3',
|
||||
])
|
||||
_, err = capsys.readouterr()
|
||||
for i in range(1, 4):
|
||||
assert f"Check import: this_is_a_module_in_tmp_path_{i}" in err
|
||||
assert "Failed to import: missing_module" in err
|
||||
|
||||
|
||||
def test_correct_modules_are_excluded(tmp_path):
|
||||
|
|
|
|||
|
|
@ -1,41 +0,0 @@
|
|||
from pathlib import Path
|
||||
|
||||
import os
|
||||
import pytest
|
||||
import subprocess
|
||||
|
||||
@pytest.fixture
|
||||
def create_test_files(tmp_path):
|
||||
def _create(subpath, installer_content):
|
||||
dir_path = tmp_path / subpath
|
||||
dir_path.mkdir(parents=True, exist_ok=True)
|
||||
installer_file = dir_path / "INSTALLER"
|
||||
installer_file.write_text(installer_content)
|
||||
record_file = dir_path / "RECORD"
|
||||
record_file.write_text("dummy content in RECORD file\n")
|
||||
return dir_path
|
||||
return _create
|
||||
|
||||
testdata = [
|
||||
("usr/lib/python3.13/site-packages/zipp-3.19.2.dist-info/", "pip\n", "rpm\n", False),
|
||||
("usr/lib64/python3.13/site-packages/zipp-3.19.2.dist-info/", "pip\n", "rpm\n", False),
|
||||
("usr/lib/python3.13/site-packages/setuptools/_vendor/zipp-3.19.2.dist-info/", "pip\n", "pip\n", True),
|
||||
("usr/lib64/python3.13/site-packages/setuptools/_vendor/zipp-3.19.2.dist-info/", "pip\n", "pip\n", True),
|
||||
("usr/lib/python3.13/site-packages/zipp-3.19.2.dist-info/","not pip in INSTALLER\n", "not pip in INSTALLER\n", True),
|
||||
("usr/lib64/python3.13/site-packages/zipp-3.19.2.dist-info/","not pip in INSTALLER\n", "not pip in INSTALLER\n", True),
|
||||
]
|
||||
@pytest.mark.parametrize("path, installer_content, expected_installer_content, record_file_exists", testdata)
|
||||
def test_installer_file_was_correctly_modified(monkeypatch, create_test_files,
|
||||
path, installer_content, expected_installer_content, record_file_exists):
|
||||
script_path = Path("/usr/lib/rpm/redhat/brp-python-rpm-in-distinfo")
|
||||
tmp_dir = create_test_files(path, installer_content)
|
||||
monkeypatch.setenv("RPM_BUILD_ROOT", str(tmp_dir))
|
||||
result = subprocess.run(
|
||||
[script_path],
|
||||
capture_output=True, text=True
|
||||
)
|
||||
|
||||
assert result.returncode == 0
|
||||
assert (Path(tmp_dir) / "INSTALLER").read_text() == expected_installer_content
|
||||
assert Path(tmp_dir / "RECORD").exists() is record_file_exists
|
||||
|
||||
40
tests/tests.yml
Normal file
40
tests/tests.yml
Normal file
|
|
@ -0,0 +1,40 @@
|
|||
---
|
||||
- hosts: localhost
|
||||
tags:
|
||||
- classic
|
||||
tasks:
|
||||
- dnf:
|
||||
name: "*"
|
||||
state: latest
|
||||
|
||||
- hosts: localhost
|
||||
roles:
|
||||
- role: standard-test-basic
|
||||
tags:
|
||||
- classic
|
||||
tests:
|
||||
- pytest:
|
||||
dir: .
|
||||
run: PYTHONPATH=/usr/lib/rpm/redhat ALTERNATE_PYTHON_VERSION=3.6 pytest -v
|
||||
- manual_byte_compilation_clamp_mtime_off:
|
||||
dir: .
|
||||
run: rpmbuild --define 'dist .clamp0' --define 'clamp_mtime_to_source_date_epoch 0' -ba pythontest.spec
|
||||
- manual_byte_compilation_clamp_mtime_on:
|
||||
dir: .
|
||||
run: rpmbuild --define 'dist .clamp1' --define 'clamp_mtime_to_source_date_epoch 1' -ba pythontest.spec
|
||||
- rpmlint_clamp_mtime_off:
|
||||
dir: .
|
||||
run: rpmlint ~/rpmbuild/RPMS/x86_64/pythontest-0-0.clamp0.x86_64.rpm | grep python-bytecode-inconsistent-mtime || exit 0 && exit 1
|
||||
- rpmlint_clamp_mtime_on:
|
||||
dir: .
|
||||
run: rpmlint ~/rpmbuild/RPMS/x86_64/pythontest-0-0.clamp1.x86_64.rpm | grep python-bytecode-inconsistent-mtime || exit 0 && exit 1
|
||||
required_packages:
|
||||
- rpm-build
|
||||
- rpmlint
|
||||
- python-rpm-macros
|
||||
- python3-rpm-macros
|
||||
- python3-devel
|
||||
- python3-pytest
|
||||
- python3.6
|
||||
- python2.7
|
||||
|
||||
|
|
@ -1,116 +0,0 @@
|
|||
Name: testwheel
|
||||
Epoch: 42
|
||||
Version: 1
|
||||
Release: 0%{?dist}
|
||||
Summary: ...
|
||||
License: MIT
|
||||
BuildArch: noarch
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: python3-setuptools >= 61
|
||||
BuildRequires: python3-pip
|
||||
|
||||
%description
|
||||
This builds and installs a wheel which we can then use as a test for
|
||||
%%python_wheel_inject_sbom.
|
||||
|
||||
|
||||
%prep
|
||||
cat > pyproject.toml << EOF
|
||||
[project]
|
||||
name = "testwheel"
|
||||
version = "1"
|
||||
|
||||
[build-system]
|
||||
requires = ["setuptools >= 61"]
|
||||
build-backend = "setuptools.build_meta"
|
||||
|
||||
[tool.setuptools]
|
||||
include-package-data = true
|
||||
|
||||
[tool.setuptools.packages.find]
|
||||
include = ["testwheel*"]
|
||||
EOF
|
||||
# create a secondary dist-info folder in the project
|
||||
# we need to ensure this file is not altered
|
||||
mkdir -p testwheel/_vendor/dependency-2.2.2.dist-info
|
||||
touch testwheel/_vendor/dependency-2.2.2.dist-info/RECORD
|
||||
echo 'recursive-include testwheel/_vendor *' > MANIFEST.in
|
||||
|
||||
|
||||
%build
|
||||
export PIP_CONFIG_FILE=/dev/null
|
||||
%{python3} -m pip wheel . --no-build-isolation
|
||||
|
||||
# The macro should happily alter multiple wheels, let's make more
|
||||
for i in {1..5}; do
|
||||
mkdir ${i}
|
||||
cp -a *.whl ${i}
|
||||
done
|
||||
|
||||
# using relative paths should succeed
|
||||
%python_wheel_inject_sbom {1..5}/*.whl
|
||||
|
||||
# repetitive use should bail out and fail (SBOM is already there)
|
||||
%{python_wheel_inject_sbom {1..5}/*.whl} && exit 1 || true
|
||||
|
||||
# each wheel should already have it, all should fail individually as well
|
||||
for i in {1..5}; do
|
||||
%{python_wheel_inject_sbom ${i}/*.whl} && exit 1 || true
|
||||
done
|
||||
|
||||
|
||||
%install
|
||||
mkdir -p %{buildroot}%{python_wheel_dir}
|
||||
cp -a *.whl %{buildroot}%{python_wheel_dir}
|
||||
|
||||
# using absolute paths should work
|
||||
%python_wheel_inject_sbom %{buildroot}%{python_wheel_dir}/*.whl
|
||||
|
||||
# and fail when repeated
|
||||
%{python_wheel_inject_sbom %{buildroot}%{python_wheel_dir}/*.whl} && exit 1 || true
|
||||
|
||||
|
||||
%check
|
||||
%define venvsite venv/lib/python%{python3_version}/site-packages
|
||||
%{python3} -m venv venv
|
||||
venv/bin/pip install --no-index --no-cache-dir %{buildroot}%{python_wheel_dir}/*.whl
|
||||
|
||||
test -f %{venvsite}/testwheel-1.dist-info/RECORD
|
||||
test -f %{venvsite}/testwheel-1.dist-info/sboms/bom.json
|
||||
grep '^testwheel-1.dist-info/sboms/bom.json,' %{venvsite}/testwheel-1.dist-info/RECORD
|
||||
# a more specific grep. we don't care about CRLF line ends (pip uses those? without the sed the $ doesn't match line end)
|
||||
sed 's/\r//g' %{venvsite}/testwheel-1.dist-info/RECORD | grep -E '^testwheel-1.dist-info/sboms/bom.json,sha256=[a-f0-9]{64},[0-9]+$'
|
||||
|
||||
test -f %{venvsite}/testwheel/_vendor/dependency-2.2.2.dist-info/RECORD
|
||||
test -f %{venvsite}/testwheel/_vendor/dependency-2.2.2.dist-info/sboms/bom.json && exit 1 || true
|
||||
|
||||
# this deliberately uses a different mechanism than the macro
|
||||
# if you are running this test on a different distro, adjust it
|
||||
%define ns %{?fedora:fedora}%{?eln:fedora}%{?epel:epel}%{!?eln:%{!?epel:%{?rhel:redhat}}}
|
||||
|
||||
PYTHONOPTIMIZE=0 %{python3} -c "
|
||||
import json
|
||||
with open('%{venvsite}/testwheel-1.dist-info/sboms/bom.json') as fp:
|
||||
sbom = json.load(fp)
|
||||
assert len(sbom['components']) == 1
|
||||
assert sbom['components'][0]['type'] == 'library'
|
||||
assert sbom['components'][0]['name'] == 'testwheel'
|
||||
assert sbom['components'][0]['version'] == '1-0%{?dist}'
|
||||
assert sbom['components'][0]['purl'] == 'pkg:rpm/%{ns}/testwheel@1-0%{?dist}?epoch=42&arch=src'
|
||||
"
|
||||
|
||||
# replace the installation with the original unaltered wheel
|
||||
venv/bin/pip install --force-reinstall --no-index --no-cache-dir *.whl
|
||||
test -f %{venvsite}/testwheel-1.dist-info/RECORD
|
||||
# no SBOM
|
||||
test ! -e %{venvsite}/testwheel-1.dist-info/sboms/bom.json
|
||||
grep '^testwheel-1.dist-info/sboms/bom.json,' %{venvsite}/testwheel-1.dist-info/RECORD && exit 1 || true
|
||||
|
||||
|
||||
%files
|
||||
%{python_wheel_dir}/*.whl
|
||||
|
||||
|
||||
%changelog
|
||||
* Wed Aug 13 2025 Miro Hrončok <mhroncok@redhat.com> - 42:1-0
|
||||
- A static changelog with a date, so we can clamp mtimes
|
||||
Loading…
Add table
Add a link
Reference in a new issue