ch-python-ipython_genutils.spec

@@ -1,53 +0,0 @@
-Name:           python-ipython_genutils
-Version:        0.2.0
-Release:        1
-Summary:        IPython vestigial utilities
-License:        BSD-3-Clause
-URL:            https://github.com/ipython/ipython_genutils
-Source0:        https://pypi.python.org/packages/source/i/ipython_genutils/ipython_genutils-%{version}.tar.gz
-Patch01:        delete-nose.patch
-BuildArch:      noarch
-
-%description
-The package provides IPython vestigial utilities.
-
-%package        -n python%{python3_pkgversion}-ipython_genutils
-Summary:        IPython vestigial utilities
-BuildRequires:  python%{python3_pkgversion}-devel python%{python3_pkgversion}-pytest
-%{?python_provide:%python_provide python%{python3_pkgversion}-ipython_genutils}
-
-%description    -n python%{python3_pkgversion}-ipython_genutils
-The package provides IPython vestigial utilities.
-
-%prep
-%autosetup -n ipython_genutils-%{version} -p1
-
-%build
-%py3_build
-
-%install
-%py3_install
-
-%check
-%{__python3} -m pytest
-
-%files -n python%{python3_pkgversion}-ipython_genutils
-%doc README.md
-%license COPYING.md
-%{python3_sitelib}/*
-
-%changelog
-* Tue Aug 2 2022 wenzhiwei <wenzhiwei@kylinos.cn> - 0.2.0-1
-- Update to 0.2.0
-
-* Tue May 10 2022 xigaoxinyan <xigaoxinyan@h-partners.com> - 0.1.0-18
-- License compliance rectification
-
-* Fri Apr 29 2022 houyingchao <houyingchao@h-partners.com> - 0.1.0-17
-- Remove dependency on python-nose
-
-* Wed Oct 21 2020 leiju <leiju4@huawei.com> - 0.1.0-16
-- remove python2 subpackage
-
-* Thu Mar 5 2020 zhujunhao <zhujunhao5@huawei.com> - 0.1.0-15
-- Package init

delete-nose.patch

@@ -1,306 +0,0 @@
-From 5d0afd0ba2b7e18508936d52c982869ae5678d62 Mon Sep 17 00:00:00 2001
-From: wu-leilei <wu18740459704@163.com>
-Date: Sat, 8 Jan 2022 14:57:33 +0800
-Subject: [PATCH] delete nose
-
----
- ipython_genutils/testing/decorators.py      | 84 ++-------------------
- ipython_genutils/tests/test_importstring.py | 11 +--
- ipython_genutils/tests/test_path.py         | 32 ++++----
- ipython_genutils/tests/test_text.py         | 14 ++--
- 4 files changed, 34 insertions(+), 107 deletions(-)
-
-diff --git a/ipython_genutils/testing/decorators.py b/ipython_genutils/testing/decorators.py
-index cc81ebe..acba766 100644
---- a/ipython_genutils/testing/decorators.py
-+++ b/ipython_genutils/testing/decorators.py
-@@ -35,6 +35,7 @@ import sys
- import os
- import tempfile
- import unittest
-+import pytest
- 
- # For onlyif_cmd_exists decorator
- from ..py3compat import string_types, which
-@@ -84,9 +85,9 @@ def make_label_dec(label,ds=None):
-     >>> slow = make_label_dec('slow')
-     >>> slow.__doc__
-     "Labels a test as 'slow'."
--    
-+
-     And one that uses multiple labels and a custom docstring:
--    
-+
-     >>> rare = make_label_dec(['slow','hard'],
-     ... "Mix labels 'slow' and 'hard' for rare tests.")
-     >>> rare.__doc__
-@@ -131,81 +132,12 @@ def make_label_dec(label,ds=None):
- # Inspired by numpy's skipif, but uses the full apply_wrapper utility to
- # preserve function metadata better and allows the skip condition to be a
- # callable.
--def skipif(skip_condition, msg=None):
--    ''' Make function raise SkipTest exception if skip_condition is true
--
--    Parameters
--    ----------
--
--    skip_condition : bool or callable
--      Flag to determine whether to skip test. If the condition is a
--      callable, it is used at runtime to dynamically make the decision. This
--      is useful for tests that may require costly imports, to delay the cost
--      until the test suite is actually executed.
--    msg : string
--      Message to give on raising a SkipTest exception.
--
--    Returns
--    -------
--    decorator : function
--      Decorator, which, when applied to a function, causes SkipTest
--      to be raised when the skip_condition was True, and the function
--      to be called normally otherwise.
--
--    Notes
--    -----
--    You will see from the code that we had to further decorate the
--    decorator with the nose.tools.make_decorator function in order to
--    transmit function name, and various other metadata.
--    '''
--
--    def skip_decorator(f):
--        # Local import to avoid a hard nose dependency and only incur the
--        # import time overhead at actual test-time.
--        import nose
--
--        # Allow for both boolean or callable skip conditions.
--        if callable(skip_condition):
--            skip_val = skip_condition
--        else:
--            skip_val = lambda : skip_condition
--
--        def get_msg(func,msg=None):
--            """Skip message with information about function being skipped."""
--            if msg is None: out = 'Test skipped due to test condition.'
--            else: out = msg
--            return "Skipping test: %s. %s" % (func.__name__,out)
--
--        # We need to define *two* skippers because Python doesn't allow both
--        # return with value and yield inside the same function.
--        def skipper_func(*args, **kwargs):
--            """Skipper for normal test functions."""
--            if skip_val():
--                raise nose.SkipTest(get_msg(f,msg))
--            else:
--                return f(*args, **kwargs)
--
--        def skipper_gen(*args, **kwargs):
--            """Skipper for test generators."""
--            if skip_val():
--                raise nose.SkipTest(get_msg(f,msg))
--            else:
--                for x in f(*args, **kwargs):
--                    yield x
--
--        # Choose the right skipper to use when building the actual generator.
--        if nose.util.isgenerator(f):
--            skipper = skipper_gen
--        else:
--            skipper = skipper_func
--
--        return nose.tools.make_decorator(f)(skipper)
--
--    return skip_decorator
-+def skipif(skip_condition, msg=""):
-+    return pytest.mark.skipif(skip_condition, reason=msg)
- 
- # A version with the condition set to true, common case just to attach a message
- # to a skip decorator
--def skip(msg=None):
-+def skip(msg=""):
-     """Decorator factory - mark a test function for skipping from test suite.
- 
-     Parameters
-@@ -219,8 +151,7 @@ def skip(msg=None):
-          Decorator, which, when applied to a function, causes SkipTest
-          to be raised, with the optional message added.
-       """
--
--    return skipif(True,msg)
-+    return skipif(True, msg)
- 
- 
- def onlyif(condition, msg):
-@@ -252,7 +183,6 @@ def module_not_available(module):
- 
- def decorated_dummy(dec, name):
-     """Return a dummy function decorated with dec, with the given name.
--    
-     Examples
-     --------
-     import IPython.testing.decorators as dec
-diff --git a/ipython_genutils/tests/test_importstring.py b/ipython_genutils/tests/test_importstring.py
-index 3adc1a5..bcb4ab5 100644
---- a/ipython_genutils/tests/test_importstring.py
-+++ b/ipython_genutils/tests/test_importstring.py
-@@ -3,25 +3,26 @@
- # Copyright (c) IPython Development Team.
- # Distributed under the terms of the Modified BSD License.
- 
--import nose.tools as nt
--
- from ..importstring import import_item
- 
-+import pytest
-+
-+
- def test_import_plain():
-     "Test simple imports"
-     import os
-     os2 = import_item('os')
--    nt.assert_true(os is os2)
-+    assert os is os2
- 
- 
- def test_import_nested():
-     "Test nested imports from the stdlib"
-     from os import path
-     path2 = import_item('os.path')
--    nt.assert_true(path is path2)
-+    assert path is path2
- 
- 
- def test_import_raises():
-     "Test that failing imports raise the right exception"
--    nt.assert_raises(ImportError, import_item, 'IPython.foobar')
-+    pytest.raises(ImportError, import_item, 'IPython.foobar')
-     
-diff --git a/ipython_genutils/tests/test_path.py b/ipython_genutils/tests/test_path.py
-index 04ca85d..cfb893b 100644
---- a/ipython_genutils/tests/test_path.py
-+++ b/ipython_genutils/tests/test_path.py
-@@ -5,16 +5,12 @@
- # Distributed under the terms of the Modified BSD License.
- 
- import os
--import sys
- import tempfile
- 
--import nose.tools as nt
--
--from ..testing.decorators import skip_if_not_win32, skip_win32
--from .. import path
--from .. import py3compat
--from ..tempdir import TemporaryDirectory
-+import pytest
- 
-+from ipython_genutils.testing.decorators import skip_if_not_win32, skip_win32
-+from ipython_genutils import path
- 
- def test_filefind():
-     f = tempfile.NamedTemporaryFile()
-@@ -22,20 +18,24 @@ def test_filefind():
- 
- 
- def test_ensure_dir_exists():
--    with TemporaryDirectory() as td:
-+    with tempfile.TemporaryDirectory() as td:
-         d = os.path.join(td, u'∂ir')
-         path.ensure_dir_exists(d) # create it
-         assert os.path.isdir(d)
-         path.ensure_dir_exists(d) # no-op
-         f = os.path.join(td, u'ƒile')
-         open(f, 'w').close() # touch
--        with nt.assert_raises(IOError):
-+        with pytest.raises(IOError):
-             path.ensure_dir_exists(f)
- 
- 
- class TestLinkOrCopy(object):
-+    def __init__(self):
-+        self.tempdir = None
-+        self.src = None
-+
-     def setUp(self):
--        self.tempdir = TemporaryDirectory()
-+        self.tempdir = tempfile.TemporaryDirectory()
-         self.src = self.dst("src")
-         with open(self.src, "w") as f:
-             f.write("Hello, world!")
-@@ -47,17 +47,17 @@ class TestLinkOrCopy(object):
-         return os.path.join(self.tempdir.name, *args)
- 
-     def assert_inode_not_equal(self, a, b):
--        nt.assert_not_equals(os.stat(a).st_ino, os.stat(b).st_ino,
--                             "%r and %r do reference the same indoes" %(a, b))
-+        assert os.stat(a).st_ino != os.stat(b).st_ino, \
-+            "%r and %r do reference the same indoes" % (a, b)
- 
-     def assert_inode_equal(self, a, b):
--        nt.assert_equals(os.stat(a).st_ino, os.stat(b).st_ino,
--                         "%r and %r do not reference the same indoes" %(a, b))
-+        assert os.stat(a).st_ino == os.stat(b).st_ino, \
-+            "%r and %r do not reference the same indoes" % (a, b)
- 
-     def assert_content_equal(self, a, b):
-         with open(a) as a_f:
-             with open(b) as b_f:
--                nt.assert_equals(a_f.read(), b_f.read())
-+                assert a_f.read() == b_f.read()
- 
-     @skip_win32
-     def test_link_successful(self):
-@@ -105,4 +105,4 @@ class TestLinkOrCopy(object):
-         path.link_or_copy(self.src, dst)
-         path.link_or_copy(self.src, dst)
-         self.assert_inode_equal(self.src, dst)
--        nt.assert_equal(sorted(os.listdir(self.tempdir.name)), ['src', 'target'])
-+        assert sorted(os.listdir(self.tempdir.name)) == ['src', 'target']
-diff --git a/ipython_genutils/tests/test_text.py b/ipython_genutils/tests/test_text.py
-index b14170a..c6c978c 100644
---- a/ipython_genutils/tests/test_text.py
-+++ b/ipython_genutils/tests/test_text.py
-@@ -5,12 +5,8 @@ from __future__ import print_function
- # Copyright (c) IPython Development Team.
- # Distributed under the terms of the Modified BSD License.
- 
--import os
--import math
- import random
--import sys
- 
--import nose.tools as nt
- 
- from .. import text
- 
-@@ -20,11 +16,11 @@ def test_columnize():
-     size = 5
-     items = [l*size for l in 'abc']
-     out = text.columnize(items, displaywidth=80)
--    nt.assert_equal(out, 'aaaaa  bbbbb  ccccc\n')
-+    assert out == 'aaaaa  bbbbb  ccccc\n'
-     out = text.columnize(items, displaywidth=12)
--    nt.assert_equal(out, 'aaaaa  ccccc\nbbbbb\n')
-+    assert out == 'aaaaa  ccccc\nbbbbb\n'
-     out = text.columnize(items, displaywidth=10)
--    nt.assert_equal(out, 'aaaaa\nbbbbb\nccccc\n')
-+    assert out == 'aaaaa\nbbbbb\nccccc\n'
- 
- def test_columnize_random():
-     """Test with random input to hopfully catch edge case """
-@@ -48,12 +44,12 @@ def test_columnize_medium():
-     size = 40
-     items = [l*size for l in 'abc']
-     out = text.columnize(items, displaywidth=80)
--    nt.assert_equal(out, '\n'.join(items+['']))
-+    assert out == '\n'.join(items+[''])
- 
- def test_columnize_long():
-     """Test columnize with inputs longer than the display window"""
-     size = 11
-     items = [l*size for l in 'abc']
-     out = text.columnize(items, displaywidth=size-1)
--    nt.assert_equal(out, '\n'.join(items+['']))
-+    assert out == '\n'.join(items+[''])
- 
--- 
-2.23.0
-