- Update to 3.0.0:

* The dual_wheels, alt_python, and check_desc arguments/config options for
    the invocations.packaging.release module have been removed.
  * The invocations.travis module has been removed.
  * Drop Python 2 (and 3.5) support. We now support Python 3.6+ only.
- Refreshed invocations-no-bundled.patch.
- Dropped invocations-py3.patch, not required.
- Dropped python-invocations-no-mock.patch, merged upstream.

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-invocations?expand=0&rev=28
This commit is contained in:
Steve Kowalik 2023-01-03 05:05:49 +00:00 committed by Git OBS Bridge
parent 0d0f5fa9cd
commit ee8d49daaf
7 changed files with 52 additions and 137 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:60af4e284b3d1bd2ff38b90de0fc9930b7e80c731b4c0b533e0ae624ef9022c8
size 53889

3
invocations-3.0.0.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8dfaa90f7328b80e4305d508c9e6ef3d5363c8326a8d700c9bcf113618b0fbb1
size 50449

View File

@ -1,27 +1,24 @@
Index: invocations-1.4.0/tests/packaging/release.py Index: invocations-3.0.0/tests/packaging/release.py
=================================================================== ===================================================================
--- invocations-1.4.0.orig/tests/packaging/release.py --- invocations-3.0.0.orig/tests/packaging/release.py
+++ invocations-1.4.0/tests/packaging/release.py +++ invocations-3.0.0/tests/packaging/release.py
@@ -5,8 +5,12 @@ from os import path @@ -3,7 +3,10 @@ from os import path
import re import re
import sys import sys
-from invoke.vendor.six import PY2
-from invoke.vendor.lexicon import Lexicon -from invoke.vendor.lexicon import Lexicon
+try: +try:
+ from invoke.vendor.six import PY2
+ from invoke.vendor.lexicon import Lexicon + from invoke.vendor.lexicon import Lexicon
+except ImportError: +except ImportError:
+ from six import PY2
+ from lexicon import Lexicon + from lexicon import Lexicon
from invoke import MockContext, Result, Config, Exit from invoke import MockContext, Result, Config, Exit
from docutils.utils import Reporter from docutils.utils import Reporter
from mock import Mock, patch, call from unittest.mock import Mock, patch, call
Index: invocations-1.4.0/invocations/console.py Index: invocations-3.0.0/invocations/console.py
=================================================================== ===================================================================
--- invocations-1.4.0.orig/invocations/console.py --- invocations-3.0.0.orig/invocations/console.py
+++ invocations-1.4.0/invocations/console.py +++ invocations-3.0.0/invocations/console.py
@@ -6,7 +6,10 @@ from __future__ import unicode_literals, @@ -4,7 +4,10 @@ Text console UI helpers and patterns, e.
import sys import sys
@ -33,33 +30,10 @@ Index: invocations-1.4.0/invocations/console.py
# NOTE: originally cribbed from fab 1's contrib.console.confirm # NOTE: originally cribbed from fab 1's contrib.console.confirm
Index: invocations-1.4.0/invocations/packaging/release.py Index: invocations-3.0.0/invocations/packaging/semantic_version_monkey.py
=================================================================== ===================================================================
--- invocations-1.4.0.orig/invocations/packaging/release.py --- invocations-3.0.0.orig/invocations/packaging/semantic_version_monkey.py
+++ invocations-1.4.0/invocations/packaging/release.py +++ invocations-3.0.0/invocations/packaging/semantic_version_monkey.py
@@ -19,10 +19,14 @@ import sys
from glob import glob
from shutil import rmtree
-from invoke.vendor.six import StringIO
-
-from invoke.vendor.six import text_type, binary_type, PY2
-from invoke.vendor.lexicon import Lexicon
+try:
+ from invoke.vendor.six import StringIO
+ from invoke.vendor.six import text_type, binary_type, PY2
+ from invoke.vendor.lexicon import Lexicon
+except ImportError:
+ from six import StringIO
+ from six import text_type, binary_type, PY2
+ from lexicon import Lexicon
from blessings import Terminal
from docutils.utils import Reporter
Index: invocations-1.4.0/invocations/packaging/semantic_version_monkey.py
===================================================================
--- invocations-1.4.0.orig/invocations/packaging/semantic_version_monkey.py
+++ invocations-1.4.0/invocations/packaging/semantic_version_monkey.py
@@ -5,7 +5,10 @@ We never like monkey-patching, but for n @@ -5,7 +5,10 @@ We never like monkey-patching, but for n
or distributing our own fork. or distributing our own fork.
""" """
@ -72,10 +46,10 @@ Index: invocations-1.4.0/invocations/packaging/semantic_version_monkey.py
from semantic_version import Version from semantic_version import Version
Index: invocations-1.4.0/invocations/testing.py Index: invocations-3.0.0/invocations/testing.py
=================================================================== ===================================================================
--- invocations-1.4.0.orig/invocations/testing.py --- invocations-3.0.0.orig/invocations/testing.py
+++ invocations-1.4.0/invocations/testing.py +++ invocations-3.0.0/invocations/testing.py
@@ -1,8 +1,12 @@ @@ -1,8 +1,12 @@
import sys import sys
import time import time
@ -91,3 +65,19 @@ Index: invocations-1.4.0/invocations/testing.py
from invoke import task from invoke import task
from tqdm import tqdm from tqdm import tqdm
Index: invocations-3.0.0/invocations/packaging/release.py
===================================================================
--- invocations-3.0.0.orig/invocations/packaging/release.py
+++ invocations-3.0.0/invocations/packaging/release.py
@@ -20,7 +20,10 @@ from glob import glob
from io import StringIO
from shutil import rmtree
-from invoke.vendor.lexicon import Lexicon
+try:
+ from invoke.vendor.lexicon import Lexicon
+except ImportError:
+ from lexicon import Lexicon
from blessings import Terminal
from docutils.utils import Reporter

