diff --git a/src/pya/unit_tests/pyaTests.cc b/src/pya/unit_tests/pyaTests.cc index 7fb7d0366..7420d1f69 100644 --- a/src/pya/unit_tests/pyaTests.cc +++ b/src/pya/unit_tests/pyaTests.cc @@ -97,6 +97,7 @@ void run_pythontest (tl::TestBase *_this, const std::string &fn) TEST(n) { run_pythontest(_this, file); } PYTHONTEST (kwargs, "kwargs.py") +PYTHONTEST (modTests, "modTests.py") PYTHONTEST (dbLayoutTest, "dbLayoutTest.py") PYTHONTEST (dbRegionTest, "dbRegionTest.py") PYTHONTEST (dbShapesTest, "dbShapesTest.py") diff --git a/src/pymod/__init__.py.noqt b/src/pymod/__init__.py.noqt index 4213afffb..e05d67916 100644 --- a/src/pymod/__init__.py.noqt +++ b/src/pymod/__init__.py.noqt @@ -1,5 +1,5 @@ - # klayout library definition file +from .tl import __version__ __all__ = [ "tl", "db", "lib", "lay", "rdb" ] diff --git a/src/pymod/__init__.py.qt4 b/src/pymod/__init__.py.qt4 index 7ca1f3e1b..5a3a61b66 100644 --- a/src/pymod/__init__.py.qt4 +++ b/src/pymod/__init__.py.qt4 @@ -1,5 +1,5 @@ - # klayout library definition file +from .tl import __version__ __all__ = [ "tl", "db", "lib", "rdb", "QtCore", "QtGui", "QtXml", "QtSql", "QtNetwork", "QtDesigner", "QtUiTools", "lay" ] diff --git a/src/pymod/__init__.py.qt5 b/src/pymod/__init__.py.qt5 index c6d2339fa..428c1acf0 100644 --- a/src/pymod/__init__.py.qt5 +++ b/src/pymod/__init__.py.qt5 @@ -1,6 +1,6 @@ - # klayout library definition file +from .tl import __version__ __all__ = [ "tl", "db", "lib", "rdb", "QtCore", "QtGui", "QtNetwork", "QtSql", "QtWidgets", "QtDesigner", "QtUiTools", "QtMultimedia", "QtPrintSupport", "QtSvg", "QtXmlPatterns", "QtXml", diff --git a/src/pymod/__init__.py.qtless b/src/pymod/__init__.py.qtless index 782df0624..757a6fa6a 100644 --- a/src/pymod/__init__.py.qtless +++ b/src/pymod/__init__.py.qtless @@ -1,4 +1,5 @@ # klayout library definition file +from .tl import __version__ __all__ = [ "tl", "db", "lib", "rdb", "lay" ] diff --git a/src/pymod/tl/tlMain.cc b/src/pymod/tl/tlMain.cc index f9603c18d..b006eee7f 100644 --- a/src/pymod/tl/tlMain.cc +++ b/src/pymod/tl/tlMain.cc @@ -23,3 +23,4 @@ #include "../pymodHelper.h" DEFINE_PYMOD(tlcore, "tl", "KLayout core module 'tl'") + diff --git a/testdata/python/basic.py b/testdata/python/basic.py index 2c43d39cd..fe720a451 100644 --- a/testdata/python/basic.py +++ b/testdata/python/basic.py @@ -2241,6 +2241,8 @@ class BasicTest(unittest.TestCase): def test_38(self): + pya.E.reset_inst() + # mixed const / non-const reference and events ec = pya.E.ic() self.assertEqual(ec.is_const_object(), True) diff --git a/testdata/python/modTests.py b/testdata/python/modTests.py new file mode 100644 index 000000000..a0c9ee3e7 --- /dev/null +++ b/testdata/python/modTests.py @@ -0,0 +1,43 @@ +# KLayout Layout Viewer +# Copyright (C) 2006-2024 Matthias Koefferlein +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + +import unittest + +class ModuleTest(unittest.TestCase): + + def test_1(self): + + import klayout as kl + self.assertEqual(kl.__version__ != "", True) + + import klayout.db as kldb + self.assertEqual(kldb.__version__, kl.__version__) + + import klayout.tl as kltl + self.assertEqual(kltl.__version__, kl.__version__) + +# run unit tests +if __name__ == '__main__': + suite = unittest.TestSuite() + # NOTE: Use this instead of loadTestsfromTestCase to select a specific test: + # suite.addTest(BasicTest("test_26")) + suite = unittest.TestLoader().loadTestsFromTestCase(BasicTest) + + if not unittest.TextTestRunner(verbosity = 1).run(suite).wasSuccessful(): + sys.exit(1) +