Mailinglist Archive: opensuse-commit (1903 mails)

< Previous Next >
commit python-vistir for openSUSE:Factory
Hello community,

here is the log from the commit of package python-vistir for openSUSE:Factory
checked in at 2019-04-04 12:09:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-vistir (Old)
and /work/SRC/openSUSE:Factory/.python-vistir.new.3908 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "python-vistir"

Thu Apr 4 12:09:04 2019 rev:2 rq:691421 version:0.3.1

Changes:
--------
--- /work/SRC/openSUSE:Factory/python-vistir/python-vistir.changes
2019-03-22 15:02:16.649749336 +0100
+++ /work/SRC/openSUSE:Factory/.python-vistir.new.3908/python-vistir.changes
2019-04-04 12:09:05.993344116 +0200
@@ -1,0 +2,7 @@
+Tue Apr 2 15:51:35 UTC 2019 - John Vandenberg <jayvdb@xxxxxxxxx>
+
+- Add merged_pr_68-colorama-pin.patch to fix colorama minimum dependency
+- Replace fix-py3-backports.patch with merged_pr_75-backport-pins.patch
+- Rename GitHub tarball to match PyPI tarball name
+
+-------------------------------------------------------------------

Old:
----
0.3.1.tar.gz
fix-py3-backports.patch

New:
----
merged_pr_68-colorama-pin.patch
merged_pr_75-backport-pins.patch
vistir-0.3.1.tar.gz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ python-vistir.spec ++++++
--- /var/tmp/diff_new_pack.g0iwfC/_old 2019-04-04 12:09:06.997343164 +0200
+++ /var/tmp/diff_new_pack.g0iwfC/_new 2019-04-04 12:09:07.009343153 +0200
@@ -24,10 +24,11 @@
License: ISC
Group: Development/Languages/Python
URL: https://github.com/sarugaku/vistir
-Source: https://github.com/sarugaku/vistir/archive/%{version}.tar.gz
+Source:
https://github.com/sarugaku/vistir/archive/%{version}.tar.gz#/vistir-%{version}.tar.gz
Patch0:
https://patch-diff.githubusercontent.com/raw/sarugaku/vistir/pull/61.patch#/no-ffi.patch
Patch1:
https://patch-diff.githubusercontent.com/raw/sarugaku/vistir/pull/62.patch#/py27-missing-exception.patch
-Patch2:
https://patch-diff.githubusercontent.com/raw/sarugaku/vistir/pull/64.patch#/fix-py3-backports.patch
+Patch2:
https://patch-diff.githubusercontent.com/raw/sarugaku/vistir/pull/68.patch#/merged_pr_68-colorama-pin.patch
+Patch3:
https://patch-diff.githubusercontent.com/raw/sarugaku/vistir/pull/75.patch#/merged_pr_75-backport-pins.patch
BuildRequires: %{python_module setuptools >= 38.2.5}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
@@ -64,9 +65,8 @@

%prep
%setup -q -n vistir-%{version}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
+%autopatch -p1
+
sed -i '/invoke/d;/parver/d;/wheel$/d' setup.cfg
rm -r tasks


++++++ merged_pr_68-colorama-pin.patch ++++++
From a50e4effe9a4a729c46fef8d1e16c7909b75a132 Mon Sep 17 00:00:00 2001
From: John Vandenberg <jayvdb@xxxxxxxxx>
Date: Sun, 10 Mar 2019 11:01:21 +0700
Subject: [PATCH] Set colorama minimum version 0.3.4

Fixes https://github.com/sarugaku/vistir/issues/67
---
setup.cfg | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.cfg b/setup.cfg
index 594ed5c..a19cb5e 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -37,7 +37,7 @@ setup_requires =
parver
wheel
install_requires =
- colorama
+ colorama>=0.3.4
backports.functools_lru_cache;python_version<="3.4"
backports.shutil_get_terminal_size;python_version<"3.3"
backports.weakref;python_version<"3.3"
++++++ merged_pr_75-backport-pins.patch ++++++
From 72e90d9aad81f66626f0913b7cb0a0ddd44483ae Mon Sep 17 00:00:00 2001
From: John Vandenberg <jayvdb@xxxxxxxxx>
Date: Sun, 10 Mar 2019 01:07:52 +0700
Subject: [PATCH] compat: Remove backports from Python 3.4

Remove complex version markers and runtime version checking
for unsupported versions between Python 2.7 and Python 3.4+.
The logic was wrong, requiring backports.functools_lru_cache
on Python 3.4 when the stdlib function was acceptable.

Fixes https://github.com/sarugaku/vistir/issues/63
---
setup.cfg | 6 +++---
src/vistir/compat.py | 28 +++++++++++-----------------
2 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 636788d..c3f39b0 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -38,9 +38,9 @@ setup_requires =
wheel
install_requires =
colorama>=0.3.4
- backports.functools_lru_cache;python_version<="3.4"
- backports.shutil_get_terminal_size;python_version<"3.3"
- backports.weakref;python_version<"3.3"
+ backports.functools_lru_cache;python_version=="2.7"
+ backports.shutil_get_terminal_size;python_version=="2.7"
+ backports.weakref;python_version=="2.7"
pathlib2;python_version<"3.5"
requests
six
diff --git a/src/vistir/compat.py b/src/vistir/compat.py
index b99f420..a1789e6 100644
--- a/src/vistir/compat.py
+++ b/src/vistir/compat.py
@@ -42,33 +42,27 @@

if sys.version_info >= (3, 5):
from pathlib import Path
- from functools import lru_cache
else:
from pathlib2 import Path
- from backports.functools_lru_cache import lru_cache
-

-if sys.version_info < (3, 3):
- from backports.shutil_get_terminal_size import get_terminal_size
-
- NamedTemporaryFile = _NamedTemporaryFile
-else:
+if six.PY3:
+ # Only Python 3.4+ is supported
+ from functools import lru_cache, partialmethod
from tempfile import NamedTemporaryFile
from shutil import get_terminal_size
-
-try:
from weakref import finalize
-except ImportError:
- from backports.weakref import finalize # type: ignore
-
-try:
- from functools import partialmethod
-except Exception:
+else:
+ # Only Python 2.7 is supported
+ from backports.functools_lru_cache import lru_cache
from .backports.functools import partialmethod # type: ignore
+ from backports.shutil_get_terminal_size import get_terminal_size
+ NamedTemporaryFile = _NamedTemporaryFile
+ from backports.weakref import finalize # type: ignore

try:
+ # Introduced Python 3.5
from json import JSONDecodeError
-except ImportError: # Old Pythons.
+except ImportError:
JSONDecodeError = ValueError # type: ignore

if six.PY2:

< Previous Next >
This Thread
  • No further messages