From 45e18f2b6a3570a63e533ba5a6507b629ceee90e0e884b331d6f75c5cd7d5e88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Thu, 23 Apr 2020 10:43:01 +0000
Subject: [PATCH] - As py2 support is dropped remove py2 dependencies

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:jupyter/python-nbdime?expand=0&rev=17
---
 python-nbdime.changes |  5 +++++
 python-nbdime.spec    | 19 +++----------------
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/python-nbdime.changes b/python-nbdime.changes
index 998fe61..1006388 100644
--- a/python-nbdime.changes
+++ b/python-nbdime.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Apr 23 10:42:16 UTC 2020 - Tomáš Chvátal <tchvatal@suse.com>
+
+- As py2 support is dropped remove py2 dependencies
+
 -------------------------------------------------------------------
 Sat Jan 11 14:10:51 UTC 2020 - Bernhard Wiedemann <bwiedemann@suse.com>
 
diff --git a/python-nbdime.spec b/python-nbdime.spec
index e150fd3..56343c3 100644
--- a/python-nbdime.spec
+++ b/python-nbdime.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-nbdime
 #
-# 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
@@ -25,7 +25,6 @@ Version:        %{mainver}
 Release:        0
 Summary:        Tools for diffing and merging Jupyter Notebooks
 License:        BSD-3-Clause
-Group:          Development/Languages/Python
 URL:            https://github.com/jupyter/nbdime
 Source:         https://files.pythonhosted.org/packages/py2.py3/n/nbdime/nbdime-%{mainver}-py2.py3-none-any.whl
 BuildRequires:  %{python_module GitPython >= 2.1.6}
@@ -40,8 +39,6 @@ BuildRequires:  %{python_module tornado}
 BuildRequires:  fdupes
 BuildRequires:  jupyter-jupyterlab-filesystem
 BuildRequires:  python-rpm-macros
-BuildRequires:  python-backports.functools_lru_cache
-BuildRequires:  python-backports.shutil_which
 # SECTION test requirements
 BuildRequires:  %{python_module jsonschema > 3}
 BuildRequires:  %{python_module mock}
@@ -56,17 +53,8 @@ Requires:       python-notebook
 Requires:       python-requests
 Requires:       python-six
 Requires:       python-tornado
-%ifpython2
-Requires:       python-backports.functools_lru_cache
-Requires:       python-backports.shutil_which
-Provides:       python-jupyter_nbdime-hg = %{mainver}
-Obsoletes:      python-jupyter_nbdime-hg < %{mainver}
-Provides:       python-jupyter_nbdime-git = %{mainver}
-Obsoletes:      python-jupyter_nbdime-git < %{mainver}
-%else
 Conflicts:      python-jupyter_nbdime-hg < 1.0.5
 Conflicts:      python-jupyter_nbdime-git < 1.0.5
-%endif
 Recommends:     python-tabulate
 Provides:       python-jupyter_nbdime = %{mainver}
 Obsoletes:      python-jupyter_nbdime < %{mainver}
@@ -94,6 +82,7 @@ This package provides the tools and jupyter notebook extension.
 
 %package     -n jupyter-nbdime-jupyterlab
 Version:        %{labver}
+Release:        0
 Summary:        A JupyterLab extension for showing Notebook diffs
 Requires:       jupyter-jupyterlab
 Requires:       python3-nbdime = %{mainver}
@@ -108,8 +97,7 @@ This package provides the JupyterLab extension.
 
 %package     -n jupyter-nbdime-git
 Summary:        Git integration for jupyter-nbdime
-Group:          Development/Languages/Python
-Requires:       git
+Requires:       git-core
 Requires:       jupyter-nbdime = %{mainver}
 Provides:       python3-jupyter_nbdime-git = %{mainver}
 Obsoletes:      python3-jupyter_nbdime-git < %{mainver}
@@ -122,7 +110,6 @@ This package provides git integration.
 
 %package     -n jupyter-nbdime-hg
 Summary:        Mercurial integration for jupyter-nbdime
-Group:          Development/Languages/Python
 Requires:       jupyter-nbdime = %{mainver}
 Requires:       mercurial
 Provides:       python3-jupyter_nbdime-hg = %{mainver}