Merge pull request #2853 from alicevision/dev/improveSetup

[build] Package the scripts in `bin` alongside the executables

Author: fabiencastan

.git-blame-ignore-revs

@@ -1,3 +1,5 @@
+# [build] `setup.py`: Use double quotes everywhere
+571de38ef1a9e72e6c1d2a997b60de5bd3caa5bf
 # [bin] `meshroom_batch`: Minor clean-up in the file
 15d9ecd888faa7216cfc5d97d473f5717a3118a3
 # [core] Linting following CI's flake8 report

meshroom/core/desc/node.py

@@ -15,12 +15,8 @@
 from meshroom.core import cgroup
 
 _MESHROOM_ROOT = Path(meshroom.__file__).parent.parent.as_posix()
-if getattr(sys, "frozen", False):  # When in release package mode, the path to meshroom_compute differs
-    _MESHROOM_COMPUTE = (Path(_MESHROOM_ROOT).parent / "meshroom_compute").as_posix()
-    _MESHROOM_COMPUTE_EXE = _MESHROOM_COMPUTE
-else:
-    _MESHROOM_COMPUTE = (Path(_MESHROOM_ROOT) / "bin" / "meshroom_compute").as_posix()
-    _MESHROOM_COMPUTE_EXE = f"python {_MESHROOM_COMPUTE}"
+_MESHROOM_COMPUTE = (Path(_MESHROOM_ROOT) / "bin" / "meshroom_compute").as_posix()
+_MESHROOM_COMPUTE_EXE = f"python {_MESHROOM_COMPUTE}"
 
 
 class MrNodeType(enum.Enum):

setup.py

@@ -58,7 +58,7 @@ def __init__(self, script, initScript=None, base=None, targetName=None, icons=No
         "cmath",
         "numpy"
     ],
-    "include_files": ["CHANGES.md", "COPYING.md", "LICENSE-MPL2.md", "README.md"]
+    "include_files": ["CHANGES.md", "COPYING.md", "LICENSE-MPL2.md", "README.md", "bin"]
 }
 if os.path.isdir(os.path.join(currentDir, "tractor")):
     build_exe_options["packages"].append("tractor")
@@ -143,9 +143,9 @@ def __init__(self, script, initScript=None, base=None, targetName=None, icons=No
 setup(
     name="Meshroom",
     description="Meshroom",
-    install_requires=['psutil', 'pytest', 'PySide6', 'markdown'],
+    install_requires=["psutil", "PySide6", "markdown"],
     setup_requires=[
-        'cx_Freeze'
+        "cx_Freeze"
     ],
     version=meshroom.__version__,
     options={"build_exe": build_exe_options},