From 9cc93008be8d5bd9e84711c95ed12c03cc121408 Mon Sep 17 00:00:00 2001 From: Helmut Merz Date: Wed, 2 Oct 2024 13:05:33 +0200 Subject: [PATCH] avoid testing deprecation errors with Python3.12 --- cco/common/tests.py | 7 +++---- cco/member/tests.py | 2 +- cco/schema/tests.py | 4 ++-- cco/webapi/tests.py | 2 +- cyberapps/ccmkg/tests.py | 6 +++--- cyberapps/commerce/tests.py | 8 ++++---- cyberapps/knowledge/tests.py | 6 +++--- pyproject.toml | 2 +- 8 files changed, 18 insertions(+), 19 deletions(-) diff --git a/cco/common/tests.py b/cco/common/tests.py index 9d4ec8f..053adf2 100644 --- a/cco/common/tests.py +++ b/cco/common/tests.py @@ -1,7 +1,6 @@ -#! /usr/bin/python +# cco.common.tests -""" -Tests for the 'cco.webapi' package. +""" Tests for the 'cco.webapi' package. """ import io @@ -53,7 +52,7 @@ class Test(unittest.TestCase): def test_suite(): flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS return unittest.TestSuite(( - unittest.makeSuite(Test), + unittest.TestLoader().loadTestsFromTestCase(Test), doctest.DocFileSuite('README.rst', optionflags=flags, setUp=setUp, tearDown=tearDown), )) diff --git a/cco/member/tests.py b/cco/member/tests.py index a4417ea..53f1463 100644 --- a/cco/member/tests.py +++ b/cco/member/tests.py @@ -35,7 +35,7 @@ class Test(unittest.TestCase): def test_suite(): flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS return unittest.TestSuite(( - unittest.makeSuite(Test), + unittest.TestLoader().loadTestsFromTestCase(Test), doctest.DocFileSuite('README.txt', optionflags=flags, setUp=setUp, tearDown=tearDown), )) diff --git a/cco/schema/tests.py b/cco/schema/tests.py index 566f522..d061d40 100644 --- a/cco/schema/tests.py +++ b/cco/schema/tests.py @@ -1,4 +1,4 @@ -#! /usr/bin/python +# cco.schema.tests """ Tests for the 'cco.schema' package. @@ -47,7 +47,7 @@ class Test(unittest.TestCase): def test_suite(): flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS return unittest.TestSuite(( - unittest.makeSuite(Test), + unittest.TestLoader().loadTestsFromTestCase(Test), doctest.DocFileSuite('README.md', optionflags=flags, setUp=setUp, tearDown=tearDown), )) diff --git a/cco/webapi/tests.py b/cco/webapi/tests.py index efb8573..ece49a6 100644 --- a/cco/webapi/tests.py +++ b/cco/webapi/tests.py @@ -91,7 +91,7 @@ class Test(unittest.TestCase): def test_suite(): flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS return unittest.TestSuite(( - unittest.makeSuite(Test), + unittest.TestLoader().loadTestsFromTestCase(Test), doctest.DocFileSuite('README.rst', optionflags=flags, setUp=setUp, tearDown=tearDown), )) diff --git a/cyberapps/ccmkg/tests.py b/cyberapps/ccmkg/tests.py index 2f5f103..0d68aeb 100755 --- a/cyberapps/ccmkg/tests.py +++ b/cyberapps/ccmkg/tests.py @@ -15,9 +15,9 @@ class Test(unittest.TestCase): def test_suite(): flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS return unittest.TestSuite(( - unittest.makeSuite(Test), - DocFileSuite('README.txt', optionflags=flags), - )) + unittest.TestLoader().loadTestsFromTestCase(Test), + DocFileSuite('README.txt', optionflags=flags), + )) if __name__ == '__main__': unittest.main(defaultTest='test_suite') diff --git a/cyberapps/commerce/tests.py b/cyberapps/commerce/tests.py index 1111281..2bfa91a 100755 --- a/cyberapps/commerce/tests.py +++ b/cyberapps/commerce/tests.py @@ -1,4 +1,4 @@ -# $Id$ +# cyberapps.commerce.tests import unittest, doctest from zope.testing.doctestunit import DocFileSuite @@ -47,9 +47,9 @@ class Test(unittest.TestCase): def test_suite(): flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS return unittest.TestSuite(( - unittest.makeSuite(Test), - DocFileSuite('README.txt', optionflags=flags), - )) + unittest.TestLoader().loadTestsFromTestCase(Test), + DocFileSuite('README.txt', optionflags=flags), + )) if __name__ == '__main__': unittest.main(defaultTest='test_suite') diff --git a/cyberapps/knowledge/tests.py b/cyberapps/knowledge/tests.py index 9379215..d6b2d83 100755 --- a/cyberapps/knowledge/tests.py +++ b/cyberapps/knowledge/tests.py @@ -24,9 +24,9 @@ class Test(unittest.TestCase): def test_suite(): flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS return unittest.TestSuite(( - unittest.makeSuite(Test), - doctest.DocFileSuite('README.txt', optionflags=flags), - )) + unittest.TestLoader().loadTestsFromTestCase(Test), + doctest.DocFileSuite('README.txt', optionflags=flags), + )) if __name__ == '__main__': unittest.main(defaultTest='test_suite') diff --git a/pyproject.toml b/pyproject.toml index a44a4d7..1c1164c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -12,7 +12,7 @@ keywords = ["loops"] authors = [{name = "Helmut Merz", email = "helmutm@cy55.de"}] dependencies = [ - "loops", + "loops[server]", "requests", ]