Merge pull request #96 from hugovk/update-versions

Add support for Python 3.10-3.11, drop EOL 3.6

Author: mgaitan

docs/conf.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 #
 # Sphinxcontrib-mesmaid demo documentation build configuration file, created by
 # sphinx-quickstart on Sun Apr 23 13:10:20 2017.

setup.cfg

@@ -1,10 +1,8 @@
-# -*- coding: utf-8 -*-
-
 import io
 from setuptools import setup, find_packages
 
-readme = io.open('README.rst', encoding="utf-8").read()
-changes = io.open('CHANGELOG.rst', encoding="utf-8").read()
+readme = open('README.rst', encoding="utf-8").read()
+changes = open('CHANGELOG.rst', encoding="utf-8").read()
 version = '0.7.1'
 
 
@@ -26,7 +24,7 @@ def remove_block(text, token, margin=0):
     readme_ = remove_block(readme_, ".. autoclasstree::")
     readme_ = remove_block(readme_, ".. autoclasstree::")
     readme_ = remove_block(readme_, ".. versionchanged::")
-    return "{}\n\n{}".format(readme_, changes)
+    return f"{readme_}\n\n{changes}"
 
 
 setup(
@@ -35,10 +33,11 @@ def remove_block(text, token, margin=0):
     url='https://github.com/mgaitan/sphinxcontrib-mermaid',
     download_url='https://pypi.python.org/pypi/sphinxcontrib-mermaid',
     license='BSD',
-    author=u'Martín Gaitán',
+    author='Martín Gaitán',
     author_email='gaitan@gmail.com',
     description='Mermaid diagrams in yours Sphinx powered docs',
     long_description=long_description(),
+    python_requires='>=3.7',
     classifiers=[
         'Development Status :: 4 - Beta',
         'Environment :: Console',
@@ -48,10 +47,11 @@ def remove_block(text, token, margin=0):
         'Operating System :: OS Independent',
         'Programming Language :: Python',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
+        'Programming Language :: Python :: 3.10',
+        'Programming Language :: Python :: 3.11',
         'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: Python :: Implementation :: PyPy',
         'Topic :: Documentation',

setup.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
     sphinxcontrib
     ~~~~~~~~~~~~~

sphinxcontrib/__init__.py

@@ -24,7 +24,7 @@ def get_classes(*cls_or_modules, strict=False):
                 if inspect.isclass(obj_) and (not strict or obj_.__module__.startswith(obj.__name__)):
                     yield obj_
         else:
-            raise MermaidError("%s is not a class nor a module" % cls_or_module)
+            raise MermaidError(f"{cls_or_module} is not a class nor a module")
 
 
 def class_diagram(*cls_or_modules, full=False, strict=False, namespace=None):
@@ -45,7 +45,7 @@ def get_tree(cls):
         get_tree(cls)
 
     return "classDiagram\n" + "\n".join(
-            "  %s <|-- %s" % (a, b)
+            f"  {a} <|-- {b}"
                 for a, b in sorted(inheritances)
             )
 

sphinxcontrib/autoclassdiag.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
     sphinx-mermaid
     ~~~~~~~~~~~~~~~
@@ -88,7 +87,7 @@ def get_mm_code(self):
             try:
                 with codecs.open(filename, 'r', 'utf-8') as fp:
                     mmcode = fp.read()
-            except (IOError, OSError):
+            except OSError:
                 return [document.reporter.warning(
                     'External Mermaid file %r not found or reading '
                     'it failed' % filename, line=self.lineno)]
@@ -151,8 +150,8 @@ def render_mm(self, code, options, _fmt, prefix='mermaid'):
     mermaid_cmd_shell = self.builder.config.mermaid_cmd_shell in {True, 'True', 'true'}
     hashkey = (code + str(options) + str(self.builder.config.mermaid_sequence_config)).encode('utf-8')
 
-    basename = '%s-%s' % (prefix, sha1(hashkey).hexdigest())
-    fname = '%s.%s' % (basename, _fmt)
+    basename = f'{prefix}-{sha1(hashkey).hexdigest()}'
+    fname = f'{basename}.{_fmt}'
     relfn = posixpath.join(self.builder.imgpath, fname)
     outdir = os.path.join(self.builder.outdir, self.builder.imagedir)
     outfn = os.path.join(outdir, fname)
@@ -222,26 +221,26 @@ def render_mm_html(self, node, code, options, prefix='mermaid',
 
         fname, outfn = render_mm(self, code, options, _fmt, prefix)
     except MermaidError as exc:
-        logger.warning('mermaid code %r: ' % code + str(exc))
+        logger.warning(f'mermaid code {code!r}: ' + str(exc))
         raise nodes.SkipNode
 
     if fname is None:
         self.body.append(self.encode(code))
     else:
         if alt is None:
             alt = node.get('alt', self.encode(code).strip())
-        imgcss = imgcls and 'class="%s"' % imgcls or ''
+        imgcss = imgcls and f'class="{imgcls}"' or ''
         if _fmt == 'svg':
-            svgtag = '''<object data="%s" type="image/svg+xml">
-            <p class="warning">%s</p></object>\n''' % (fname, alt)
+            svgtag = f'''<object data="{fname}" type="image/svg+xml">
+            <p class="warning">{alt}</p></object>
+'''
             self.body.append(svgtag)
         else:
             if 'align' in node:
                 self.body.append('<div align="%s" class="align-%s">' %
                                  (node['align'], node['align']))
 
-            self.body.append('<img src="%s" alt="%s" %s/>\n' %
-                             (fname, alt, imgcss))
+            self.body.append(f'<img src="{fname}" alt="{alt}" {imgcss}/>\n')
             if 'align' in node:
                 self.body.append('</div>\n')
 
@@ -256,7 +255,7 @@ def render_mm_latex(self, node, code, options, prefix='mermaid'):
     try:
         fname, outfn = render_mm(self, code, options, 'pdf', prefix)
     except MermaidError as exc:
-        logger.warning('mm code %r: ' % code + str(exc))
+        logger.warning(f'mm code {code!r}: ' + str(exc))
         raise nodes.SkipNode
 
     if self.builder.config.mermaid_pdfcrop != '':
@@ -266,7 +265,7 @@ def render_mm_latex(self, node, code, options, prefix='mermaid'):
         except OSError as err:
             if err.errno != ENOENT:   # No such file or directory
                 raise
-            logger.warning('command %r cannot be run (needed to crop pdf), check the mermaid_cmd setting' % self.builder.config.mermaid_pdfcrop)
+            logger.warning(f'command {self.builder.config.mermaid_pdfcrop!r} cannot be run (needed to crop pdf), check the mermaid_cmd setting')
             return None, None
 
         stdout, stderr = p.communicate()
@@ -313,7 +312,7 @@ def render_mm_texinfo(self, node, code, options, prefix='mermaid'):
     try:
         fname, outfn = render_mm(self, code, options, 'png', prefix)
     except MermaidError as exc:
-        logger.warning('mm code %r: ' % code + str(exc))
+        logger.warning(f'mm code {code!r}: ' + str(exc))
         raise nodes.SkipNode
     if fname is not None:
         self.body.append('@image{%s,,,[mermaid],png}\n' % fname[:-4])