diff --git a/.efrocachemap b/.efrocachemap index 4dc98cbd..81b1d181 100644 --- a/.efrocachemap +++ b/.efrocachemap @@ -4072,26 +4072,26 @@ "build/assets/workspace/ninjafightplug.py": "https://files.ballistica.net/cache/ba1/c5/09/4f10b8a21ba87aa5509cff7a164b", "build/assets/workspace/onslaughtplug.py": "https://files.ballistica.net/cache/ba1/ff/0a/a354984f9c074dab0676ac7e4877", "build/assets/workspace/runaroundplug.py": "https://files.ballistica.net/cache/ba1/2a/1c/9ee5db6d1bceca7fa6638fb8abde", - "build/prefab/full/linux_arm64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/43/64/22e077c0bbbf246e6323259231c9", - "build/prefab/full/linux_arm64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/32/a5/77f989dd565b3197c8f77df4a138", - "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/a2/fc/2f3622c8c980e394733b48c98421", - "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/b1/2f/dc3a847de05fcc6fdddc6d814ddb", - "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/ec/4b/66a8fd1e680f2cb77f9f4559112c", - "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/b2/55/64d847b58c501c80b4ea53678e9a", - "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/9f/37/b4553f9f9fda9fb07d7f3f3ab2f6", - "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/cf/b4/d955fed8589fd59e0f15e69ab568", - "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/0a/e3/4fbc3dc52af3f1b972ef1be52f77", - "build/prefab/full/mac_arm64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/b1/2f/33ad58bdcbcb2ac5de570b7b86d4", - "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/52/98/c2c12cc656073db630da4ef8c996", - "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/d4/50/fc305556a2926c5c69004b49a09a", - "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/d3/bd/39608485bc10553589523928740e", - "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/bc/5d/513cbfa9287f138912cb73f61783", - "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/ae/b6/653d88e5f1cc84247ad51da0620b", - "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/e3/71/cd19381bd0a9c81f112dd90868ae", - "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/2f/37/31627eb0d24b1d85295c8cbdc52d", - "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/bc/e7/8cda7a606b0c572d59c36df0ac52", - "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/ec/fd/1de6183cbab383ffd981f319562e", - "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/4d/75/f02f361fff8f8ac49c49823e4638", + "build/prefab/full/linux_arm64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/f2/47/deeb85392a07c72f30592c01f493", + "build/prefab/full/linux_arm64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/41/c3/09b8b77efdc175bb177904a5d4ff", + "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/c3/7f/f6f9c38893a4d57cd9ee608a88ab", + "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/07/22/830c7e9cc6322e2c579eb58efa92", + "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/08/b1/3bd935ceb437cb8d2e1758f54af1", + "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/e4/ef/7f26356e00109ca41bd3a15f4c03", + "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/52/f3/121ca899a51d08c611e9cc6144cd", + "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/97/ac/04610514fbdfd88a7b1512f217bf", + "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/df/dd/a7649c88b5f92866e25ab294ab79", + "build/prefab/full/mac_arm64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/df/8b/21d4ef5d65a43efce9f7cc2d1c7d", + "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/01/46/7a1db218c5c2448185cf6dcfedf5", + "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/57/4f/c0fd4bb760e9d2ebd8bdd846bce1", + "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/64/ef/ce429e8e501c89a38c42f6749321", + "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/39/e9/e13f8016e2883f6aa1e418afcd13", + "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/e1/b5/79a889568b25c153f9fcadc583cc", + "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/80/90/5cda30fff97dcbfaf2f3ccd0accb", + "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/46/97/4e250671edfa301ddae2ac1f435b", + "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/5d/b6/9e13f8f84f1532e9f2ba0aa9a356", + "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/0b/bc/5e71f8fa05dacf9df290cfb2c1d7", + "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/03/e6/553685865ef7492321af81b42d07", "build/prefab/lib/linux_arm64_gui/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/98/32/43c61f1e11520f764158cf0e76d2", "build/prefab/lib/linux_arm64_gui/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/ca/65/cba463f21a8f76c5bbfe27cae124", "build/prefab/lib/linux_arm64_server/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/73/20/119211f1700bb5a410cedf4e76f2", diff --git a/CHANGELOG.md b/CHANGELOG.md index 45c21c50..b92c6806 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -### 1.7.20 (build 21047, api 8, 2023-06-05) +### 1.7.20 (build 21048, api 8, 2023-06-05) - This seems like a good time for a `refactoring` release in anticipation of changes coming in 1.8. Basically this means that a lot of things will be diff --git a/src/assets/ba_data/python/baenv.py b/src/assets/ba_data/python/baenv.py index cc9e3b74..e1304617 100644 --- a/src/assets/ba_data/python/baenv.py +++ b/src/assets/ba_data/python/baenv.py @@ -30,7 +30,7 @@ if TYPE_CHECKING: # Build number and version of the ballistica binary we expect to be # using. -TARGET_BALLISTICA_BUILD = 21047 +TARGET_BALLISTICA_BUILD = 21048 TARGET_BALLISTICA_VERSION = '1.7.20' _g_env_config: EnvConfig | None = None diff --git a/src/ballistica/scene_v1/scene_v1.cc b/src/ballistica/scene_v1/scene_v1.cc index 20740fa8..70591155 100644 --- a/src/ballistica/scene_v1/scene_v1.cc +++ b/src/ballistica/scene_v1/scene_v1.cc @@ -57,6 +57,9 @@ void SceneV1FeatureSet::OnModuleExec(PyObject* module) { // This is what allows others to 'import' our C++ front end. g_scene_v1->StoreOnPythonModule(module); + // Define our classes. + g_scene_v1->python->AddPythonClasses(module); + // Import any Python stuff we use into objs_. g_scene_v1->python->ImportPythonObjs(); @@ -66,9 +69,6 @@ void SceneV1FeatureSet::OnModuleExec(PyObject* module) { assert(g_classic == nullptr); g_classic = classic::ClassicFeatureSet::Import(); - // Define our classes. - g_scene_v1->python->AddPythonClasses(module); - g_core->LifecycleLog("_bascenev1 exec end"); } diff --git a/src/ballistica/shared/ballistica.cc b/src/ballistica/shared/ballistica.cc index fc424916..3495872f 100644 --- a/src/ballistica/shared/ballistica.cc +++ b/src/ballistica/shared/ballistica.cc @@ -39,7 +39,7 @@ auto main(int argc, char** argv) -> int { namespace ballistica { // These are set automatically via script; don't modify them here. -const int kEngineBuildNumber = 21047; +const int kEngineBuildNumber = 21048; const char* kEngineVersion = "1.7.20"; auto MonolithicMain(const core::CoreConfig& core_config) -> int { diff --git a/tests/test_classic/__init__.py b/tests/test_classic/__init__.py new file mode 100644 index 00000000..867b1714 --- /dev/null +++ b/tests/test_classic/__init__.py @@ -0,0 +1 @@ +# Released under the MIT License. See LICENSE for details. diff --git a/tests/test_classic/test_imports.py b/tests/test_classic/test_imports.py new file mode 100644 index 00000000..20762bb2 --- /dev/null +++ b/tests/test_classic/test_imports.py @@ -0,0 +1,21 @@ +# Released under the MIT License. See LICENSE for details. +# +"""Testing asset manager functionality.""" + +from __future__ import annotations + +import pytest + +from batools import testrun + + +@pytest.mark.skipif( + testrun.test_runs_disabled(), reason=testrun.test_runs_disabled_reason() +) +def test_imports() -> None: + """Test imports for our featureset.""" + + # Make sure our package and binary module can be cleanly imported by + # themselves. + testrun.run_command('import baclassic') + testrun.run_command('import _baclassic') diff --git a/tests/test_scene_v1/__init__.py b/tests/test_scene_v1/__init__.py new file mode 100644 index 00000000..867b1714 --- /dev/null +++ b/tests/test_scene_v1/__init__.py @@ -0,0 +1 @@ +# Released under the MIT License. See LICENSE for details. diff --git a/tests/test_scene_v1/test_imports.py b/tests/test_scene_v1/test_imports.py new file mode 100644 index 00000000..ebb9c070 --- /dev/null +++ b/tests/test_scene_v1/test_imports.py @@ -0,0 +1,21 @@ +# Released under the MIT License. See LICENSE for details. +# +"""Testing asset manager functionality.""" + +from __future__ import annotations + +import pytest + +from batools import testrun + + +@pytest.mark.skipif( + testrun.test_runs_disabled(), reason=testrun.test_runs_disabled_reason() +) +def test_imports() -> None: + """Test imports for our featureset.""" + + # Make sure our package and binary module can be cleanly imported by + # themselves. + testrun.run_command('import bascenev1') + testrun.run_command('import _bascenev1')