Bastian Germann has proposed merging lp:~bastian-germann/openlp/fix-circ-dep into lp:openlp.
Commit message: Fix a circular dependency that is hit when you run tests.interfaces.openlp_plugins.custom.forms.test_customform: ImportError: Failed to import test module: tests.interfaces.openlp_plugins.custom.forms.test_customform Traceback (most recent call last): File "/var/lib/jenkins/virtualenv/lib/python3.6/site-packages/nose2/plugins/loader/discovery.py", line 201, in _find_tests_in_file module = util.module_from_name(module_name) File "/var/lib/jenkins/virtualenv/lib/python3.6/site-packages/nose2/util.py", line 77, in module_from_name __import__(name) File "/var/lib/jenkins/shared-repo/trunk/tests/interfaces/openlp_plugins/custom/forms/test_customform.py", line 31, in <module> from openlp.plugins.custom.forms.editcustomform import EditCustomForm File "/var/lib/jenkins/shared-repo/trunk/openlp/plugins/custom/forms/editcustomform.py", line 30, in <module> from openlp.plugins.custom.lib import CustomXMLBuilder, CustomXMLParser File "/var/lib/jenkins/shared-repo/trunk/openlp/plugins/custom/lib/__init__.py", line 25, in <module> from .mediaitem import CustomMediaItem File "/var/lib/jenkins/shared-repo/trunk/openlp/plugins/custom/lib/mediaitem.py", line 37, in <module> from openlp.plugins.custom.forms.editcustomform import EditCustomForm ImportError: cannot import name 'EditCustomForm' Requested reviews: OpenLP Core (openlp-core) For more details, see: https://code.launchpad.net/~bastian-germann/openlp/fix-circ-dep/+merge/357597 -- Your team OpenLP Core is requested to review the proposed merge of lp:~bastian-germann/openlp/fix-circ-dep into lp:openlp.
=== modified file 'openlp/plugins/custom/forms/__init__.py' --- openlp/plugins/custom/forms/__init__.py 2017-12-29 09:15:48 +0000 +++ openlp/plugins/custom/forms/__init__.py 2018-10-21 20:55:54 +0000 @@ -19,3 +19,5 @@ # with this program; if not, write to the Free Software Foundation, Inc., 59 # # Temple Place, Suite 330, Boston, MA 02111-1307 USA # ############################################################################### + +import openlp.plugins.custom.lib
_______________________________________________ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp