From bdae9f55b249041dd99aa9c4f2d529eee705f75d8451702cbcda94dc5fc280d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 12 Mar 2020 07:59:26 +0000 Subject: [PATCH] - Fix build without python2 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:jupyter/python-traitlets?expand=0&rev=4 --- python-traitlets.changes | 5 +++++ python-traitlets.spec | 26 ++++++++++++-------------- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/python-traitlets.changes b/python-traitlets.changes index 385a9b1..131be75 100644 --- a/python-traitlets.changes +++ b/python-traitlets.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Mar 12 07:59:14 UTC 2020 - Tomáš Chvátal + +- Fix build without python2 + ------------------------------------------------------------------- Tue Nov 12 16:31:49 UTC 2019 - Todd R diff --git a/python-traitlets.spec b/python-traitlets.spec index 03e0a55..18488be 100644 --- a/python-traitlets.spec +++ b/python-traitlets.spec @@ -1,7 +1,7 @@ # # spec file for package python-traitlets # -# 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 @@ -12,37 +12,37 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # %{?!python_module:%define python_module() python-%{**} python3-%{**}} +%bcond_without python2 Name: python-traitlets Version: 4.3.3 Release: 0 Summary: Traitlets Python config system License: BSD-3-Clause -Group: Development/Languages/Python -Url: https://github.com/ipython/traitlets +URL: https://github.com/ipython/traitlets Source: https://files.pythonhosted.org/packages/source/t/traitlets/traitlets-%{version}.tar.gz BuildRequires: %{python_module decorator} BuildRequires: %{python_module ipython_genutils} +BuildRequires: %{python_module pytest} BuildRequires: %{python_module setuptools} BuildRequires: %{python_module six} BuildRequires: fdupes -BuildRequires: python-enum34 BuildRequires: python-rpm-macros -# Test requirements -BuildRequires: %{python_module pytest} -# Python 2 test requirements -BuildRequires: python-mock Requires: python-decorator Requires: python-ipython_genutils Requires: python-six +BuildArch: noarch +%if %{with python2} +BuildRequires: python-enum34 +BuildRequires: python-mock +%endif %ifpython2 Requires: python-enum34 %endif -BuildArch: noarch %python_subpackages %description @@ -56,13 +56,11 @@ A configuration system for Python applications. %install %python_install -%python_expand %fdupes -s %{buildroot}%{$python_sitelib} +%python_expand %fdupes %{buildroot}%{$python_sitelib} %check pushd docs -%{python_expand export PYTHONPATH=%{buildroot}%{$python_sitelib} -py.test-%{$python_bin_suffix} ../traitlets/tests -} +%pytest ../traitlets/tests %files %{python_files} %doc README.md