Hello community, here is the log from the commit of package python-scales for openSUSE:Factory checked in at 2020-08-18 15:08:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-scales (Old) and /work/SRC/openSUSE:Factory/.python-scales.new.3399 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-scales" Tue Aug 18 15:08:13 2020 rev:3 rq:826844 version:1.0.9 Changes: -------- --- /work/SRC/openSUSE:Factory/python-scales/python-scales.changes 2019-09-11 10:40:16.531221313 +0200 +++ /work/SRC/openSUSE:Factory/.python-scales.new.3399/python-scales.changes 2020-08-18 15:08:20.211973295 +0200 @@ -1,0 +2,10 @@ +Sat Aug 15 14:51:43 UTC 2020 - Matej Cepl <[email protected]> + +- Add clean_testsuite.patch (gh#Cue/scales#50). + +------------------------------------------------------------------- +Sat Aug 15 09:22:03 UTC 2020 - John Vandenberg <[email protected]> + +- Replace nose with pytest + +------------------------------------------------------------------- New: ---- clean_testsuite.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-scales.spec ++++++ --- /var/tmp/diff_new_pack.GjqsJO/_old 2020-08-18 15:08:21.051973642 +0200 +++ /var/tmp/diff_new_pack.GjqsJO/_new 2020-08-18 15:08:21.055973644 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-scales # -# 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 @@ -27,7 +27,10 @@ Source: https://files.pythonhosted.org/packages/source/s/scales/scales-%{version}.tar.gz Source99: https://raw.githubusercontent.com/Cue/scales/master/LICENSE Patch0: python38.patch -BuildRequires: %{python_module nose} +# PATCH-FEATURE-UPSTREAM clean_testsuite.patch gh#Cue/scales#50 [email protected] +# clean up test suite +Patch1: clean_testsuite.patch +BuildRequires: %{python_module pytest} BuildRequires: %{python_module setuptools} BuildRequires: %{python_module six} BuildRequires: fdupes @@ -41,8 +44,10 @@ %prep %setup -q -n scales-%{version} -%patch0 -p1 +%autopatch -p1 + cp %{SOURCE99} . +sed -i '/nose/d' setup.py %build %python_build @@ -52,7 +57,7 @@ %python_expand %fdupes %{buildroot}%{$python_sitelib} %check -%python_exec setup.py test +%pytest %files %{python_files} %license LICENSE ++++++ clean_testsuite.patch ++++++ --- a/src/greplin/scales/aggregation_test.py +++ b/src/greplin/scales/aggregation_test.py @@ -45,8 +45,8 @@ class AggregationTest(unittest.TestCase) }}) agg.addSource('source1', {'a': {'200': 10, '302': 10, '404': 1, '500': 3}}) result = agg.result() - self.assertEquals(result['a']['success']['sum'], 20) - self.assertEquals(result['a']['error']['sum'], 4) + self.assertEqual(result['a']['success']['sum'], 20) + self.assertEqual(result['a']['error']['sum'], 4) --- a/src/greplin/scales/formats_test.py +++ b/src/greplin/scales/formats_test.py @@ -64,7 +64,7 @@ class StatsTest(unittest.TestCase): out = six.StringIO() formats.jsonFormat(out) - self.assertEquals('{"here": {"count": 1}}\n', out.getvalue()) + self.assertEqual('{"here": {"count": 1}}\n', out.getvalue()) @@ -91,7 +91,7 @@ class UnicodeFormatTest(unittest.TestCas out = six.StringIO() stats = {'name': self.UNICODE_VALUE} formats.jsonFormat(out, statDict=stats) - self.assertEquals(stats, json.loads(out.getvalue())) + self.assertEqual(stats, json.loads(out.getvalue())) def testJsonFormatBinaryGarbage(self): @@ -99,6 +99,6 @@ class UnicodeFormatTest(unittest.TestCas out = six.StringIO() stats = {'garbage': '\xc2\xc2 ROAR!! \0\0'} formats.jsonFormat(out, statDict=stats) - self.assertEquals(json.loads(out.getvalue()), {'garbage': six.u('\xc2\xc2 ROAR!! \0\0')}) + self.assertEqual(json.loads(out.getvalue()), {'garbage': six.u('\xc2\xc2 ROAR!! \0\0')}) --- a/src/greplin/scales/scales_test.py +++ b/src/greplin/scales/scales_test.py @@ -130,7 +130,7 @@ class StatsTest(unittest.TestCase): c = b.getChild(TypedChild) c.countStat += 2 - self.assertEquals({ + self.assertEqual({ 'path': { 'to': { 'A': { @@ -159,7 +159,7 @@ class StatsTest(unittest.TestCase): c = b.getChild(Child) c.countStat += 2 - self.assertEquals({ + self.assertEqual({ 'path': { 'to': { 'A': { @@ -184,7 +184,7 @@ class StatsTest(unittest.TestCase): c = a.getChild(Child, 'sub/path') c.countStat += 1 - self.assertEquals({ + self.assertEqual({ 'path': { 'to': { 'A': { @@ -213,7 +213,7 @@ class StatsTest(unittest.TestCase): """Helps test summed stats.""" c = a.getChild(Child) - self.assertEquals({ + self.assertEqual({ 'Root': { 'C': {}, } @@ -221,7 +221,7 @@ class StatsTest(unittest.TestCase): c.countStat += 2 - self.assertEquals({ + self.assertEqual({ 'Root': { 'count': 2, 'C': { @@ -231,7 +231,7 @@ class StatsTest(unittest.TestCase): }, scales.getStats()) d = a.getChild(Child, 'D') - self.assertEquals({ + self.assertEqual({ 'Root': { 'count': 2, 'C': { @@ -243,7 +243,7 @@ class StatsTest(unittest.TestCase): c.countStat -= 1 d.countStat += 5 - self.assertEquals({ + self.assertEqual({ 'Root': { 'count': 6, 'C': { @@ -266,7 +266,7 @@ class StatsTest(unittest.TestCase): for _ in range(2): c.stateStat = 'good' d.stateStat = 'bad' - self.assertEquals({ + self.assertEqual({ 'Root': { 'state': { 'good': 1, @@ -283,7 +283,7 @@ class StatsTest(unittest.TestCase): c.stateStat = 'great' d.stateStat = 'great' - self.assertEquals({ + self.assertEqual({ 'Root': { 'state': { 'great': 2, @@ -313,7 +313,7 @@ class StatsTest(unittest.TestCase): a.activeUrlsStat['http://www.google.com'] += 2 a.activeUrlsStat['http://www.greplin.com'] -= 1 - self.assertEquals({ + self.assertEqual({ 'path': { 'to': { 'A': { @@ -341,7 +341,7 @@ class StatsTest(unittest.TestCase): errorHolder.errorsStat['404'] += 100 errorHolder.errorsStat['400'] += 1 - self.assertEquals({ + self.assertEqual({ 'Root': { 'errors': { '400': 4, @@ -360,10 +360,10 @@ class StatsTest(unittest.TestCase): def testDynamic(self): """Tests for dynamic stats.""" DynamicRoot() - self.assertEquals(100, scales.getStats()['dynamic']()) + self.assertEqual(100, scales.getStats()['dynamic']()) DynamicRoot.value = 200 - self.assertEquals(200, scales.getStats()['dynamic']()) + self.assertEqual(200, scales.getStats()['dynamic']()) def testCollection(self): @@ -373,7 +373,7 @@ class StatsTest(unittest.TestCase): collection.histo['cheese'] += 12300 collection.histo['cheese'] += 45 - self.assertEquals({ + self.assertEqual({ 'thePath': { 'count': 100, 'histo': {
