Merge pull request #10 from KeepSafe/chore-upgrade-python

chore upgrade python

Author: b1r3k

.python-version

@@ -1 +1 @@
-3.6.8
+3.11

.travis.yml

@@ -1,10 +1,11 @@
 language: python
+dist: jammy
 python:
-  - "3.6.6"
+  - "3.11"
 # command to install dependencies
 install:
-  - pip install -r requirements-dev.txt
+  - make dev
 # command to run tests
 script:
-  - flake8 sdiff tests
-  - nosetests
+  - make test
+  - make coverage

Makefile

@@ -2,7 +2,9 @@
 
 PYTHON=venv/bin/python3
 PIP=venv/bin/pip
-NOSE=venv/bin/nosetests
+COVERAGE=venv/bin/coverage
+TEST_RUNNER=venv/bin/pytest
+TEST_RUNNER_FLAGS=-s --durations=3 --durations-min=0.005
 FLAKE=venv/bin/flake8
 FLAGS=
 PYPICLOUD_HOST=pypicloud.getkeepsafe.local
@@ -29,14 +31,16 @@ flake:
 	$(FLAKE) sdiff tests
 
 test: flake
-	$(NOSE) -s $(FLAGS)
+	$(COVERAGE) run -m pytest $(TEST_RUNNER_FLAGS)
 
 vtest:
-	$(NOSE) -s -v $(FLAGS)
+	$(COVERAGE) run -m pytest -v $(TEST_RUNNER_FLAGS)
+
+testloop:
+	while sleep 1; do $(TEST_RUNNER) -s --lf $(TEST_RUNNER_FLAGS); done
 
 cov cover coverage:
-	$(NOSE) -s --with-cover --cover-html --cover-html-dir ./coverage $(FLAGS)
-	echo "open file://`pwd`/coverage/index.html"
+	$(COVERAGE) report -m
 
 clean:
 	rm -rf `find . -name __pycache__`

sdiff/__init__.py

@@ -1,11 +1,9 @@
-from typing import Type
-
 from .parser import parse, MdParser, ZendeskHelpMdParser  # noqa
 from .renderer import TextRenderer
 from .compare import diff_struct, diff_links  # noqa
 
 
-def diff(md1, md2, renderer=TextRenderer(), parser_cls: Type[MdParser] = MdParser):
+def diff(md1, md2, renderer=TextRenderer(), parser_cls: type[MdParser] = MdParser):
     tree1 = parse(md1, parser_cls)
     tree2 = parse(md2, parser_cls)
 

sdiff/errors.py

@@ -1,4 +1,4 @@
-class DiffError(object):
+class DiffError:
 
     def __str__(self):
         return self.message

sdiff/model.py

@@ -27,12 +27,12 @@ class ZendeskArtSymbols(Enum):
     callout = 'C'
 
 
-class Node(object):
+class Node:
     symbol = Symbols.null.value
     name = ''
 
     def __init__(self, nodes=None):
-        self.nodes: typing.List[Node] = nodes or []
+        self.nodes: list[Node] = nodes or []
         self.meta = {}
 
     def __str__(self):
@@ -57,7 +57,7 @@ def add_nodes(self, nodes):
         self.nodes.extend(nodes)
 
     def print_all(self):
-        return '%s%s' % (self.symbol, ''.join(map(lambda i: i.print_all(), self.nodes)))
+        return '{}{}'.format(self.symbol, ''.join(map(lambda i: i.print_all(), self.nodes)))
 
 
 class Root(Node):
@@ -112,7 +112,7 @@ def original(self, renderer):
         return renderer.render_node(self, result)
 
     def print_all(self):
-        return '%s%s' % (self.level, ''.join(map(lambda i: i.print_all(), self.nodes)))
+        return '{}{}'.format(self.level, ''.join(map(lambda i: i.print_all(), self.nodes)))
 
 
 class List(Node):
@@ -138,7 +138,7 @@ def original(self, renderer):
         result = ''
         for idx, node in enumerate(self.nodes):
             if self.ordered:
-                result += '%s. %s' % (idx, node.original(renderer))
+                result += '{}. {}'.format(idx, node.original(renderer))
             else:
                 result += '* ' + node.original(renderer)
         result = result + '\n\n'
@@ -222,7 +222,7 @@ def __repr__(self):
         return repr({'type': self.name, 'meta': self.meta})
 
     def original(self, renderer):
-        return renderer.render_node(self, u'  \u00B6\n')
+        return renderer.render_node(self, '  \u00B6\n')
 
 
 class ZendeskHelpNode(Node, ABC):
@@ -257,7 +257,7 @@ class ZendeskHelpCallout(ZendeskHelpNode):
     symbol = ZendeskArtSymbols.callout.value
     name = 'callout'
 
-    def __init__(self, style: str = None, nodes: typing.List[Node] = None):
+    def __init__(self, style: str = None, nodes: list[Node] = None):
         super().__init__(nodes)
         self.style = style
 

sdiff/parser.py

@@ -1,4 +1,4 @@
-from typing import Match, Type
+from re import Match
 
 import mistune
 import re
@@ -76,10 +76,10 @@ def get_lexer(cls):
     def __init__(self):
         super().__init__()
         self.grammar_class.block_html = re.compile(
-            r'^\s* *(?:%s|%s|%s) *(?:\n{1,}|\s*$)' % (
+            r'^\s* *(?:{}|{}|{}) *(?:\n{{1,}}|\s*$)'.format(
                 r'<!--[\s\S]*?-->',
-                r'<(%s)((?:%s)*?)>([\s\S]+?)<\/\1>' % (mistune._block_tag, mistune._valid_attr),
-                r'<%s(?:%s)*?>' % (mistune._block_tag, mistune._valid_attr),
+                r'<({})((?:{})*?)>([\s\S]+?)<\/\1>'.format(mistune._block_tag, mistune._valid_attr),
+                r'<{}(?:{})*?>'.format(mistune._block_tag, mistune._valid_attr),
             )
         )
 
@@ -212,7 +212,7 @@ def _remove_ltr_rtl_marks(text):
     return re.sub(r'(\u200e|\u200f)', '', text)
 
 
-def parse(text, parser_cls: Type[MdParser] = MdParser):
+def parse(text, parser_cls: type[MdParser] = MdParser):
     # HACK dirty hack to be consistent with Markdown list_block
     text = _remove_spaces_from_empty_lines(text)
     text = _remove_ltr_rtl_marks(text)

sdiff/renderer.py

@@ -1,7 +1,7 @@
 from sdiff.model import Root, Node
 
 
-class HtmlRenderer(object):
+class HtmlRenderer:
 
     def render(self, tree: Root):
         result = tree.original(self)
@@ -15,7 +15,7 @@ def render_node(self, node, text):
         return text
 
 
-class TextRenderer(object):
+class TextRenderer:
 
     def render(self, tree: Root):
         result = tree.original(self)

setup.cfg

@@ -4,3 +4,9 @@ ignore = F403, F405
 
 [pep8]
 max-line-length = 120
+
+[coverage:run]
+branch = True
+
+[coverage:report]
+fail_under = 96

setup.py

@@ -2,7 +2,7 @@
 from setuptools import setup, find_packages
 
 
-version = '0.4.1'
+version = '1.0.0'
 
 
 def read(f):
@@ -14,8 +14,9 @@ def read(f):
 ]
 
 tests_require = [
-    'nose',
-    'flake8',
+    'pytest >= 8',
+    'coverage==7.6.1',
+    'flake8==7.1.1',
     'autopep8',
 ]