Skip to content

Commit a6c6910

Browse files
PaebbelsPaebbels
authored
v1.5.8
2 parents c6bc252 + ebe7391 commit a6c6910

File tree

11 files changed

+24
-15
lines changed

11 files changed

+24
-15
lines changed

‎.vscode/settings.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"files.trimTrailingWhitespace": false,
3+
}

‎doc/Dependencies.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ the mandatory dependencies too.
6969
+-----------------------------------------------------------+-------------+----------------------------------------------------------------------------------------+----------------------+
7070
| **Package** | **Version** | **License** | **Dependencies** |
7171
+===========================================================+=============+========================================================================================+======================+
72-
| `pytest <https://GitHub.com/pytest-dev/pytest>`__ | ≥7.0.1 | `MIT <https://GitHub.com/pytest-dev/pytest/blob/master/LICENSE>`__ | *Not yet evaluated.* |
72+
| `pytest <https://GitHub.com/pytest-dev/pytest>`__ | ≥7.1.1 | `MIT <https://GitHub.com/pytest-dev/pytest/blob/master/LICENSE>`__ | *Not yet evaluated.* |
7373
+-----------------------------------------------------------+-------------+----------------------------------------------------------------------------------------+----------------------+
7474
| `pytest-cov <https://GitHub.com/pytest-dev/pytest-cov>`__ | ≥3.0.0 | `MIT <https://GitHub.com/pytest-dev/pytest-cov/blob/master/LICENSE>`__ | *Not yet evaluated.* |
7575
+-----------------------------------------------------------+-------------+----------------------------------------------------------------------------------------+----------------------+
@@ -105,13 +105,13 @@ the mandatory dependencies too.
105105
+-------------------------------------------------------------------------------------------------+--------------+----------------------------------------------------------------------------------------------------------+----------------------+
106106
| **Package** | **Version** | **License** | **Dependencies** |
107107
+=================================================================================================+==============+==========================================================================================================+======================+
108-
| `Sphinx <https://GitHub.com/sphinx-doc/sphinx>`__ | ≥4.4.0 | `BSD 3-Clause <https://GitHub.com/sphinx-doc/sphinx/blob/master/LICENSE>`__ | *Not yet evaluated.* |
108+
| `Sphinx <https://GitHub.com/sphinx-doc/sphinx>`__ | ≥4.5.0 | `BSD 3-Clause <https://GitHub.com/sphinx-doc/sphinx/blob/master/LICENSE>`__ | *Not yet evaluated.* |
109109
+-------------------------------------------------------------------------------------------------+--------------+----------------------------------------------------------------------------------------------------------+----------------------+
110110
| `sphinx_btd_theme <https://GitHub.com/buildthedocs/sphinx.theme>`__ | ≥0.5.2 | `MIT <https://GitHub.com/buildthedocs/sphinx.theme/blob/master/LICENSE>`__ | *Not yet evaluated.* |
111111
+-------------------------------------------------------------------------------------------------+--------------+----------------------------------------------------------------------------------------------------------+----------------------+
112112
| !! `sphinx_fontawesome <https://GitHub.com/fraoustin/sphinx_fontawesome>`__ | ≥0.0.6 | `GPL 2.0 <https://GitHub.com/fraoustin/sphinx_fontawesome/blob/master/LICENSE>`__ | *Not yet evaluated.* |
113113
+-------------------------------------------------------------------------------------------------+--------------+----------------------------------------------------------------------------------------------------------+----------------------+
114-
| `sphinx_autodoc_typehints <https://GitHub.com/agronholm/sphinx-autodoc-typehints>`__ | ≥1.17.0 | `MIT <https://GitHub.com/agronholm/sphinx-autodoc-typehints/blob/master/LICENSE>`__ | *Not yet evaluated.* |
114+
| `sphinx_autodoc_typehints <https://GitHub.com/agronholm/sphinx-autodoc-typehints>`__ | ≥1.18.1 | `MIT <https://GitHub.com/agronholm/sphinx-autodoc-typehints/blob/master/LICENSE>`__ | *Not yet evaluated.* |
115115
+-------------------------------------------------------------------------------------------------+--------------+----------------------------------------------------------------------------------------------------------+----------------------+
116116

117117

‎doc/_templates/autoapi/module.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
``{{ node.name }}``
77
=={{ '=' * node.name|length }}==
88

