Cleanup for BombSquad releases

This commit is contained in:
Eric Froemling 2020-06-08 13:58:36 -07:00
parent 93f3900b99
commit 1e45d70d27
4 changed files with 38 additions and 38 deletions

View File

@ -420,7 +420,7 @@
"assets/build/ba_data/audio/zoeOw.ogg": "https://files.ballistica.net/cache/ba1/75/1d/868bb04cf691736035c917d02762",
"assets/build/ba_data/audio/zoePickup01.ogg": "https://files.ballistica.net/cache/ba1/44/2a/8535b446284235cb503947ece074",
"assets/build/ba_data/audio/zoeScream01.ogg": "https://files.ballistica.net/cache/ba1/f5/d3/8e941851c4310465646c4167afc1",
"assets/build/ba_data/data/langdata.json": "https://files.ballistica.net/cache/ba1/d4/df/3ab21c23dedf45ab454b0c4286b1",
"assets/build/ba_data/data/langdata.json": "https://files.ballistica.net/cache/ba1/1a/f1/5f137cf224ef00126e7bcbbcd6e7",
"assets/build/ba_data/data/languages/arabic.json": "https://files.ballistica.net/cache/ba1/b8/ed/e18bec56ff1d094aae86517a7854",
"assets/build/ba_data/data/languages/belarussian.json": "https://files.ballistica.net/cache/ba1/49/5f/b29bb65369040892fe6601801637",
"assets/build/ba_data/data/languages/chinese.json": "https://files.ballistica.net/cache/ba1/bc/59/21bb0b4ef33c733022340c60aebf",
@ -4132,16 +4132,16 @@
"assets/build/windows/x64/python.exe": "https://files.ballistica.net/cache/ba1/25/a7/dc87c1be41605eb6fefd0145144c",
"assets/build/windows/x64/python37.dll": "https://files.ballistica.net/cache/ba1/b9/e4/d912f56e42e9991bcbb4c804cfcb",
"assets/build/windows/x64/pythonw.exe": "https://files.ballistica.net/cache/ba1/6c/bb/b6f52c306aa4e88061510e96cefe",
"build/prefab/linux-server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/1d/9e/32020e34ce5fdbadf629b33ed5f5",
"build/prefab/linux-server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/7b/d6/25671c9f875c9eb1f25f09d1000f",
"build/prefab/linux/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/88/b6/80b10adc9b2b98b8d05235d1cf52",
"build/prefab/linux/release/ballisticacore": "https://files.ballistica.net/cache/ba1/ca/e9/c7b41ca260cb04e539cc81fd79c4",
"build/prefab/mac-server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/46/99/b0a1e649204828f3371da6bf7aef",
"build/prefab/mac-server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/88/61/63b817195328d360c02c8705405a",
"build/prefab/mac/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/24/3c/5e120a4ad559edfd8d068b85be67",
"build/prefab/mac/release/ballisticacore": "https://files.ballistica.net/cache/ba1/c1/34/ad36c057f3d2c890617a25311cd8",
"build/prefab/windows-server/debug/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/1b/45/84ad79d8b17692ff684f2e8c9fe3",
"build/prefab/windows-server/release/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/30/63/897899f41f282089fb752fd503b8",
"build/prefab/windows/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/09/4f/940b3db9892ac20023c173e2c39d",
"build/prefab/windows/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/de/53/9b99e2dbf64622ccc95014ce598b"
"build/prefab/linux-server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/bf/e3/26df34acf7cada33af7f6f1d3431",
"build/prefab/linux-server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/fa/b3/4b528db89a74e80a050274f22b6c",
"build/prefab/linux/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/e0/02/c987aa278b2439db5a148971d8ba",
"build/prefab/linux/release/ballisticacore": "https://files.ballistica.net/cache/ba1/a2/9b/15a7833af0c21bbb6308a691a292",
"build/prefab/mac-server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/e7/9b/df93cfbca1c8feef57c3bf45b05a",
"build/prefab/mac-server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/25/c4/3370a0713974510c049d9c2486aa",
"build/prefab/mac/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/08/3e/9506fbb6603a33434df94e9f0680",
"build/prefab/mac/release/ballisticacore": "https://files.ballistica.net/cache/ba1/b3/20/b37a4700d2107b10f501b486a90e",
"build/prefab/windows-server/debug/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/e0/5f/89ac5f7407bba4192d4ee0a85971",
"build/prefab/windows-server/release/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/82/11/59011bd718f84ea698a1f8273d36",
"build/prefab/windows/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/8e/3b/b1dd633355c80357bc3ddfe18e4a",
"build/prefab/windows/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/21/d5/099fafed1d613b666f1b7187eea4"
}

