From c8461ea7fa6d176bb119f659d138b513160b1d41b150440ef61ecb465dd13d69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 20 Mar 2020 12:26:53 +0000 Subject: [PATCH 1/3] Accepting request 786861 from home:frispete:OpenStack:Common - Update to 1.3.0: * No upstream changelog - python2 tests are dysfunctional, test with python3 only OBS-URL: https://build.opensuse.org/request/show/786861 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-fakeredis?expand=0&rev=7 --- fakeredis-1.0.5.tar.gz | 3 --- fakeredis-1.3.0.tar.gz | 3 +++ python-fakeredis.changes | 7 +++++++ python-fakeredis.spec | 11 +++++++---- 4 files changed, 17 insertions(+), 7 deletions(-) delete mode 100644 fakeredis-1.0.5.tar.gz create mode 100644 fakeredis-1.3.0.tar.gz diff --git a/fakeredis-1.0.5.tar.gz b/fakeredis-1.0.5.tar.gz deleted file mode 100644 index 410990b..0000000 --- a/fakeredis-1.0.5.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3e1bfb9de5a5ab5796b6101fbe7927fe1456fa8e72cbcd3625c9437e278bf581 -size 74193 diff --git a/fakeredis-1.3.0.tar.gz b/fakeredis-1.3.0.tar.gz new file mode 100644 index 0000000..b254573 --- /dev/null +++ b/fakeredis-1.3.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:37b3fae70545d6863b2c76e3bc0516517d91f49c7f9edf13ffb9721aa3573315 +size 61782 diff --git a/python-fakeredis.changes b/python-fakeredis.changes index 225acb3..f8e04e4 100644 --- a/python-fakeredis.changes +++ b/python-fakeredis.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Mar 19 22:43:55 UTC 2020 - Hans-Peter Jansen + +- Update to 1.3.0: + * No upstream changelog +- python2 tests are dysfunctional, test with python3 only + ------------------------------------------------------------------- Fri Sep 13 07:55:04 UTC 2019 - Tomáš Chvátal diff --git a/python-fakeredis.spec b/python-fakeredis.spec index 3072618..0034fe4 100644 --- a/python-fakeredis.spec +++ b/python-fakeredis.spec @@ -1,7 +1,7 @@ # # spec file for package python-fakeredis # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-fakeredis -Version: 1.0.5 +Version: 1.3.0 Release: 0 Summary: Fake implementation of redis API for testing purposes License: BSD-3-Clause AND MIT @@ -26,7 +26,6 @@ Group: Development/Languages/Python URL: https://github.com/jamesls/fakeredis Source: https://files.pythonhosted.org/packages/source/f/fakeredis/fakeredis-%{version}.tar.gz BuildRequires: %{python_module hypothesis} -BuildRequires: %{python_module nose} BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros @@ -38,10 +37,14 @@ Suggests: python-lupa BuildArch: noarch # SECTION test requirements BuildRequires: %{python_module future} +BuildRequires: %{python_module hypothesis} BuildRequires: %{python_module lupa} +BuildRequires: %{python_module pytest} BuildRequires: %{python_module redis} BuildRequires: %{python_module six >= 1.12} BuildRequires: %{python_module sortedcontainers} +#!BuildIgnore: python2-pytest +BuildRequires: python2-pytest4 # /SECTION %python_subpackages @@ -59,7 +62,7 @@ Fake implementation of redis API for testing purposes. %python_expand %fdupes %{buildroot}%{$python_sitelib} %check -%python_exec setup.py test +python3 -m pytest %files %{python_files} %doc README.rst From ce69becb0c12a46dec9230a5422976fff6b27331b8553a5bf2081324b1e9ad8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 20 Mar 2020 12:34:25 +0000 Subject: [PATCH 2/3] - Disable py2 as upstream actually disabled python2 support competely * The syntax simply is not compatible OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-fakeredis?expand=0&rev=8 --- python-fakeredis.changes | 6 ++++++ python-fakeredis.spec | 9 ++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/python-fakeredis.changes b/python-fakeredis.changes index f8e04e4..6ec1ebc 100644 --- a/python-fakeredis.changes +++ b/python-fakeredis.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Mar 20 12:31:00 UTC 2020 - Tomáš Chvátal + +- Disable py2 as upstream actually disabled python2 support competely + * The syntax simply is not compatible + ------------------------------------------------------------------- Thu Mar 19 22:43:55 UTC 2020 - Hans-Peter Jansen diff --git a/python-fakeredis.spec b/python-fakeredis.spec index 0034fe4..7fdb778 100644 --- a/python-fakeredis.spec +++ b/python-fakeredis.spec @@ -17,12 +17,12 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} +%define skip_python2 1 Name: python-fakeredis Version: 1.3.0 Release: 0 Summary: Fake implementation of redis API for testing purposes License: BSD-3-Clause AND MIT -Group: Development/Languages/Python URL: https://github.com/jamesls/fakeredis Source: https://files.pythonhosted.org/packages/source/f/fakeredis/fakeredis-%{version}.tar.gz BuildRequires: %{python_module hypothesis} @@ -39,12 +39,10 @@ BuildArch: noarch BuildRequires: %{python_module future} BuildRequires: %{python_module hypothesis} BuildRequires: %{python_module lupa} -BuildRequires: %{python_module pytest} +BuildRequires: %{python_module pytest >= 4.0} BuildRequires: %{python_module redis} BuildRequires: %{python_module six >= 1.12} BuildRequires: %{python_module sortedcontainers} -#!BuildIgnore: python2-pytest -BuildRequires: python2-pytest4 # /SECTION %python_subpackages @@ -62,7 +60,8 @@ Fake implementation of redis API for testing purposes. %python_expand %fdupes %{buildroot}%{$python_sitelib} %check -python3 -m pytest +export LANG="en_US.UTF8" +%pytest %files %{python_files} %doc README.rst From da2b607a337dda0fb2d4513bb5f5bf8bcc480bba549889f845200b6175eba9a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 20 Mar 2020 12:40:30 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-fakeredis?expand=0&rev=9 --- fakeredis-1.3.0.tar.gz | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fakeredis-1.3.0.tar.gz b/fakeredis-1.3.0.tar.gz index b254573..d75da30 100644 --- a/fakeredis-1.3.0.tar.gz +++ b/fakeredis-1.3.0.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:37b3fae70545d6863b2c76e3bc0516517d91f49c7f9edf13ffb9721aa3573315 -size 61782 +oid sha256:7c657d6345f3a9837be1ed118964ba2472f66083d325017edad917b560c01a78 +size 68497