Skip to content

Commit

Permalink
moved dependancy logic
Browse files Browse the repository at this point in the history
  • Loading branch information
7h3Rabbit committed Nov 18, 2024
1 parent 68048c9 commit cf6a598
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 38 deletions.
8 changes: 8 additions & 0 deletions default.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@
from engines.sql import write_tests as sql_write_tests
from engines.markdown_engine import write_tests as markdown_write_tests
from helpers.credits_helper import get_credits, update_credits_markdown
from helpers.dependency_helper import dependency
from helpers.mdn_helper import update_mdn_rules
from helpers.release_helper import set_new_release_version_in_env, update_release_version
from helpers.setting_helper import config_mapping, get_config, set_config, set_config_from_cmd, set_runtime_config_only
from helpers.test_helper import TEST_FUNCS, TEST_ALL, restart_failures_log, test_sites
from helpers.translation_helper import validate_translations
Expand Down Expand Up @@ -199,6 +201,10 @@ def prepare_release(self, argv):
update_release_version(argv)
sys.exit(0)

def check_dependency(self, _):
dependency()
sys.exit(0)

def create_release(self, argv):
set_new_release_version_in_env(argv)
sys.exit(0)
Expand Down Expand Up @@ -551,6 +557,7 @@ def handle_option(self, opt, arg):
("--ut", "--update-translations"): self.update_translations,
("--pr", "--prepare-release"): self.prepare_release,
("--cr", "--create-release"): self.create_release,
("--dep", "--dependency", "--check-dependency"): self.check_dependency,
("-s", "--setting"): self.set_setting,
("-ss", "--save-setting"): self.save_setting
}
Expand Down Expand Up @@ -600,6 +607,7 @@ def main(argv):
"update-translations",
"pr=", "create-release=",
"cr=", "create-release=",
"dep", "dependency", "check-dependency",
"update-carbon-rating",
"is=", "it=", "setting=", "save-setting="])
except getopt.GetoptError:
Expand Down
51 changes: 13 additions & 38 deletions tools/dependency.py → helpers/dependency_helper.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
import sys
from datetime import datetime
import packaging.version
from setting_helper import get_config

from helpers.setting_helper import get_config

def test_cmd(command):
process_failsafe_timeout = 600
Expand Down Expand Up @@ -363,40 +364,14 @@ def check_browser(browser):

print(f'\t- {browser}:', 'OK')

def main(argv):
"""
Verifies required dependencies for webperf-core
"""
try:
opts, _ = getopt.getopt(argv, "hl:u:t:", [
"help", "last=", "update="])
except getopt.GetoptError:
print(main.__doc__)
sys.exit(2)


for opt, arg in opts:
if opt in ('-h', '--help'): # help
print(main.__doc__)
sys.exit(0)

if len(opts) == 0:
print(main.__doc__)
# TODO: Check webperf_core version
check_python()
check_requirements()
check_node()
check_package()
check_java()
check_chrome()
check_firefox()
# TODO: Check data files dependencies
# TODO: Check Internet access (for required sources like MDN Web Reference)


# No match for command so return error code to fail verification
sys.exit(0)


if __name__ == '__main__':
main(sys.argv[1:])
def dependency():
# TODO: Check webperf_core version
check_python()
check_requirements()
check_node()
check_package()
check_java()
check_chrome()
check_firefox()
# TODO: Check data files dependencies
# TODO: Check Internet access (for required sources like MDN Web Reference)

0 comments on commit cf6a598

Please sign in to comment.