From 900c2699a460e61c5de826b8e08c8956d6ad003b Mon Sep 17 00:00:00 2001 From: Eric Froemling Date: Mon, 21 Mar 2022 14:56:54 -0500 Subject: [PATCH] tidying and test fix --- .efrocachemap | 52 +++++++++++------------ CHANGELOG.md | 2 +- assets/src/ba_data/python/ba/_actor.py | 2 +- assets/src/ba_data/python/ba/_general.py | 2 +- assets/src/ba_data/python/ba/_language.py | 2 +- src/ballistica/ballistica.cc | 2 +- tests/test_efro/test_rpc.py | 10 +++-- tools/batools/metamakefile.py | 16 ++----- 8 files changed, 41 insertions(+), 47 deletions(-) diff --git a/.efrocachemap b/.efrocachemap index 297b9b2e..05403abe 100644 --- a/.efrocachemap +++ b/.efrocachemap @@ -3971,26 +3971,26 @@ "assets/src/ba_data/python/ba/_generated/__init__.py": "https://files.ballistica.net/cache/ba1/ee/e8/cad05aa531c7faf7ff7b96db7f6e", "assets/src/ba_data/python/ba/_generated/enums.py": "https://files.ballistica.net/cache/ba1/b2/e5/0ee0561e16257a32830645239f34", "ballisticacore-windows/Generic/BallisticaCore.ico": "https://files.ballistica.net/cache/ba1/89/c0/e32c7d2a35dc9aef57cc73b0911a", - "build/prefab/full/linux_arm64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/a4/23/4b754faff34d9d48a71da46c37f6", + "build/prefab/full/linux_arm64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/26/ae/7c8af23412d9d04335e402ddbf9d", "build/prefab/full/linux_arm64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/74/1d/fc9e33e565475daaac80da5252f0", - "build/prefab/full/linux_arm64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/9b/24/84f417c05955d774c31025600cc2", - "build/prefab/full/linux_arm64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/69/2e/78b04116b9a5e0eeabb441a9707c", - "build/prefab/full/linux_x86_64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/8b/bb/486b68926dc17aec434a79166d4b", + "build/prefab/full/linux_arm64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/0a/a1/eac81af18bc6ac8823243b438b65", + "build/prefab/full/linux_arm64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/ea/05/441b048a2e1174283f8b95e2f16e", + "build/prefab/full/linux_x86_64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/ea/a7/2f14522135245ebce9d839209d14", "build/prefab/full/linux_x86_64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/9c/7b/ac1a200be0f37078af0991faca3b", - "build/prefab/full/linux_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/39/5f/d58c5760ae57284d3d8f981d70dd", - "build/prefab/full/linux_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/c4/42/11ee47b79299021ba19695793636", - "build/prefab/full/mac_arm64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/c9/e0/190024d4371954e5af7c588aa17d", - "build/prefab/full/mac_arm64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/22/20/94bd911fe574b6ce831aa0f62478", - "build/prefab/full/mac_arm64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/f8/f4/ac3127a98b11bf7ce5e7acdcf552", - "build/prefab/full/mac_arm64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/cf/b2/e70ec7a47ed9bbbda951c01e06df", - "build/prefab/full/mac_x86_64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/f7/0a/adc60ccd753241e03039e98aa734", - "build/prefab/full/mac_x86_64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/47/74/93b23d43435b16bad3bde1ca0e88", - "build/prefab/full/mac_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/09/36/64e7c1425316335f0fa2cb7b692a", - "build/prefab/full/mac_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/cc/36/27b1c5c714850a3ea2cfa83ee35e", - "build/prefab/full/windows_x86_gui/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/84/0a/6712d37d94dcf811e828a63b488f", - "build/prefab/full/windows_x86_gui/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/59/01/04af869d8334397bf7368791e9f6", - "build/prefab/full/windows_x86_server/debug/dist/BallisticaCoreHeadless.exe": "https://files.ballistica.net/cache/ba1/12/ae/725259070ca6fbc65075d3aa6198", - "build/prefab/full/windows_x86_server/release/dist/BallisticaCoreHeadless.exe": "https://files.ballistica.net/cache/ba1/c9/70/b2dd8c22a7a2c1ecf264797e68a4", + "build/prefab/full/linux_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/f0/fa/a161aff6b435b9ed9420045d1c00", + "build/prefab/full/linux_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/2d/cd/32238ca3903e965d6c0322d651ca", + "build/prefab/full/mac_arm64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/cd/99/6cf86c869041eb1d4ff1677c9e0a", + "build/prefab/full/mac_arm64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/1c/05/ddc9aab1e428bd19383a23613974", + "build/prefab/full/mac_arm64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/04/e7/6e1c95c0180a97d8f6c849a47127", + "build/prefab/full/mac_arm64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/44/22/56185cfcb528851c0ea37faab887", + "build/prefab/full/mac_x86_64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/61/fe/4bd8946c8548e8aa5e13e8368257", + "build/prefab/full/mac_x86_64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/ed/a1/74dc56833d670717ae11a43065fc", + "build/prefab/full/mac_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/fd/0d/6860ed62dc186a137c9af1b9e07c", + "build/prefab/full/mac_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/80/a5/ffe47a5f7ee8301882b6feaec519", + "build/prefab/full/windows_x86_gui/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/9a/fa/71f421aae773b2c6ce745e1c5dda", + "build/prefab/full/windows_x86_gui/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/98/3b/394f5604d3a00d09a5574d90e192", + "build/prefab/full/windows_x86_server/debug/dist/BallisticaCoreHeadless.exe": "https://files.ballistica.net/cache/ba1/c0/b6/0d741679e9d31ddfb22fb89a6ff8", + "build/prefab/full/windows_x86_server/release/dist/BallisticaCoreHeadless.exe": "https://files.ballistica.net/cache/ba1/d6/c9/3373f8d6653dea09d247104b9dbe", "build/prefab/lib/linux_arm64_gui/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/21/91/eb4b0119f4980c19c8fdc636e493", "build/prefab/lib/linux_arm64_gui/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/6f/4b/34dcc5f14c2547f4c16cda7b05c1", "build/prefab/lib/linux_arm64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/5a/38/91689a90fad69186191b3d55dd70", @@ -4007,14 +4007,14 @@ "build/prefab/lib/mac_x86_64_gui/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/2f/bb/31cc38cfadaa0f66772141b7e6ff", "build/prefab/lib/mac_x86_64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/b6/41/acfa81cf0a54a440609a63b757ab", "build/prefab/lib/mac_x86_64_server/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/d4/b5/483420d970e61d5f134345a3e324", - "build/prefab/lib/windows/Debug_Win32/BallisticaCoreGenericInternal.lib": "https://files.ballistica.net/cache/ba1/59/88/0452faa29ea4e111db7f53dba04f", - "build/prefab/lib/windows/Debug_Win32/BallisticaCoreGenericInternal.pdb": "https://files.ballistica.net/cache/ba1/74/c7/f0f15959049ecbff24ca66005679", - "build/prefab/lib/windows/Debug_Win32/BallisticaCoreHeadlessInternal.lib": "https://files.ballistica.net/cache/ba1/ec/49/857d97c572354d3c67cab99c0232", - "build/prefab/lib/windows/Debug_Win32/BallisticaCoreHeadlessInternal.pdb": "https://files.ballistica.net/cache/ba1/cd/12/eea8d89b8ca7c8b554900b8d52df", - "build/prefab/lib/windows/Release_Win32/BallisticaCoreGenericInternal.lib": "https://files.ballistica.net/cache/ba1/83/ac/8aa2427383a58c5f6a67dd5e72a7", - "build/prefab/lib/windows/Release_Win32/BallisticaCoreGenericInternal.pdb": "https://files.ballistica.net/cache/ba1/5f/70/a90795d12ebba994f2efca12edb6", - "build/prefab/lib/windows/Release_Win32/BallisticaCoreHeadlessInternal.lib": "https://files.ballistica.net/cache/ba1/d8/06/c2007d03895420df60b8cfe574ea", - "build/prefab/lib/windows/Release_Win32/BallisticaCoreHeadlessInternal.pdb": "https://files.ballistica.net/cache/ba1/9b/69/8c17f25bede5930ed3b6c3b3e0ae", + "build/prefab/lib/windows/Debug_Win32/BallisticaCoreGenericInternal.lib": "https://files.ballistica.net/cache/ba1/59/a7/2c69666a31c5bf1b61fb07f1bfd1", + "build/prefab/lib/windows/Debug_Win32/BallisticaCoreGenericInternal.pdb": "https://files.ballistica.net/cache/ba1/e4/64/4b6ec797f6ff2b1c14ac1741929d", + "build/prefab/lib/windows/Debug_Win32/BallisticaCoreHeadlessInternal.lib": "https://files.ballistica.net/cache/ba1/37/78/bc33b2f5a321d78045c42d7f7073", + "build/prefab/lib/windows/Debug_Win32/BallisticaCoreHeadlessInternal.pdb": "https://files.ballistica.net/cache/ba1/94/12/98981404149ae3fd8621df8c6004", + "build/prefab/lib/windows/Release_Win32/BallisticaCoreGenericInternal.lib": "https://files.ballistica.net/cache/ba1/fc/8e/5d7e308db119dce9b8f856f58ea0", + "build/prefab/lib/windows/Release_Win32/BallisticaCoreGenericInternal.pdb": "https://files.ballistica.net/cache/ba1/47/2a/d8f0a65e790f7718c7473ed1eff6", + "build/prefab/lib/windows/Release_Win32/BallisticaCoreHeadlessInternal.lib": "https://files.ballistica.net/cache/ba1/cc/3b/ee696a2da986de862bf66ef5efe5", + "build/prefab/lib/windows/Release_Win32/BallisticaCoreHeadlessInternal.pdb": "https://files.ballistica.net/cache/ba1/7d/e3/bb6dfc2d6286175251c74f80c6e7", "src/ballistica/generated/python_embedded/binding.inc": "https://files.ballistica.net/cache/ba1/b3/15/7c6d580b3482870b5b058858624c", "src/ballistica/generated/python_embedded/bootstrap.inc": "https://files.ballistica.net/cache/ba1/d3/db/e73d4dcf1280d5f677c3cf8b47c3" } \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 8ec480b4..fce4bc99 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -### 1.6.11 (20514, 2022-03-21) +### 1.6.11 (20516, 2022-03-21) - Documentation is now generated using pdoc . Thanks Dliwk!! ### 1.6.10 (20511, 2022-03-20) diff --git a/assets/src/ba_data/python/ba/_actor.py b/assets/src/ba_data/python/ba/_actor.py index 4a9c334a..c28c8721 100644 --- a/assets/src/ba_data/python/ba/_actor.py +++ b/assets/src/ba_data/python/ba/_actor.py @@ -18,8 +18,8 @@ if TYPE_CHECKING: TA = TypeVar('TA', bound='Actor') -# noinspection PyUnresolvedReferences class Actor: + # noinspection PyUnresolvedReferences """High level logical entities in a ba.Activity. Category: **Gameplay Classes** diff --git a/assets/src/ba_data/python/ba/_general.py b/assets/src/ba_data/python/ba/_general.py index ecab6c50..c31903d6 100644 --- a/assets/src/ba_data/python/ba/_general.py +++ b/assets/src/ba_data/python/ba/_general.py @@ -137,8 +137,8 @@ def get_type_name(cls: type) -> str: return cls.__module__ + '.' + cls.__name__ -# noinspection PyUnresolvedReferences class _WeakCall: + # noinspection PyUnresolvedReferences """Wrap a callable and arguments into a single callable object. Category: **General Utility Classes** diff --git a/assets/src/ba_data/python/ba/_language.py b/assets/src/ba_data/python/ba/_language.py index 57904130..a2b8fef7 100644 --- a/assets/src/ba_data/python/ba/_language.py +++ b/assets/src/ba_data/python/ba/_language.py @@ -364,8 +364,8 @@ class LanguageSubsystem: return 0xE000 <= ord(char) <= 0xF8FF -# noinspection PyUnresolvedReferences class Lstr: + # noinspection PyUnresolvedReferences """Used to define strings in a language-independent way. Category: **General Utility Classes** diff --git a/src/ballistica/ballistica.cc b/src/ballistica/ballistica.cc index 754dbe93..e01680e4 100644 --- a/src/ballistica/ballistica.cc +++ b/src/ballistica/ballistica.cc @@ -21,7 +21,7 @@ namespace ballistica { // These are set automatically via script; don't modify them here. -const int kAppBuildNumber = 20514; +const int kAppBuildNumber = 20516; const char* kAppVersion = "1.6.11"; // Our standalone globals. diff --git a/tests/test_efro/test_rpc.py b/tests/test_efro/test_rpc.py index c957498f..a2dbca5d 100644 --- a/tests/test_efro/test_rpc.py +++ b/tests/test_efro/test_rpc.py @@ -252,9 +252,13 @@ def test_keepalive_fail() -> None: # Tell our client to not send keepalives. tester.client.endpoint.test_suppress_keepalives = True - # Sleep just past the keepalive timeout and make sure the endpoint - # IS going down. - await asyncio.sleep(ktimeout * 1.25) + # Make sure the endpoint goes down sometime soon-ish after the + # keepalive timeout. + await asyncio.sleep(ktimeout) + starttime = time.monotonic() + while (not tester.server.endpoint.is_closing() + and time.monotonic() - starttime < 5.0): + await asyncio.sleep(0.01) assert tester.server.endpoint.is_closing() tester.run(_do_it()) diff --git a/tools/batools/metamakefile.py b/tools/batools/metamakefile.py index 47612a08..f2f271cb 100755 --- a/tools/batools/metamakefile.py +++ b/tools/batools/metamakefile.py @@ -111,7 +111,6 @@ def _add_python_embedded_targets(targets: list[Target]) -> None: name = os.path.splitext(fname)[0] src = [ f'{pkg}/python_embedded/{name}.py', - # os.path.join(TOOLS_DIR, 'batools', 'meta.py') ] dst = os.path.join(OUT_DIR_CPP, 'python_embedded', f'{name}.inc') if name == 'binding': @@ -137,10 +136,7 @@ def _add_python_embedded_targets_internal(targets: list[Target]) -> None: name = os.path.splitext(fname)[0] targets.append( Target( - src=[ - f'{pkg}/python_embedded/{name}.py', - # os.path.join(TOOLS_DIR, 'batoolsinternal', 'meta.py') - ], + src=[f'{pkg}/python_embedded/{name}.py'], dst=os.path.join(OUT_DIR_CPP, 'python_embedded', f'{name}.inc'), cmd='$(PCOMMAND) gen_encrypted_python_code $< $@', @@ -159,10 +155,7 @@ def _add_extra_targets_internal(targets: list[Target]) -> None: ]: targets.append( Target( - src=[ - f'bametainternal/python_embedded/{srcname}.py', - # os.path.join(TOOLS_DIR, 'batoolsinternal', 'meta.py') - ], + src=[f'bametainternal/python_embedded/{srcname}.py'], dst=f'bametainternal/generated/{dstname}.py', cmd=f'$(PCOMMAND) {gencmd} $@', )) @@ -173,10 +166,7 @@ def _add_extra_targets_internal(targets: list[Target]) -> None: for name in ['basnmessagesender', 'basnmessagereceiver']: targets.append( Target( - src=[ - f'bametainternal/generated/{name}.py', - # os.path.join(TOOLS_DIR, 'batoolsinternal', 'meta.py') - ], + src=[f'bametainternal/generated/{name}.py'], dst=os.path.join(OUT_DIR_CPP, 'python_embedded', f'{name}.inc'), cmd='$(PCOMMAND) gen_encrypted_python_code $< $@',