Control: tags 948974 + patch
Control: tags 948974 + pending
Dear maintainer,
I've prepared an NMU for logging-tree (versioned as 1.8.1-0.1) and
uploaded it to DELAYED/14. Please feel free to tell me if I
should cancel it.
cu
Adrian
diff -Nru logging-tree-1.8/debian/changelog logging-tree-1.8.1/debian/changelog
--- logging-tree-1.8/debian/changelog 2019-10-05 20:02:03.000000000 +0300
+++ logging-tree-1.8.1/debian/changelog 2020-03-12 11:47:32.000000000 +0200
@@ -1,3 +1,11 @@
+logging-tree (1.8.1-0.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * New upstream release.
+ - Fixes tests with Python 3.8. (Closes: #948974)
+
+ -- Adrian Bunk <b...@debian.org> Thu, 12 Mar 2020 11:47:32 +0200
+
logging-tree (1.8-1) unstable; urgency=medium
* New upstream release
diff -Nru logging-tree-1.8/logging_tree/__init__.py logging-tree-1.8.1/logging_tree/__init__.py
--- logging-tree-1.8/logging_tree/__init__.py 2018-08-05 23:15:18.000000000 +0300
+++ logging-tree-1.8.1/logging_tree/__init__.py 2020-01-27 03:19:14.000000000 +0200
@@ -77,6 +77,11 @@
Changelog
---------
+**Version 1.8.1** - 2020 January 26
+ Adjust one test to make it pass under Python 3.8, and update the
+ distribution classifiers to declare compatibility with Python
+ versions through 3.8.
+
**Version 1.8** - 2018 August 5
Improve the output to better explain what happens if a "parent"
attribute has been set to None.
@@ -121,7 +126,7 @@
Initial release.
"""
-__version__ = '1.8'
+__version__ = '1.8.1'
__all__ = ('tree', 'printout')
from logging_tree.nodes import tree
diff -Nru logging-tree-1.8/logging_tree/tests/test_format.py logging-tree-1.8.1/logging_tree/tests/test_format.py
--- logging-tree-1.8/logging_tree/tests/test_format.py 2018-08-05 23:15:18.000000000 +0300
+++ logging-tree-1.8.1/logging_tree/tests/test_format.py 2020-01-27 03:19:14.000000000 +0200
@@ -149,11 +149,25 @@
return
ah = logging.getLogger('').addHandler
ah(logging.handlers.TimedRotatingFileHandler('/bar/two.txt'))
- self.assertEqual(build_description(), '''\
+ expected = '''\
<--""
Level WARNING
Handler TimedRotatingFile '/bar/two.txt' when='H' interval=3600 backupCount=0
-''')
+'''
+ if sys.version_info >= (3, 8):
+ # Apparently the design of the TimedRotatingFileHandler has
+ # become a bit more ambitious as of Python 3.8.
+ expected += '''\
+ |
+ o<--"asyncio"
+ | Level NOTSET so inherits level WARNING
+ |
+ o<--[concurrent]
+ |
+ o<--"concurrent.futures"
+ Level NOTSET so inherits level WARNING
+'''
+ self.assertEqual(build_description(), expected)
def test_2_dot_6_handlers(self):
if sys.version_info < (2, 6):
diff -Nru logging-tree-1.8/setup.py logging-tree-1.8.1/setup.py
--- logging-tree-1.8/setup.py 2018-08-05 23:15:18.000000000 +0300
+++ logging-tree-1.8.1/setup.py 2020-01-27 03:19:14.000000000 +0200
@@ -21,6 +21,9 @@
'Programming Language :: Python :: 3.3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
+ 'Programming Language :: Python :: 3.6',
+ 'Programming Language :: Python :: 3.7',
+ 'Programming Language :: Python :: 3.8',
'Topic :: System :: Logging',
],
packages=['logging_tree', 'logging_tree.tests'],
diff -Nru logging-tree-1.8/.travis.yml logging-tree-1.8.1/.travis.yml
--- logging-tree-1.8/.travis.yml 2018-08-05 23:15:18.000000000 +0300
+++ logging-tree-1.8.1/.travis.yml 2020-01-27 03:19:14.000000000 +0200
@@ -3,12 +3,12 @@
language: python
python:
- - "2.6"
- "2.7"
- - "3.2"
- - "3.3"
- "3.4"
- "3.5"
+ - "3.6"
+ - "3.7"
+ - "3.8"
script:
- "python -m unittest logging_tree.tests.test_format logging_tree.tests.test_node"
