From a507e6416321362f3abba3bdf7ac65508d1d98b0 Mon Sep 17 00:00:00 2001
From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com>
Date: Tue, 21 Feb 2023 18:46:10 +0100
Subject: [PATCH] No need for the mbuild folder

---
 novelwriter/{mbuild => core}/buildsettings.py      |  0
 novelwriter/{mbuild => core}/docbuild.py           |  0
 novelwriter/mbuild/__init__.py                     |  3 ---
 .../test_core_docbuild.py}                         | 14 +++++++-------
 4 files changed, 7 insertions(+), 10 deletions(-)
 rename novelwriter/{mbuild => core}/buildsettings.py (100%)
 rename novelwriter/{mbuild => core}/docbuild.py (100%)
 delete mode 100644 novelwriter/mbuild/__init__.py
 rename tests/{test_mbuild/test_mbuild_docbuild.py => test_core/test_core_docbuild.py} (95%)

diff --git a/novelwriter/mbuild/buildsettings.py b/novelwriter/core/buildsettings.py
similarity index 100%
rename from novelwriter/mbuild/buildsettings.py
rename to novelwriter/core/buildsettings.py
diff --git a/novelwriter/mbuild/docbuild.py b/novelwriter/core/docbuild.py
similarity index 100%
rename from novelwriter/mbuild/docbuild.py
rename to novelwriter/core/docbuild.py
diff --git a/novelwriter/mbuild/__init__.py b/novelwriter/mbuild/__init__.py
deleted file mode 100644
index 5a2fd13d..00000000
--- a/novelwriter/mbuild/__init__.py
+++ /dev/null
@@ -1,3 +0,0 @@
-"""
-novelWriter – Manuscript Build Init File
-"""
diff --git a/tests/test_mbuild/test_mbuild_docbuild.py b/tests/test_core/test_core_docbuild.py
similarity index 95%
rename from tests/test_mbuild/test_mbuild_docbuild.py
rename to tests/test_core/test_core_docbuild.py
index ca1dea4b..c89c34fa 100644
--- a/tests/test_mbuild/test_mbuild_docbuild.py
+++ b/tests/test_core/test_core_docbuild.py
@@ -27,7 +27,7 @@ from mock import causeException, causeOSError
 from tools import ODT_IGNORE, cmpFiles
 
 from novelwriter.core.project import NWProject
-from novelwriter.mbuild.docbuild import NWBuildDocument
+from novelwriter.core.docbuild import NWBuildDocument
 
 BUILD_CONF = {
     "format.fmtTitle": "Title: %title%",
@@ -53,7 +53,7 @@ BUILD_CONF = {
 
 
 @pytest.mark.core
-def testMBuildDocBuild_OpenDocument(monkeypatch, mockGUI, prjLipsum, fncPath, tstPaths):
+def testCoreDocBuild_OpenDocument(monkeypatch, mockGUI, prjLipsum, fncPath, tstPaths):
     """Test builing an open document manuscript.
     """
     theProject = NWProject(mockGUI)
@@ -157,11 +157,11 @@ def testMBuildDocBuild_OpenDocument(monkeypatch, mockGUI, prjLipsum, fncPath, ts
             "Build: Unknown item '0000000000000'",
         ]
 
-# END Test testMBuildDocBuild_OpenDocument
+# END Test testCoreDocBuild_OpenDocument
 
 
 @pytest.mark.core
-def testMBuildDocBuild_HTML(monkeypatch, mockGUI, prjLipsum, fncPath, tstPaths):
+def testCoreDocBuild_HTML(monkeypatch, mockGUI, prjLipsum, fncPath, tstPaths):
     """Test builing an HTML manuscript.
     """
     theProject = NWProject(mockGUI)
@@ -208,11 +208,11 @@ def testMBuildDocBuild_HTML(monkeypatch, mockGUI, prjLipsum, fncPath, tstPaths):
         assert docBuild.error == "OSError: Mock OSError"
         assert not docFile.is_file()
 
-# END Test testMBuildDocBuild_HTML
+# END Test testCoreDocBuild_HTML
 
 
 @pytest.mark.core
-def testMBuildDocBuild_Markdown(monkeypatch, mockGUI, prjLipsum, fncPath, tstPaths):
+def testCoreDocBuild_Markdown(monkeypatch, mockGUI, prjLipsum, fncPath, tstPaths):
     """Test builing an Markdown manuscript.
     """
     theProject = NWProject(mockGUI)
@@ -279,4 +279,4 @@ def testMBuildDocBuild_Markdown(monkeypatch, mockGUI, prjLipsum, fncPath, tstPat
         assert docBuild.error == "OSError: Mock OSError"
         assert not docFile.is_file()
 
-# END Test testMBuildDocBuild_Markdown
+# END Test testCoreDocBuild_Markdown