from os.path import exists
from p3d_appimage import AppImageBuilder
from pmachines.app import Pmachines
-import traceback
+from traceback import print_exc
class Main:
def __run_game(self):
try: self.__pmachines.run()
- except Exception: traceback.print_exc()
+ except Exception: print_exc()
if __name__ == '__main__' or exists('main.pyo'):
from ya2.utils.log import LogManagerBase
LogManagerBase.pre_init_logging()
-import subprocess, sys, ya2, os, p3d_appimage, setuptools
+import sys, os
+from setuptools import setup
+from subprocess import Popen
from setuptools import Command
from setuptools.command.develop import develop
from multiprocessing import cpu_count
from textwrap import dedent
from direct.dist.commands import bdist_apps
+from p3d_appimage import AppImageBuilder
from ya2.build.build import _branch, find_file_names, _version, FindFileNamesInfo
-import ya2.build.lang
-import ya2.build.screenshots
-import ya2.build.images
+from ya2.build.lang import LanguageBuilder
+from ya2.build.screenshots import build_screenshots
+from ya2.build.images import build_images
+from ya2.build.models import ModelsBuilder
from pmachines.app import Pmachines
def run(self):
super().run(self)
for argument in ['lang', 'models', 'images']:
- p = subprocess.Popen([sys.executable, __file__, argument])
+ p = Popen([sys.executable, __file__, argument])
p.communicate()
class ModelsCommand(BaseCommand):
def run(self):
- m = ya2.build.models.ModelsBuilder()
+ m = ModelsBuilder()
m.build('assets/models', int(BaseCommand.cores))
class ImagesCommand(BaseCommand):
def run(self):
- ya2.build.screenshots.build_screenshots(Pmachines.scenes())
+ build_screenshots(Pmachines.scenes())
find_info = FindFileNamesInfo(
['jpg', 'png'],
['models', 'gltf', 'bam'],
['_png.png'])
images = find_file_names(find_info)
- ya2.build.images.build_images(images, int(BaseCommand.cores))
+ build_images(images, int(BaseCommand.cores))
class L10nCommand(BaseCommand):
def run(self):
- l = ya2.build.lang.LanguageBuilder(
+ l = LanguageBuilder(
app_name, 'assets/locale/po/', 'assets/scenes/', 'assets/locale/')
l.build()
def __eventually_build_appimage(self):
if not self.nolinux:
- a = p3d_appimage.AppImageBuilder(self)
+ a = AppImageBuilder(self)
filename_branch = {'master': 'alpha', 'rc': 'rc', 'stable': ''}
branch = filename_branch[_branch()]
a.build(long_name, branch, 'https://www.ya2.it/downloads/')
return installers
if __name__ == '__main__':
- setuptools.setup(**_build_setup_arguments())
+ setup(**_build_setup_arguments())
from ya2.utils.dictfile import DctFile
import importlib
import main
-import traceback
class MainTests(TestCase):
main._Main__pmachines.run.assert_called_once()
@patch.object(sys, 'argv', ['python -m unittest'])
- @patch.object(traceback, 'print_exc')
+ @patch.object(main, 'print_exc')
def test_run_game_exception(self, print_exc_mock):
- main = Main()
- main._Main__pmachines.run = MagicMock(side_effect=Exception)
- main.run()
- main._Main__pmachines.base.destroy()
- main._Main__pmachines.run.trowed_exception()
+ _main = Main()
+ _main._Main__pmachines.run = MagicMock(side_effect=Exception)
+ _main.run()
+ _main._Main__pmachines.base.destroy()
+ _main._Main__pmachines.run.trowed_exception()
print_exc_mock.assert_called_once()
from setup import BaseCommand, SetupDevelopmentCommand, ModelsCommand, \
ImagesCommand, L10nCommand, BDistAppsCommand
from ya2.build.build import exec_cmd
-import ya2.build.images, ya2.build.screenshots, os
+import os
import direct.dist.commands, setup
class SetupTests(TestCase):
sys.argv = self._prev_argv
@patch.object(develop, 'run')
- @patch('subprocess.Popen', autospec=True)
+ @patch('setup.Popen', autospec=True)
def test_setup_development_command(self, popen, dev_run):
s = SetupDevelopmentCommand(Distribution())
s.run()
cmd = BaseCommand(Distribution())
self.assertEqual(cmd.cores, 2)
- @patch('ya2.build.models.ModelsBuilder', autospec=True)
+ @patch('setup.ModelsBuilder', autospec=True)
def test_models_command(self, mb_mock):
cmd = ModelsCommand(Distribution())
cmd.run()
build_mock.assert_called_once()
assert build_mock.call_args_list[0].args == ('assets/models', ncores)
- @patch.object(ya2.build.images, 'build_images', autospec=True)
- @patch.object(ya2.build.screenshots, 'build_screenshots', autospec=True)
+ @patch.object(setup, 'build_images', autospec=True)
+ @patch.object(setup, 'build_screenshots', autospec=True)
def test_images_command(self, screenshot_mock, images_mock):
cmd = ImagesCommand(Distribution())
cmd.run()
images_mock.assert_called_once()
assert all('assets/images' in a for a in images_mock.call_args_list[0].args[0])
- @patch('ya2.build.lang.LanguageBuilder', autospec=True)
+ @patch('setup.LanguageBuilder', autospec=True)
def test_l10n_command(self, l_mock):
cmd = L10nCommand(Distribution())
cmd.run()
@patch.object(direct.dist.commands.bdist_apps, 'run', autospec=True)
@patch.object(os, 'system', autospec=True)
- @patch('p3d_appimage.AppImageBuilder', autospec=True)
+ @patch('setup.AppImageBuilder', autospec=True)
def test_bdistapps_command(self, a_mock, o_mock, b_mock):
cmd = BDistAppsCommand(Distribution())
cmd.run()