9+
.. py:module:: {{ node.name }}
10+
911
{##}
1012
{%- block modules -%}
1113
{%- if subnodes %}

‎doc/conf.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,7 @@
216216
# Sphinx.Ext.ExtLinks
217217
# ==============================================================================
218218
extlinks = {
219+
"gh": ("https://GitHub.com/%s", "gh:"),
219220
"ghissue": ('https://GitHub.com/pyTooling/pyTooling.TerminalUI/issues/%s', 'issue #'),
220221
"ghpull": ('https://GitHub.com/pyTooling/pyTooling.TerminalUI/pull/%s', 'pull request #'),
221222
"ghsrc": ('https://GitHub.com/pyTooling/pyTooling.TerminalUI/blob/main/pyTooling/%s?ts=2', None),

‎doc/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ Example
126126
Contributors
127127
************
128128

129-
* `Patrick Lehmann <https://GitHub.com/Paebbels>`_ (Maintainer)
129+
* `Patrick Lehmann <https://GitHub.com/Paebbels>`__ (Maintainer)
130130
* `and more... <https://GitHub.com/pyTooling/pyTooling.TerminalUI/graphs/contributors>`__
131131

132132

‎doc/requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
pyTooling>=1.9.5
44

55
# Enforce latest version on ReadTheDocs
6-
sphinx>=4.4.0
6+
sphinx>=4.5.0
77

88
# Sphinx Extenstions
99
#sphinx.ext.coverage
@@ -14,7 +14,7 @@ sphinxcontrib-mermaid>=0.7.1
1414
#sphinxcontrib-spelling>=2.2.0
1515
autoapi
1616
sphinx_fontawesome>=0.0.6
17-
sphinx_autodoc_typehints>=1.17.0
17+
sphinx_autodoc_typehints>=1.18.1
1818
# changelog>=0.3.5
1919

2020
# BuildTheDocs Extensions (mostly patched Sphinx extensions)

‎pyTooling/TerminalUI/__init__.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,15 @@
3333
__email__ = "Paebbels@gmail.com"
3434
__copyright__ = "2007-2022, Patrick Lehmann"
3535
__license__ = "Apache License, Version 2.0"
36-
__version__ = "1.5.7"
36+
__version__ = "1.5.8"
3737
__keywords__ = ["terminal", "shell", "text user interface", "TUI", "console", "message logging"]
3838

3939
from enum import Enum, unique
4040
from platform import system as platform_system
4141
from typing import NoReturn, Tuple, Any
4242

4343
from pyTooling.Decorators import export
44-
from pyTooling.MetaClasses import Singleton
44+
from pyTooling.MetaClasses import ExtendedType
4545

4646

4747
@export
@@ -97,7 +97,7 @@ class Terminal:
9797
_width : int = None #: Terminal width in characters
9898
_height : int = None #: Terminal height in characters
9999

100-
def __init__(self) -> None:
100+
def __init__(self):
101101
"""
102102
Initialize a terminal.
103103
@@ -390,7 +390,7 @@ class Line:
390390
Severity.DryRun: "DRYRUN: {message}"
391391
} #: Terminal messages formatting rules
392392

393-
def __init__(self, message, severity=Severity.Normal, indent=0, appendLinebreak=True) -> None:
393+
def __init__(self, message, severity=Severity.Normal, indent=0, appendLinebreak=True):
394394
"""Constructor for a new ``Line`` object."""
395395
self._severity = severity
396396
self._message = message
@@ -428,7 +428,7 @@ class ILineTerminal:
428428

429429
_terminal = None
430430

431-
def __init__(self, terminal=None) -> None:
431+
def __init__(self, terminal=None):
432432
"""MixIn initializer."""
433433
self._terminal = terminal
434434

@@ -506,8 +506,8 @@ def WriteDryRun(self, *args, condition=True, **kwargs):
506506

507507

508508
@export
509-
class LineTerminal(Terminal, ILineTerminal, metaclass=Singleton):
510-
def __init__(self, verbose=False, debug=False, quiet=False, writeToStdOut=True) -> None:
509+
class LineTerminal(Terminal, ILineTerminal, metaclass=ExtendedType, singleton=True):
510+
def __init__(self, verbose=False, debug=False, quiet=False, writeToStdOut=True):
511511
"""Initializer of a line based terminal interface."""
512512
Terminal.__init__(self)
513513
ILineTerminal.__init__(self, self)

‎pyTooling/TerminalUI/py.typed

Whitespace-only changes.

‎setup.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,7 @@
4242
description="A set of helpers to implement a text user interface (TUI) in a terminal.",
4343
gitHubNamespace=gitHubNamespace,
4444
sourceFileWithVersion=packageInformationFile,
45+
dataFiles={
46+
packageName: ["py.typed"]
47+
}
4548
)

‎tests/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
Coverage>=6.3
55

66
# Test Runner
7-
pytest>=7.0.1
7+
pytest>=7.1.1
88
pytest-cov>=3.0.0
99

1010
# Static Type Checking

‎tests/unit/TerminalUI.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949

5050

5151
class Application(LineTerminal):
52-
def __init__(self) -> None:
52+
def __init__(self):
5353
super().__init__(verbose=True, debug=True, quiet=False)
5454

5555
LineTerminal.FATAL_EXIT_CODE = 0

0 commit comments

Comments
 (0)