From 15e32a300599a69f29d060abe989c4b39f954060 Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Tue, 3 Mar 2020 15:26:45 +0100 Subject: [PATCH] Update of bundled compileall2 module to 0.7.1 (bugfix release) --- compileall2.py | 7 +++++++ python-rpm-macros.spec | 7 +++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/compileall2.py b/compileall2.py index 8976fa0..c58e545 100644 --- a/compileall2.py +++ b/compileall2.py @@ -113,6 +113,13 @@ def compile_dir(dir, maxlevels=None, ddir=None, force=False, hardlink_dupes: hardlink duplicated pyc files """ ProcessPoolExecutor = None + if ddir is not None and (stripdir is not None or prependdir is not None): + raise ValueError(("Destination dir (ddir) cannot be used " + "in combination with stripdir or prependdir")) + if ddir is not None: + stripdir = dir + prependdir = ddir + ddir = None if workers is not None: if workers < 0: raise ValueError('workers must be greater or equal to 0') diff --git a/python-rpm-macros.spec b/python-rpm-macros.spec index dd5ea6a..e10be21 100644 --- a/python-rpm-macros.spec +++ b/python-rpm-macros.spec @@ -1,6 +1,6 @@ Name: python-rpm-macros Version: 3.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The common Python RPM macros # macros: MIT, compileall2.py: PSFv2 @@ -10,7 +10,7 @@ Source1: macros.python-srpm Source2: macros.python2 Source3: macros.python3 Source4: macros.pybytecompile -Source5: https://github.com/fedora-python/compileall2/raw/v0.7.0/compileall2.py +Source5: https://github.com/fedora-python/compileall2/raw/v0.7.1/compileall2.py BuildArch: noarch # For %%python3_pkgversion used in %%python_provide and compileall2.py @@ -78,6 +78,9 @@ install -m 644 %{SOURCE5} \ %changelog +* Tue Mar 31 2020 Lumír Balhar - 3.8-2 +- Update of bundled compileall2 module to 0.7.1 (bugfix release) + * Mon Mar 23 2020 Miro Hrončok - 3.8-1 - Hardcode the default Python 3 version in the SRPM macros (#1812087) - Provide python38-foo for python3-foo and the other way around (future RHEL compatibility)