Dirk Mueller
28b8e91bad
* backported` Unpin ``tabulate`` in our install
requirements, it's had many more releases since we instituted
a defensive pin vs some bugs in its later 0.7 line!
* We neglected to remove references to ``six`` in a
few spots including some that utilized Invoke's old vendor of same;
this causes issues when trying to use development and
upcoming versions of Invoke. Six is now truly gone!
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-invocations?expand=0&rev=32
33 lines
1.1 KiB
Diff
33 lines
1.1 KiB
Diff
Index: invocations-3.0.2/tests/packaging/release.py
|
|
===================================================================
|
|
--- invocations-3.0.2.orig/tests/packaging/release.py
|
|
+++ invocations-3.0.2/tests/packaging/release.py
|
|
@@ -3,7 +3,10 @@ from os import path
|
|
import re
|
|
import sys
|
|
|
|
-from invoke.vendor.lexicon import Lexicon
|
|
+try:
|
|
+ from invoke.vendor.lexicon import Lexicon
|
|
+except ImportError:
|
|
+ from lexicon import Lexicon
|
|
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
|
|
===================================================================
|
|
--- 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
|
|
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
|