diff --git a/first_diff.py b/first_diff.py index 8a92288bed..0ffa0f672a 100755 --- a/first_diff.py +++ b/first_diff.py @@ -3,17 +3,8 @@ import argparse from pathlib import Path -try: - import rabbitizer -except ImportError: - print("Missing dependency rabbitizer, install it with `python3 -m pip install 'rabbitizer>=1.0.0,<2.0.0'`") - exit(1) - -try: - import mapfile_parser -except ImportError: - print("Missing dependency mapfile_parser, install it with `python3 -m pip install 'mapfile-parser>=1.2.1,<2.0.0'`") - exit(1) +import rabbitizer +import mapfile_parser def decodeInstruction(bytesDiff: bytes, mapFile: mapfile_parser.MapFile) -> str: diff --git a/requirements.txt b/requirements.txt index e928960b3b..9030b9a454 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,18 @@ # Setup and compression crunch64>=0.3.1,<1.0.0 ipl3checksum>=1.2.0,<2.0.0 + +# asm-differ +argcomplete +colorama +cxxfilt +python-Levenshtein +watchdog + +# decomp-permuter +pycparser +toml + +# tools +mapfile-parser>=1.2.1,<2.0.0 +rabbitizer>=1.0.0,<2.0.0 diff --git a/sym_info.py b/sym_info.py index 9a279593db..28a927c68f 100755 --- a/sym_info.py +++ b/sym_info.py @@ -3,11 +3,7 @@ import argparse from pathlib import Path -try: - import mapfile_parser -except ImportError: - print("Missing dependency mapfile_parser, install it with `python3 -m pip install 'mapfile-parser>=1.2.1,<2.0.0'`") - exit(1) +import mapfile_parser def symInfoMain():