python-invocations/invocations-no-bundled.patch
Matej Cepl 9e48ac437c Accepting request 940361 from home:bnavigator:python-rpm-macros
- Update to 2.3.0
  * [Bug]: The packaging.release.upload task wasn’t properly
    exposed externally, even though another task’s docstring
    referenced it. Fixed.
  * [Bug]: Ensure that the venv used for
    packaging.release.test_install has its pip upgraded to match
    the invoking interpreter’s version of same; this avoids common
    pitfalls where the “inner” pip is a bundled-with-venv,
    much-older version incapable of modern package installations.
  * [Support]: Overhaul testing and release procedures to use
    CircleCI & modern Invocations.
  * 2.2.0 2021-09-03
  * [Feature]: Added the invocations.environment module with
    top-level functions such as in_ci.
  * [Feature]: packaging.release.push, in dry-run mode, now
    dry-runs its git push subcommand – meaning the subcommand
    itself is what is “dry-ran”, instead of truly executing git
    push --dry-run – when a CI environment is detected.
  * This prevents spurious errors when the git remote (eg Github)
    bails out on read-only authentication credentials, which is
    common within CI systems.
  * It’s also just not very useful to dry-run a real git push
    within CI, since almost certainly the commands to generate git
    objects to get pushed will themselves not have truly run!
  * [Bug]: packaging.release.status (and its use elsewhere, eg
    prepare) didn’t adequately reload the local project’s version
    module during its second/final recheck; this causes that check
    to fail when said version was edited as part of a prepare run.
    It now force-reloads said version module.
- Release 2.1.0

OBS-URL: https://build.opensuse.org/request/show/940361
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-invocations?expand=0&rev=20
2021-12-14 18:28:48 +00:00

94 lines
3.1 KiB
Diff

Index: invocations-1.4.0/tests/packaging/release.py
===================================================================
--- invocations-1.4.0.orig/tests/packaging/release.py
+++ invocations-1.4.0/tests/packaging/release.py
@@ -5,8 +5,12 @@ from os import path
import re
import sys
-from invoke.vendor.six import PY2
-from invoke.vendor.lexicon import Lexicon
+try:
+ from invoke.vendor.six import PY2
+ from invoke.vendor.lexicon import Lexicon
+except ImportError:
+ from six import PY2
+ from lexicon import Lexicon
from invoke import MockContext, Result, Config, Exit
from docutils.utils import Reporter
from mock import Mock, patch, call
Index: invocations-1.4.0/invocations/console.py
===================================================================
--- invocations-1.4.0.orig/invocations/console.py
+++ invocations-1.4.0/invocations/console.py
@@ -6,7 +6,10 @@ from __future__ import unicode_literals,
import sys
-from invoke.vendor.six.moves import input
+try:
+ from invoke.vendor.six.moves import input
+except ImportError:
+ from six.moves import input
# NOTE: originally cribbed from fab 1's contrib.console.confirm
Index: invocations-1.4.0/invocations/packaging/release.py
===================================================================
--- invocations-1.4.0.orig/invocations/packaging/release.py
+++ invocations-1.4.0/invocations/packaging/release.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
or distributing our own fork.
"""
-from invoke.vendor.six import text_type
+try:
+ from invoke.vendor.six import text_type
+except ImportError:
+ from six import text_type
from semantic_version import Version
Index: invocations-1.4.0/invocations/testing.py
===================================================================
--- invocations-1.4.0.orig/invocations/testing.py
+++ invocations-1.4.0/invocations/testing.py
@@ -1,8 +1,12 @@
import sys
import time
from collections import defaultdict
-from invoke.vendor.six import iteritems
-from invoke.vendor.six.moves import range
+try:
+ from invoke.vendor.six import iteritems
+ from invoke.vendor.six.moves import range
+except ImportError:
+ from six import iteritems
+ from six.moves import range
from invoke import task
from tqdm import tqdm