View File

@ -1,19 +0,0 @@
Index: invocations-1.4.0/tests/autodoc/base.py
===================================================================
--- invocations-1.4.0.orig/tests/autodoc/base.py
+++ invocations-1.4.0/tests/autodoc/base.py
@@ -1,4 +1,5 @@
from os.path import join, dirname
+import codecs
import re
import shutil
@@ -28,7 +29,7 @@ class autodoc_:
def setup_class(self):
# Build once, introspect many...for now
self.build_dir = _build()
- with open(join(self.build_dir, "api.html")) as fd:
+ with codecs.open(join(self.build_dir, "api.html"), 'r', encoding='utf-8') as fd:
self.api_docs = fd.read()
@classmethod

View File

@ -1,57 +0,0 @@
diff -upr invocations-2.3.0.orig/tests/autodoc/base.py invocations-2.3.0/tests/autodoc/base.py
--- invocations-2.3.0.orig/tests/autodoc/base.py 2022-05-04 14:22:40.135321552 +0200
+++ invocations-2.3.0/tests/autodoc/base.py 2022-05-04 14:22:40.143321605 +0200
@@ -3,7 +3,7 @@ import codecs
import re
import shutil
-from mock import Mock, patch
+from unittest.mock import Mock, patch
from invoke import Context
from invocations.autodoc import setup, TaskDocumenter
diff -upr invocations-2.3.0.orig/tests/console.py invocations-2.3.0/tests/console.py
--- invocations-2.3.0.orig/tests/console.py 2022-05-04 14:22:40.135321552 +0200
+++ invocations-2.3.0/tests/console.py 2022-05-04 14:22:40.143321605 +0200
@@ -2,7 +2,7 @@ from __future__ import unicode_literals
import sys
-from mock import patch
+from unittest.mock import patch
from pytest_relaxed import trap
from invocations.console import confirm
diff -upr invocations-2.3.0.orig/tests/environment.py invocations-2.3.0/tests/environment.py
--- invocations-2.3.0.orig/tests/environment.py 2022-05-04 14:22:40.135321552 +0200
+++ invocations-2.3.0/tests/environment.py 2022-05-04 14:22:40.143321605 +0200
@@ -1,4 +1,4 @@
-from mock import patch
+from unittest.mock import patch
from pytest import mark
from invocations.environment import in_ci
diff -upr invocations-2.3.0.orig/tests/packaging/release.py invocations-2.3.0/tests/packaging/release.py
--- invocations-2.3.0.orig/tests/packaging/release.py 2022-05-04 14:22:40.135321552 +0200
+++ invocations-2.3.0/tests/packaging/release.py 2022-05-04 14:22:40.143321605 +0200
@@ -13,7 +13,7 @@ except ImportError:
from lexicon import Lexicon
from invoke import MockContext, Result, Config, Exit
from docutils.utils import Reporter
-from mock import Mock, patch, call
+from unittest.mock import Mock, patch, call
import pytest
from pytest import skip
from pytest_relaxed import trap, raises
diff -upr invocations-2.3.0.orig/tests/pytest_.py invocations-2.3.0/tests/pytest_.py
--- invocations-2.3.0.orig/tests/pytest_.py 2022-05-04 14:22:40.135321552 +0200
+++ invocations-2.3.0/tests/pytest_.py 2022-05-04 14:22:40.143321605 +0200
@@ -2,7 +2,7 @@ from contextlib import contextmanager
from invoke import MockContext
from invocations.pytest import test, coverage
-from mock import Mock, call
+from unittest.mock import Mock, call
@contextmanager