View File

@ -61,9 +61,9 @@ class CoopBrowserWindow(ba.Window):
app = ba.app
cfg = app.config
# Quick note to players that tourneys won't work if we're a non-blessed
# or a debug build...
if not _ba.is_blessed() or ba.app.debug_build:
# Quick note to players that tourneys won't work in ballistica
# core builds. (need to split the word so it won't get subbed out)
if 'ballistica' + 'core' == _ba.appname():
ba.timer(1.0,
lambda: ba.screenmessage(
ba.Lstr(resource='noTournamentsInTestBuildText'),

View File

@ -46,7 +46,7 @@ class PipRequirement:
PIP_REQUIREMENTS = [
PipRequirement(modulename='pylint', minversion=[2, 5, 2]),
PipRequirement(modulename='pylint', minversion=[2, 5, 3]),
PipRequirement(modulename='mypy', minversion=[0, 780]),
PipRequirement(modulename='yapf', minversion=[0, 30, 0]),
PipRequirement(modulename='cpplint', minversion=[1, 5, 0]),

View File

@ -41,34 +41,33 @@ from efrotools.snippets import (
PROJROOT, snippets_main, formatcode, formatscripts, formatmakefile,
cpplint, pylint, runpylint, mypy, runmypy, dmypy, tool_config_install,
sync, sync_all, scriptfiles, pycharm, clioncode, androidstudiocode,
makefile_target_list, spelling, spelling_all, pytest, echo)
from efrotools.snippets import compile_python_files as _orig_compile_py_files
makefile_target_list, spelling, spelling_all, pytest, echo,
compile_python_files)
# from efrotools.snippets import compile_python_files as _orig_compile_py_files
# pylint: enable=unused-import
if TYPE_CHECKING:
from typing import Optional
# def compile_python_files() -> None:
# """Override for compiling python files."""
# from pathlib import Path
# import subprocess
# import os
# from efrotools import getlocalconfig
def compile_python_files() -> None:
"""Override for compiling python files."""
from pathlib import Path
import subprocess
import os
from efrotools import getlocalconfig
# # Run the standard command
# _orig_compile_py_files()
# Run the standard command
_orig_compile_py_files()
# # Optionally also blow away blessing status to keep it clear that
# # things need to be re-blessed.
# blesspath = Path(PROJROOT, 'tools/bless')
# if os.path.exists(blesspath) and getlocalconfig(PROJROOT).get(
# 'auto_clear_blessing', False):
# subprocess.run([blesspath, 'clear'], check=True, cwd=PROJROOT)
# Optionally also blow away blessing status to keep it clear that
# things need to be re-blessed.
blesspath = Path(PROJROOT, 'tools/bless')
if os.path.exists(blesspath) and getlocalconfig(PROJROOT).get(
'auto_clear_blessing', False):
subprocess.run([blesspath, 'clear'], check=True, cwd=PROJROOT)
# Copy the original func's doc-string
compile_python_files.__doc__ = _orig_compile_py_files.__doc__
# # Copy the original func's doc-string
# compile_python_files.__doc__ = _orig_compile_py_files.__doc__
def archive_old_builds() -> None:
@ -452,11 +451,12 @@ def install_pip_reqs() -> None:
"""Install Python Pip packages needed for this project."""
import subprocess
from efrotools import PYTHON_BIN
from efro.terminal import Clr
from batools.build import get_pip_reqs
subprocess.run([PYTHON_BIN, '-m', 'pip', 'install', '--upgrade'] +
get_pip_reqs(),
check=True)
print('All pip requirements installed!')
print(f'{Clr.GRN}All pip requirements installed!{Clr.RST}')
def checkenv() -> None: