From 2590ae1d6b63d607fddde26e9fa42a018c3c27d6 Mon Sep 17 00:00:00 2001
From: Dominik 'Rathann' Mierzejewski <dominik@greysector.net>
Date: Dec 02 2019 14:12:38 +0000
Subject: update to 0.8 (#1771742)


re-bundle flot (nodejs-flot was retired)
re-enable failing test (fixed upstream)
drop mentions of bottle as it's unbundled

---

diff --git a/.gitignore b/.gitignore
index 34d8dd0..b259c1b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /Pympler-0.5.tar.gz
 /Pympler-0.6.tar.gz
 /Pympler-0.7.tar.gz
+/Pympler-0.8.tar.gz
diff --git a/python-Pympler-issue102.patch b/python-Pympler-issue102.patch
deleted file mode 100644
index 496eef2..0000000
--- a/python-Pympler-issue102.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up Pympler-0.7/test/asizeof/test_asizeof.py.orig Pympler-0.7/test/asizeof/test_asizeof.py
---- Pympler-0.7/test/asizeof/test_asizeof.py.orig	2019-04-05 21:30:20.000000000 +0200
-+++ Pympler-0.7/test/asizeof/test_asizeof.py	2019-09-12 12:08:02.049078456 +0200
-@@ -75,7 +75,6 @@ class TypesTest(unittest.TestCase):
-         for i in gen:
-             self.assertEqual(i, 3)
-             break
--        self.assertEqual(s1, s2)
-         self.assertNotEqual(s3, 0)
- 
-     def test_methods(self):
diff --git a/python-Pympler.spec b/python-Pympler.spec
index 10e8bf0..1ebf7a4 100644
--- a/python-Pympler.spec
+++ b/python-Pympler.spec
@@ -15,23 +15,19 @@ of a Python application and module Class Tracker provides off-line analysis of\
 the lifetime of selected Python objects.
 
 Name: python-%{pname}
-Version: 0.7
+Version: 0.8
 Release: 1%{?dist}
 Summary: Measure, monitor and analyze the memory behavior of Python objects
 License: ASL 2.0 and BSD and MIT
 # bundled stuff
 # pympler/asizeof.py: BSD
 # pympler/static/jquery.sparkline.min.js: BSD
-# pympler/util/bottle.py: MIT
+# pympler/templates/jquery.flot*.min.js: MIT
 URL: http://pythonhosted.org/Pympler/
 Source0: https://pypi.python.org/packages/source/P/%{pname}/%{pname}-%{version}.tar.gz
-# test fails under Python 3.8
-# https://github.com/pympler/pympler/issues/102
-Patch0: %{name}-issue102.patch
 # drop python shebang from asizeof.py
 Patch2: %{name}-no-shebang.patch
 BuildArch: noarch
-BuildRequires: npm(Flot)
 
 %description
 %{desc}
@@ -42,9 +38,9 @@ BuildRequires: python3-bottle
 BuildRequires: python3-devel
 BuildRequires: python3-matplotlib
 BuildRequires: python3-setuptools
-Requires: npm(Flot)
 Requires: python3-bottle
-# http://bottlepy.org/
+# http://www.flotcharts.org
+Provides: bundled(js-jquery-flot) = 0.8.3
 # https://github.com/krzysu/flot.tooltip
 Provides: bundled(js-jquery-flot-tooltip) = 0.8.4
 # http://omnipotent.net/jquery.sparkline/
@@ -63,7 +59,6 @@ Enhances: python3-django-debug-toolbar
 %setup -q -n %{pname}-%{version}
 rm pympler/util/bottle.py
 chmod -x pympler/asizeof.py
-%patch0 -p1 -b .issue102
 %patch2 -p1 -b .no-shebang
 
 %build
@@ -72,10 +67,6 @@ chmod -x pympler/asizeof.py
 %install
 %py3_install
 
-# use system nodejs-flot
-rm %{buildroot}%{python3_sitelib}/pympler/templates/jquery.flot{,.stack}.min.js
-ln --relative -s /usr/lib/node_modules/flot/jquery.flot{,.stack}.min.js %{buildroot}%{python3_sitelib}/pympler/templates/
-
 %check
 PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} setup.py test
 
@@ -86,6 +77,11 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} setup.py test
 %{python3_sitelib}/pympler
 
 %changelog
+* Mon Dec 02 2019 Dominik Mierzejewski <rpm@greysector.net> 0.8-1
+- update to 0.8 (#1771742)
+- re-bundle flot (nodejs-flot was retired)
+- re-enable failing test (fixed upstream)
+
 * Thu Sep 12 2019 Dominik Mierzejewski <rpm@greysector.net> 0.7-1
 - update to 0.7 (#1696870)
 - disable one test failing with Python 3.8
diff --git a/sources b/sources
index 2a8929a..7cc2030 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (Pympler-0.7.tar.gz) = a7eea6068b81b184628dac31cbdb43b1cff5943635dee9a38949152730d3b85250f42367dcd0d687e5925424a3355ea8e822694a3a499050658859fcb64a0e66
+SHA512 (Pympler-0.8.tar.gz) = 8cf8bfd6eaf94aae9fc92bf79a93b53d8d988f7ce8e636d53bc0f9f833bf9b747c9c8129c0d7f61f5dad65810b7dbab5232263c69cfe1421b8fc4d69abc02e58