View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Tue Jan 3 05:02:34 UTC 2023 - Steve Kowalik <steven.kowalik@suse.com>
- Update to 3.0.0:
* The dual_wheels, alt_python, and check_desc arguments/config options for
the invocations.packaging.release module have been removed.
* The invocations.travis module has been removed.
* Drop Python 2 (and 3.5) support. We now support Python 3.6+ only.
- Refreshed invocations-no-bundled.patch.
- Dropped invocations-py3.patch, not required.
- Dropped python-invocations-no-mock.patch, merged upstream.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Sep 29 02:48:24 UTC 2022 - Yogalakshmi Arunachalam <yarunachalam@suse.com> Thu Sep 29 02:48:24 UTC 2022 - Yogalakshmi Arunachalam <yarunachalam@suse.com>

View File

@ -1,7 +1,7 @@
# #
# spec file for package python-invocations # spec file for package python-invocations
# #
# Copyright (c) 2022 SUSE LLC # Copyright (c) 2023 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -16,24 +16,19 @@
# #
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
%bcond_without python2
Name: python-invocations Name: python-invocations
Version: 2.6.1 Version: 3.0.0
Release: 0 Release: 0
Summary: Reusable Invoke tasks Summary: Reusable Invoke tasks
License: BSD-2-Clause License: BSD-2-Clause
URL: https://github.com/pyinvoke/invocations URL: https://github.com/pyinvoke/invocations
Source: https://github.com/pyinvoke/invocations/archive/%{version}.tar.gz#/invocations-%{version}.tar.gz Source: https://github.com/pyinvoke/invocations/archive/%{version}.tar.gz#/invocations-%{version}.tar.gz
Patch0: invocations-no-bundled.patch Patch0: invocations-no-bundled.patch
Patch1: invocations-py3.patch
# https://github.com/pyinvoke/invocations/issues/31
Patch2: python-invocations-no-mock.patch
BuildRequires: %{python_module blessings >= 1.6} BuildRequires: %{python_module blessings >= 1.6}
BuildRequires: %{python_module invoke >= 1.6} BuildRequires: %{python_module invoke >= 1.7.2}
BuildRequires: %{python_module lexicon} BuildRequires: %{python_module lexicon}
BuildRequires: %{python_module pytest-relaxed} BuildRequires: %{python_module pytest-relaxed}
BuildRequires: %{python_module releases >= 1.2} BuildRequires: %{python_module releases >= 1.6}
BuildRequires: %{python_module semantic_version >= 2.4} BuildRequires: %{python_module semantic_version >= 2.4}
BuildRequires: %{python_module setuptools} BuildRequires: %{python_module setuptools}
BuildRequires: %{python_module six} BuildRequires: %{python_module six}
@ -44,9 +39,9 @@ BuildRequires: %{python_module wheel >= 0.24.0}
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: python-rpm-macros BuildRequires: python-rpm-macros
Requires: python-blessings >= 1.6 Requires: python-blessings >= 1.6
Requires: python-invoke >= 1.6 Requires: python-invoke >= 1.7.2
Requires: python-lexicon Requires: python-lexicon
Requires: python-releases >= 1.2 Requires: python-releases >= 1.6
Requires: python-semantic_version >= 2.4 Requires: python-semantic_version >= 2.4
Requires: python-six Requires: python-six
Requires: python-tabulate >= 0.7.5 Requires: python-tabulate >= 0.7.5
@ -54,12 +49,6 @@ Requires: python-tqdm >= 4.8.1
Requires: python-twine >= 1.15 Requires: python-twine >= 1.15
Requires: python-wheel >= 0.24.0 Requires: python-wheel >= 0.24.0
BuildArch: noarch BuildArch: noarch
%if %{with python2}
BuildRequires: python-enum34
%endif
%ifpython2
Requires: python-enum34
%endif
%python_subpackages %python_subpackages
%description %description