From 303db75e2aece70d41ee98b93f4e064d9417a626183184ce0dcbe08ebe65b142 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 24 Jan 2018 10:27:56 +0000 Subject: [PATCH] - Fix building in py3 only enviroment - Remove the test conditional which was always on anyway OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-keyring?expand=0&rev=63 --- python-keyring.changes | 6 ++++++ python-keyring.spec | 15 ++++----------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/python-keyring.changes b/python-keyring.changes index f4a1824..0acbf1f 100644 --- a/python-keyring.changes +++ b/python-keyring.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jan 24 10:27:23 UTC 2018 - tchvatal@suse.com + +- Fix building in py3 only enviroment +- Remove the test conditional which was always on anyway + ------------------------------------------------------------------- Tue Nov 28 12:22:03 UTC 2017 - mimi.vx@gmail.com diff --git a/python-keyring.spec b/python-keyring.spec index 7d34875..5634164 100644 --- a/python-keyring.spec +++ b/python-keyring.spec @@ -1,7 +1,7 @@ # # spec file for package python-keyring # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,6 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} -%bcond_without tests Name: python-keyring Version: 10.5.0 Release: 0 @@ -26,7 +25,10 @@ License: Python-2.0 AND MIT Group: Development/Languages/Python Url: https://github.com/jaraco/keyring Source: https://files.pythonhosted.org/packages/source/k/keyring/keyring-%{version}.tar.gz +BuildRequires: %{python_module SecretStorage} BuildRequires: %{python_module devel} +BuildRequires: %{python_module mock} +BuildRequires: %{python_module pytest} BuildRequires: %{python_module setuptools_scm >= 1.15.0} BuildRequires: %{python_module setuptools} BuildRequires: fdupes @@ -34,13 +36,6 @@ BuildRequires: python-rpm-macros Requires: python-SecretStorage Requires: python-setuptools BuildArch: noarch -%if %{with tests} -# Test requirements: -BuildRequires: %{python_module SecretStorage} -BuildRequires: %{python_module pytest} -# Python 2 test requirements: -BuildRequires: python-mock -%endif %python_subpackages %description @@ -59,14 +54,12 @@ sed -i '/^#!/d' keyring/cli.py %python_install %python_expand %fdupes %{buildroot}%{$python_sitelib} -%if %{with tests} %check pushd docs %{python_expand export PYTHONPATH="%{buildroot}%{$python_sitelib}" py.test-%{$python_bin_suffix} --pyargs keyring.tests } popd -%endif %files %{python_files} %doc README.rst CHANGES.rst