Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 3 additions & 13 deletions run.py
Original file line number Diff line number Diff line change
@@ -1,16 +1,6 @@
import subprocess
import sys

# https://stackoverflow.com/a/51704613
try:
from pip import main as pipmain
except ImportError:
from pip._internal import main as pipmain

# More pip changes breaking us.
main_fn = pipmain
if hasattr(pipmain, 'main'):
main_fn = pipmain.main

DEFAULT_LOGGER = 'rlbot'

if __name__ == '__main__':
Expand All @@ -23,15 +13,15 @@
logger.log(logging_utils.logging_level,
'Skipping upgrade check for now since it looks like you have no internet')
elif public_utils.is_safe_to_upgrade():
main_fn(['install', '-r', 'requirements.txt', '--upgrade', '--upgrade-strategy=eager'])
subprocess.call([sys.executable, "-m", "pip", "install", '-r', 'requirements.txt', '--upgrade', '--upgrade-strategy=eager'])

# https://stackoverflow.com/a/44401013
rlbots = [module for module in sys.modules if module.startswith('rlbot')]
for rlbot_module in rlbots:
sys.modules.pop(rlbot_module)

except ImportError:
main_fn(['install', '-r', 'requirements.txt', '--upgrade', '--upgrade-strategy=eager'])
subprocess.call([sys.executable, "-m", "pip", "install", '-r', 'requirements.txt', '--upgrade', '--upgrade-strategy=eager'])

try:
if len(sys.argv) > 1 and sys.argv[1] == 'gui':
Expand Down