Hello community,

here is the log from the commit of package python-ana for openSUSE:Factory 
checked in at 2020-03-25 23:47:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-ana (Old)
 and      /work/SRC/openSUSE:Factory/.python-ana.new.3160 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "python-ana"

Wed Mar 25 23:47:31 2020 rev:5 rq:788240 version:0.06

Changes:
--------
--- /work/SRC/openSUSE:Factory/python-ana/python-ana.changes    2019-06-12 
13:15:50.744719375 +0200
+++ /work/SRC/openSUSE:Factory/.python-ana.new.3160/python-ana.changes  
2020-03-25 23:49:18.840036170 +0100
@@ -1,0 +2,6 @@
+Wed Mar 25 13:44:05 UTC 2020 - Paolo Stivanin <i...@paolostivanin.com>
+
+- Add use_unittest.patch
+    * switch to unittest as nose won't work with Python 3.9/3.10
+
+-------------------------------------------------------------------

New:
----
  use_unittest.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ python-ana.spec ++++++
--- /var/tmp/diff_new_pack.evEnpJ/_old  2020-03-25 23:49:26.120034243 +0100
+++ /var/tmp/diff_new_pack.evEnpJ/_new  2020-03-25 23:49:26.156034233 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package python-ana
 #
-# 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
@@ -23,20 +23,19 @@
 Summary:        The Python "ana" module
 License:        BSD-2-Clause
 Group:          Development/Languages/Python
-Url:            https://github.com/zardus/ana
+URL:            https://github.com/zardus/ana
 Source:         
https://files.pythonhosted.org/packages/source/a/ana/ana-%{version}.tar.gz
 # https://github.com/zardus/ana/issues/13
 Source2:        https://raw.githubusercontent.com/zardus/ana/master/test.py
 Source3:        
https://raw.githubusercontent.com/zardus/ana/master/test_pickle.p
+# https://github.com/zardus/ana/pull/14
+Patch0:         use_unittest.patch
 BuildRequires:  %{python_module future}
-BuildRequires:  %{python_module nose}
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
 Requires:       python-future
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
-
 %python_subpackages
 
 %description
@@ -46,6 +45,7 @@
 %setup -q -n ana-%{version}
 [ -e test.py ] || cp %{SOURCE2} test.py
 [ -e test_pickle.p ] || cp %{SOURCE3} test_pickle.p
+%patch0
 
 %build
 %python_build
@@ -55,10 +55,9 @@
 %python_expand %fdupes %{buildroot}%{$python_sitelib}
 
 %check
-%python_expand nosetests-%{$python_bin_suffix} -v
+%python_exec -m unittest discover
 
 %files %{python_files}
-%defattr(-,root,root,-)
 %license LICENSE
 %doc README.md
 %{python_sitelib}/*

++++++ test.py ++++++
--- /var/tmp/diff_new_pack.evEnpJ/_old  2020-03-25 23:49:26.596034117 +0100
+++ /var/tmp/diff_new_pack.evEnpJ/_new  2020-03-25 23:49:26.620034111 +0100
@@ -138,3 +138,4 @@
         test_simple()
         test_dict()
         test_dir()
+

++++++ use_unittest.patch ++++++
--- test.py.orig        2020-03-25 14:52:11.172556627 +0100
+++ test.py     2020-03-25 14:41:33.347473176 +0100
@@ -1,7 +1,7 @@
 import os
 import gc
 import ana
-import nose
+import unittest
 import pickle
 
 import logging
@@ -9,8 +9,6 @@
 
 class A(ana.Storable):
     def __init__(self, n):
-        nose.tools.assert_false(hasattr(self, 'n'))
-
         self.n = n
         l.debug("%s.__init__", self)
 
@@ -28,114 +26,104 @@
     def _ana_getliteral(self):
         return { 'n': self.n }
 
-def test_simple():
-    ana.set_dl(ana.SimpleDataLayer())
-    one = A(1)
-    one.make_uuid()
-    o = pickle.dumps(one)
-    one_copy = pickle.loads(o)
-    assert one is one_copy
-
-    two = A(1)
-    t = pickle.dumps(one)
-    two_copy = pickle.loads(t)
-    assert two_copy is not two
-
-    assert pickle.load(open(os.path.join(os.path.dirname(__file__), 
'test_pickle.p'), 'rb')).n == 1337
-
-def write_a1337():
-    a1337 = A(1337)
-    a1337.make_uuid()
-    pickle.dump(a1337, open(os.path.join(os.path.dirname(__file__), 
'test_pickle.p'), 'w'))
-
-def test_dict():
-    ana.set_dl(ana.DictDataLayer())
-    l.debug("Initializing 1")
-    one = A(1)
-    l.debug("Initializing 2")
-    two = A(2)
-
-    one.make_uuid()
-
-    l.debug("Copying 1")
-    one_p = pickle.dumps(one)
-    one_copy = pickle.loads(one_p)
-    l.debug("Copying 2")
-    two_p = pickle.dumps(two)
-    two_copy = pickle.loads(two_p)
-
-    nose.tools.assert_is(one_copy, one)
-    nose.tools.assert_is_not(two_copy, two)
-    nose.tools.assert_equal(str(two_copy), str(two))
-
-    nose.tools.assert_is(one, A.ana_load(one.ana_store()))
-    nose.tools.assert_is(two, A.ana_load(two.ana_store()))
-
-    two_copy2 = pickle.loads(pickle.dumps(two))
-    nose.tools.assert_equal(str(two_copy2), str(two))
-
-    l.debug("Initializing 3")
-    three = A(3)
-    three_str = str(three)
-    l.debug("Storing 3")
-    three_uuid = three.ana_store()
-    l.debug("Deleting 3")
-    del three
-    gc.collect()
-    nose.tools.assert_false(three_uuid in ana.get_dl().uuid_cache)
-    l.debug("Loading 3")
-    three_copy = A.ana_load(three_uuid)
-    nose.tools.assert_equal(three_copy.ana_uuid, three_uuid) 
#pylint:disable=no-member
-    nose.tools.assert_equal(str(three_copy), three_str)
-
-    known = set()
-    first_json = three_copy.to_literal(known)
-    nose.tools.assert_true(three_copy.ana_uuid in first_json['objects'])
-    
nose.tools.assert_equal(first_json['objects'][three_copy.ana_uuid]['object']['n'],
 three_copy.n)
-    nose.tools.assert_equal(first_json['value']['ana_uuid'], 
three_copy.ana_uuid)
-
-    second_json = three_copy.to_literal(known)
-    nose.tools.assert_false(three_copy.ana_uuid in second_json['objects'])
-    nose.tools.assert_equal(second_json['value']['ana_uuid'], 
three_copy.ana_uuid)
-
-def test_dir():
-    ana.dl = ana.DirDataLayer(pickle_dir="/tmp/test_ana")
-    one = A(1)
-    nose.tools.assert_is(one, A.ana_load(one.ana_store()))
-    nose.tools.assert_true(os.path.exists("/tmp/test_ana/%s.p" % one.ana_uuid))
-
-    uuid = one.ana_uuid
-    old_id = id(one)
-    del one
-    gc.collect()
-    ana.dl = ana.DirDataLayer(pickle_dir="/tmp/test_ana")
-    two = A.ana_load(uuid)
-    nose.tools.assert_equals(uuid, two.ana_uuid)
-    nose.tools.assert_not_equals(old_id, id(two))
-
-    # reset the datalayer to make sure we handle it properly
-    ana.set_dl(ana.DictDataLayer())
-    try:
+class TestAna(unittest.TestCase):
+    def test_simple(self):
+        ana.set_dl(ana.SimpleDataLayer())
+        one = A(1)
+        one.make_uuid()
+        o = pickle.dumps(one)
+        one_copy = pickle.loads(o)
+        assert one is one_copy
+
+        two = A(1)
+        t = pickle.dumps(one)
+        two_copy = pickle.loads(t)
+        assert two_copy is not two
+
+        assert pickle.load(open(os.path.join(os.path.dirname(__file__), 
'test_pickle.p'), 'rb')).n == 1337
+
+    def write_a1337(self):
+        a1337 = A(1337)
+        a1337.make_uuid()
+        pickle.dump(a1337, open(os.path.join(os.path.dirname(__file__), 
'test_pickle.p'), 'w'))
+
+    def test_dict(self):
+        ana.set_dl(ana.DictDataLayer())
+        l.debug("Initializing 1")
+        one = A(1)
+        l.debug("Initializing 2")
+        two = A(2)
+
+        one.make_uuid()
+
+        l.debug("Copying 1")
+        one_p = pickle.dumps(one)
+        one_copy = pickle.loads(one_p)
+        l.debug("Copying 2")
+        two_p = pickle.dumps(two)
+        two_copy = pickle.loads(two_p)
+
+        self.assertIs(one_copy, one)
+        self.assertIsNot(two_copy, two)
+        self.assertEqual(str(two_copy), str(two))
+
+        self.assertIs(one, A.ana_load(one.ana_store()))
+        self.assertIs(two, A.ana_load(two.ana_store()))
+
+        two_copy2 = pickle.loads(pickle.dumps(two))
+        self.assertEqual(str(two_copy2), str(two))
+
+        l.debug("Initializing 3")
+        three = A(3)
+        three_str = str(three)
+        l.debug("Storing 3")
+        three_uuid = three.ana_store()
+        l.debug("Deleting 3")
+        del three
+        gc.collect()
+        self.assertFalse(three_uuid in ana.get_dl().uuid_cache)
+        l.debug("Loading 3")
+        three_copy = A.ana_load(three_uuid)
+        self.assertEqual(three_copy.ana_uuid, three_uuid) 
#pylint:disable=no-member
+        self.assertEqual(str(three_copy), three_str)
+
+        known = set()
+        first_json = three_copy.to_literal(known)
+        self.assertTrue(three_copy.ana_uuid in first_json['objects'])
+        
self.assertEqual(first_json['objects'][three_copy.ana_uuid]['object']['n'], 
three_copy.n)
+        self.assertEqual(first_json['value']['ana_uuid'], three_copy.ana_uuid)
+
+        second_json = three_copy.to_literal(known)
+        self.assertFalse(three_copy.ana_uuid in second_json['objects'])
+        self.assertEqual(second_json['value']['ana_uuid'], three_copy.ana_uuid)
+
+    def test_dir(self):
+        ana.dl = ana.DirDataLayer(pickle_dir="/tmp/test_ana")
+        one = A(1)
+        self.assertIs(one, A.ana_load(one.ana_store()))
+        self.assertTrue(os.path.exists("/tmp/test_ana/%s.p" % one.ana_uuid))
+
+        uuid = one.ana_uuid
+        old_id = id(one)
+        del one
+        gc.collect()
+        ana.dl = ana.DirDataLayer(pickle_dir="/tmp/test_ana")
         two = A.ana_load(uuid)
-        assert False
-    except KeyError:
-        pass
-    two.ana_store()
-    del two
-    three = A.ana_load(uuid)
-    assert uuid, three.ana_uuid
+        self.assertEquals(uuid, two.ana_uuid)
+        self.assertNotEqual(old_id, id(two))
 
-if __name__ == '__main__':
-    import sys
-    logging.getLogger("ana.test").setLevel(logging.DEBUG)
-    logging.getLogger("ana.storable").setLevel(logging.DEBUG)
-    logging.getLogger("ana.datalayer").setLevel(logging.DEBUG)
-    logging.getLogger("ana.d").setLevel(logging.DEBUG)
-
-    if len(sys.argv) > 1:
-        globals()['test_%s' % sys.argv[1]]()
-    else:
-        test_simple()
-        test_dict()
-        test_dir()
+        # reset the datalayer to make sure we handle it properly
+        ana.set_dl(ana.DictDataLayer())
+        try:
+            two = A.ana_load(uuid)
+            assert False
+        except KeyError:
+            pass
+        two.ana_store()
+        del two
+        three = A.ana_load(uuid)
+        assert uuid, three.ana_uuid
 
+
+if __name__ == '__main__':
+    unittest.main()

Reply via email to