diff --git a/drop-icecream-dep.patch b/drop-icecream-dep.patch new file mode 100644 index 0000000..43a5b9b --- /dev/null +++ b/drop-icecream-dep.patch @@ -0,0 +1,19 @@ +Index: invocations-3.3.0/tests/conftest.py +=================================================================== +--- invocations-3.3.0.orig/tests/conftest.py ++++ invocations-3.3.0/tests/conftest.py +@@ -5,9 +5,11 @@ from pytest import fixture + from invoke import MockContext + + # Set up icecream globally for convenience. +-from icecream import install +- +-install() ++try: ++ from icecream import install ++ install() ++except ModuleNotFoundError: ++ pass + + + @fixture diff --git a/invocations-3.0.2.tar.gz b/invocations-3.0.2.tar.gz deleted file mode 100644 index 4573481..0000000 --- a/invocations-3.0.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:220c63ce5769cf6ae84bb9551704b98228af43ccbfc43a52c1271c03bb9e36dc -size 50554 diff --git a/invocations-3.3.0.tar.gz b/invocations-3.3.0.tar.gz new file mode 100644 index 0000000..69f04b0 --- /dev/null +++ b/invocations-3.3.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9a5be67b0078ab2ed566497f114ca1b624d5c56543e5d1bd0bf5a371c6f7ccb8 +size 52345 diff --git a/invocations-no-bundled.patch b/invocations-no-bundled.patch index 68e0b42..680ed0a 100644 --- a/invocations-no-bundled.patch +++ b/invocations-no-bundled.patch @@ -1,7 +1,7 @@ -Index: invocations-3.0.2/tests/packaging/release.py +Index: invocations-3.3.0/tests/packaging/release.py =================================================================== ---- invocations-3.0.2.orig/tests/packaging/release.py -+++ invocations-3.0.2/tests/packaging/release.py +--- invocations-3.3.0.orig/tests/packaging/release.py ++++ invocations-3.3.0/tests/packaging/release.py @@ -3,7 +3,10 @@ from os import path import re import sys @@ -14,12 +14,12 @@ Index: invocations-3.0.2/tests/packaging/release.py from invoke import MockContext, Result, Config, Exit from docutils.utils import Reporter from unittest.mock import Mock, patch, call -Index: invocations-3.0.2/invocations/packaging/release.py +Index: invocations-3.3.0/invocations/packaging/release.py =================================================================== ---- invocations-3.0.2.orig/invocations/packaging/release.py -+++ invocations-3.0.2/invocations/packaging/release.py -@@ -20,7 +20,10 @@ from glob import glob - from io import StringIO +--- invocations-3.3.0.orig/invocations/packaging/release.py ++++ invocations-3.3.0/invocations/packaging/release.py +@@ -21,7 +21,10 @@ from io import StringIO + from pathlib import Path from shutil import rmtree -from invoke.vendor.lexicon import Lexicon diff --git a/python-invocations.changes b/python-invocations.changes index 460c1d7..c6edc4c 100644 --- a/python-invocations.changes +++ b/python-invocations.changes @@ -1,3 +1,28 @@ +------------------------------------------------------------------- +Wed Nov 6 10:23:52 UTC 2024 - Daniel Garcia + +- Add drop-icecream-dep.patch +- Update to 3.3.0: + * Add mypy type-checking variant of the recently added import test, + in packaging.release.test_install. This helps prove packages + exposing py.typed in their source tree are including it in their + distributions correctly. +- 3.2.0: + * Minor enhancements to the checks module: + - blacken now has a format alias (and will likely reverse the + real name and the alias in 4.0) + - Added lint task which currently just runs flake8, will likely + learn how to be configurable later. + - Added all_ default task for the collection, which runs both + blacken (in regular, not diff-only mode - idea is to be useful + for devs, not CI, which already does both independently) and + lint in series. +- 3.1.0: + * Updated packaging.release.test_install to attempt imports of + freshly test-installed packages, to catch import-time errors on + top of install-time ones. This can be opted out of by giving the + skip_import kwarg (aka the --skip-import flag on the CLI). + ------------------------------------------------------------------- Thu Jun 1 13:06:53 UTC 2023 - pgajdos@suse.com diff --git a/python-invocations.spec b/python-invocations.spec index 8c7b727..6af1640 100644 --- a/python-invocations.spec +++ b/python-invocations.spec @@ -1,7 +1,7 @@ # # spec file for package python-invocations # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,13 +18,15 @@ %{?sle15_python_module_pythons} Name: python-invocations -Version: 3.0.2 +Version: 3.3.0 Release: 0 Summary: Reusable Invoke tasks License: BSD-2-Clause URL: https://github.com/pyinvoke/invocations Source: https://github.com/pyinvoke/invocations/archive/%{version}.tar.gz#/invocations-%{version}.tar.gz Patch0: invocations-no-bundled.patch +# PATCH-FIX-OPENSUSE drop-icecream-dep.patch -- daniel.garcia@suse.com +Patch1: drop-icecream-dep.patch BuildRequires: %{python_module blessings >= 1.6} BuildRequires: %{python_module invoke >= 1.7.2} BuildRequires: %{python_module lexicon}