From 9ccbd01ce18d0c137f8c82b6956e1d76258191823d9dcaa3fe94c0cd63f1bb29 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Wed, 4 May 2022 17:48:59 +0000 Subject: [PATCH] Accepting request 974913 from home:pgajdos:python MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - version update to 1.7.0 * [Feature] #845: Env vars explicitly supplied to sudo (via its env kwarg) are now explicitly preserved via sudo’s --preserve-env argument. Patch courtesy of Benno Rice. * [Feature] #793: Add a new tasks.ignore_unknown_help config option for users who hand their tasks centrally-defined argument help dictionaries; it defaults to False but such users may set it to True to avoid exceptions. Thanks to @Allu2 for the report. * [Support]: Switch our continuous integration service from Travis-CI to Circle-CI, plus related and necessary updates to various administrative config files, management tasks and metadata. Including but not limited to: * Enhanced PyPI-level metadata/links * Split out tool config data from setup.cfg * Enhance execution & coverage of unit vs integration tests under CI * [Support] #803: Upgrade our vendored PyYAML from 3.11 to 5.4.1; this should both supply a number of security fixes, and address problems loading project-level YAML config files under Python 3.10. Fix via Andreas Rammhold. * [Support]: Switch to using yaml.safe_load for loading config files. This avoids some warnings under newer PyYAML versions and is also, in a shocking twist, more secure. - do not require python-mock for build, testsuite is not run - modified patches % 0001-Make-test-fallback-to-system-modules-when-vendorized.patch (refreshed) - deleted patches - fix-yaml-loader.patch (upstreamed) OBS-URL: https://build.opensuse.org/request/show/974913 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-invoke?expand=0&rev=29 --- ...ck-to-system-modules-when-vendorized.patch | 32 +++++++++---------- fix-yaml-loader.patch | 13 -------- invoke-1.6.0.tar.gz | 3 -- invoke-1.7.0.tar.gz | 3 ++ python-invoke.changes | 26 +++++++++++++++ python-invoke.spec | 7 ++-- 6 files changed, 47 insertions(+), 37 deletions(-) delete mode 100644 fix-yaml-loader.patch delete mode 100644 invoke-1.6.0.tar.gz create mode 100644 invoke-1.7.0.tar.gz diff --git a/0001-Make-test-fallback-to-system-modules-when-vendorized.patch b/0001-Make-test-fallback-to-system-modules-when-vendorized.patch index 44afc4a..124a683 100644 --- a/0001-Make-test-fallback-to-system-modules-when-vendorized.patch +++ b/0001-Make-test-fallback-to-system-modules-when-vendorized.patch @@ -13,10 +13,10 @@ Subject: [PATCH] Make test fallback to system modules when vendorized one are tests/watchers.py | 5 ++++- 6 files changed, 25 insertions(+), 6 deletions(-) -Index: invoke-1.1.1/tests/_util.py +Index: invoke-1.7.0/tests/_util.py =================================================================== ---- invoke-1.1.1.orig/tests/_util.py -+++ invoke-1.1.1/tests/_util.py +--- invoke-1.7.0.orig/tests/_util.py ++++ invoke-1.7.0/tests/_util.py @@ -8,7 +8,10 @@ except ImportError: termios = None from contextlib import contextmanager @@ -29,10 +29,10 @@ Index: invoke-1.1.1/tests/_util.py from mock import patch, Mock from pytest import skip -Index: invoke-1.1.1/tests/concurrency.py +Index: invoke-1.7.0/tests/concurrency.py =================================================================== ---- invoke-1.1.1.orig/tests/concurrency.py -+++ invoke-1.1.1/tests/concurrency.py +--- invoke-1.7.0.orig/tests/concurrency.py ++++ invoke-1.7.0/tests/concurrency.py @@ -1,4 +1,7 @@ -from invoke.vendor.six.moves.queue import Queue +try: @@ -42,10 +42,10 @@ Index: invoke-1.1.1/tests/concurrency.py from invoke.util import ExceptionWrapper, ExceptionHandlingThread as EHThread -Index: invoke-1.1.1/tests/conftest.py +Index: invoke-1.7.0/tests/conftest.py =================================================================== ---- invoke-1.1.1.orig/tests/conftest.py -+++ invoke-1.1.1/tests/conftest.py +--- invoke-1.7.0.orig/tests/conftest.py ++++ invoke-1.7.0/tests/conftest.py @@ -3,7 +3,11 @@ import os import sys import termios @@ -59,11 +59,11 @@ Index: invoke-1.1.1/tests/conftest.py import pytest from mock import patch -Index: invoke-1.1.1/tests/runners.py +Index: invoke-1.7.0/tests/runners.py =================================================================== ---- invoke-1.1.1.orig/tests/runners.py -+++ invoke-1.1.1/tests/runners.py -@@ -6,7 +6,10 @@ import types +--- invoke-1.7.0.orig/tests/runners.py ++++ invoke-1.7.0/tests/runners.py +@@ -9,7 +9,10 @@ import types from io import BytesIO from itertools import chain, repeat @@ -75,10 +75,10 @@ Index: invoke-1.1.1/tests/runners.py from pytest import raises, skip from pytest_relaxed import trap -Index: invoke-1.1.1/tests/watchers.py +Index: invoke-1.7.0/tests/watchers.py =================================================================== ---- invoke-1.1.1.orig/tests/watchers.py -+++ invoke-1.1.1/tests/watchers.py +--- invoke-1.7.0.orig/tests/watchers.py ++++ invoke-1.7.0/tests/watchers.py @@ -1,6 +1,9 @@ from threading import Thread, Event diff --git a/fix-yaml-loader.patch b/fix-yaml-loader.patch deleted file mode 100644 index 910e81e..0000000 --- a/fix-yaml-loader.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: invoke-1.6.0/invoke/config.py -=================================================================== ---- invoke-1.6.0.orig/invoke/config.py -+++ invoke-1.6.0/invoke/config.py -@@ -906,7 +906,7 @@ class Config(DataProxy): - - def _load_yaml(self, path): - with open(path) as fd: -- return yaml.load(fd) -+ return yaml.load(fd, Loader=yaml.SafeLoader) - - def _load_yml(self, path): - return self._load_yaml(path) diff --git a/invoke-1.6.0.tar.gz b/invoke-1.6.0.tar.gz deleted file mode 100644 index 86917ba..0000000 --- a/invoke-1.6.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:374d1e2ecf78981da94bfaf95366216aaec27c2d6a7b7d5818d92da55aa258d3 -size 367329 diff --git a/invoke-1.7.0.tar.gz b/invoke-1.7.0.tar.gz new file mode 100644 index 0000000..5b9c533 --- /dev/null +++ b/invoke-1.7.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e332e49de40463f2016315f51df42313855772be86435686156bc18f45b5cc6c +size 306954 diff --git a/python-invoke.changes b/python-invoke.changes index 82318f3..d912419 100644 --- a/python-invoke.changes +++ b/python-invoke.changes @@ -1,3 +1,29 @@ +------------------------------------------------------------------- +Wed May 4 12:35:49 UTC 2022 - pgajdos@suse.com + +- version update to 1.7.0 + * [Feature] #845: Env vars explicitly supplied to sudo (via its env kwarg) are now + explicitly preserved via sudo’s --preserve-env argument. Patch courtesy of Benno Rice. + * [Feature] #793: Add a new tasks.ignore_unknown_help config option for users who hand + their tasks centrally-defined argument help dictionaries; it defaults to False but + such users may set it to True to avoid exceptions. Thanks to @Allu2 for the report. + * [Support]: Switch our continuous integration service from Travis-CI to Circle-CI, + plus related and necessary updates to various administrative config files, management + tasks and metadata. Including but not limited to: + * Enhanced PyPI-level metadata/links + * Split out tool config data from setup.cfg + * Enhance execution & coverage of unit vs integration tests under CI + * [Support] #803: Upgrade our vendored PyYAML from 3.11 to 5.4.1; this should both + supply a number of security fixes, and address problems loading project-level YAML + config files under Python 3.10. Fix via Andreas Rammhold. + * [Support]: Switch to using yaml.safe_load for loading config files. This avoids some + warnings under newer PyYAML versions and is also, in a shocking twist, more secure. +- do not require python-mock for build, testsuite is not run +- modified patches + % 0001-Make-test-fallback-to-system-modules-when-vendorized.patch (refreshed) +- deleted patches + - fix-yaml-loader.patch (upstreamed) + ------------------------------------------------------------------- Tue Dec 28 21:43:30 UTC 2021 - Ben Greiner diff --git a/python-invoke.spec b/python-invoke.spec index 43e594a..b839eba 100644 --- a/python-invoke.spec +++ b/python-invoke.spec @@ -1,7 +1,7 @@ # # spec file for package python-invoke # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,7 +21,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-invoke -Version: 1.6.0 +Version: 1.7.0 Release: 0 Summary: Pythonic Task Execution License: BSD-2-Clause @@ -30,8 +30,6 @@ URL: http://www.pyinvoke.org Source: https://files.pythonhosted.org/packages/source/i/invoke/invoke-%{version}.tar.gz Patch0: 0001-Make-test-fallback-to-system-modules-when-vendorized.patch Patch1: pytest4.patch -# PATCH-FIX-OPENSUSE fix-yaml-loader.patch -- we devendorize PyYAML, which requires the Loader flag now. code@bnavigator.de -Patch2: fix-yaml-loader.patch BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros @@ -47,7 +45,6 @@ BuildArch: noarch BuildRequires: %{python_module PyYAML} BuildRequires: %{python_module fluidity-sm} BuildRequires: %{python_module lexicon} -BuildRequires: %{python_module mock} BuildRequires: %{python_module pexpect} # pytest < 6.1 to resolve pytest-relaxed constraint # https://github.com/bitprophet/pytest-relaxed/issues/12