From 62d46d9f7a297239fc463841f95331decfb426d84267a7fe5e1d969772a93bf0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mark=C3=A9ta=20Machov=C3=A1?= <mmachova@suse.com>
Date: Mon, 1 Mar 2021 12:54:48 +0000
Subject: [PATCH] Accepting request 875944 from
 home:bnavigator:branches:devel:languages:python:jupyter

- Update to 0.7.12
  * no newer release notes
- Release 0.6
  * Move data files to the correct place on develop install #41
- Release 0.5
  * Update readme to mention pep 518 #36
  * Add handling of data_files in develop mode and add test. #35
- Drop which-finds-python-executable.patch merged upstream

OBS-URL: https://build.opensuse.org/request/show/875944
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:jupyter/python-jupyter-packaging?expand=0&rev=7
---
 jupyter-packaging-0.4.0.tar.gz      |  3 ---
 jupyter-packaging-0.7.12.tar.gz     |  3 +++
 python-jupyter-packaging.changes    | 12 ++++++++++++
 python-jupyter-packaging.spec       | 12 ++++++------
 which-finds-python-executable.patch | 14 --------------
 5 files changed, 21 insertions(+), 23 deletions(-)
 delete mode 100644 jupyter-packaging-0.4.0.tar.gz
 create mode 100644 jupyter-packaging-0.7.12.tar.gz
 delete mode 100644 which-finds-python-executable.patch

diff --git a/jupyter-packaging-0.4.0.tar.gz b/jupyter-packaging-0.4.0.tar.gz
deleted file mode 100644
index cb01748..0000000
--- a/jupyter-packaging-0.4.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d89134d2df88c30098bce0f8d8fb07b988ef0f616775dbd4b82dac9562b5cae6
-size 11721
diff --git a/jupyter-packaging-0.7.12.tar.gz b/jupyter-packaging-0.7.12.tar.gz
new file mode 100644
index 0000000..c369b71
--- /dev/null
+++ b/jupyter-packaging-0.7.12.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b140325771881a7df7b7f2d14997b619063fe75ae756b9025852e4346000bbb8
+size 15492
diff --git a/python-jupyter-packaging.changes b/python-jupyter-packaging.changes
index c001cd4..d0cf832 100644
--- a/python-jupyter-packaging.changes
+++ b/python-jupyter-packaging.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Mon Mar  1 10:12:52 UTC 2021 - Ben Greiner <code@bnavigator.de>
+
+- Update to 0.7.12
+  * no newer release notes
+- Release 0.6
+  * Move data files to the correct place on develop install #41
+- Release 0.5
+  * Update readme to mention pep 518 #36
+  * Add handling of data_files in develop mode and add test. #35
+- Drop which-finds-python-executable.patch merged upstream
+
 -------------------------------------------------------------------
 Tue May  5 15:04:08 UTC 2020 - Marketa Calabkova <mcalabkova@suse.com>
 
diff --git a/python-jupyter-packaging.spec b/python-jupyter-packaging.spec
index 0acb60f..d3f09d6 100644
--- a/python-jupyter-packaging.spec
+++ b/python-jupyter-packaging.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-jupyter-packaging
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,20 +18,20 @@
 
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
 Name:           python-jupyter-packaging
-Version:        0.4.0
+Version:        0.7.12
 Release:        0
 Summary:        Jupyter Packaging Utilities
 License:        BSD-3-Clause
 Group:          Development/Languages/Python
 URL:            https://github.com/jupyter/jupyter-packaging
 Source:         https://files.pythonhosted.org/packages/source/j/jupyter-packaging/jupyter-packaging-%{version}.tar.gz
-# fix tests https://github.com/jupyter/jupyter-packaging/pull/32
-Patch0:         which-finds-python-executable.patch
+BuildRequires:  %{python_module packaging}
 BuildRequires:  %{python_module pytest}
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
 BuildArch:      noarch
+Requires:       python-packaging
 %python_subpackages
 
 %description
@@ -42,7 +42,6 @@ with and without accompanying JavaScript packages
 %setup -q -n jupyter-packaging-%{version}
 sed -i 's/\r$//' README.md
 sed -i -e '/^#!\//, 1d' jupyter_packaging/*.py
-%patch0 -p1
 
 %build
 %python_build
@@ -52,7 +51,8 @@ sed -i -e '/^#!\//, 1d' jupyter_packaging/*.py
 %python_expand %fdupes %{buildroot}%{$python_sitelib}
 
 %check
-%pytest
+# test_install and test_datafiles_install call pip which wants to check the online cache
+%pytest -k "not (test_install or test_datafiles_install)"
 
 %files %{python_files}
 %doc README.md
diff --git a/which-finds-python-executable.patch b/which-finds-python-executable.patch
deleted file mode 100644
index 47f9dd6..0000000
--- a/which-finds-python-executable.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: jupyter-packaging-0.4.0/tests/test_which.py
-===================================================================
---- jupyter-packaging-0.4.0.orig/tests/test_which.py
-+++ jupyter-packaging-0.4.0/tests/test_which.py
-@@ -1,6 +1,7 @@
- 
-+import sys
- from jupyter_packaging.setupbase import which
- 
- 
--def test_which_finds_python():
--    assert which('python')
-+def test_which_finds_python_executable():
-+    assert which(sys.executable)