diff --git a/util.py b/util.py index 446bd3ee..23a628ce 100755 --- a/util.py +++ b/util.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -from util import gen_wiki, prepare_after, prepare_before, make_release, \ +from util.utility import gen_wiki, prepare_after, prepare_before, make_release, \ install, wiki from util.command import RootCommand, Command, not_enough_args, not_found diff --git a/util/__init__.py b/util/__init__.py index 243fde78..9f540a58 100644 --- a/util/__init__.py +++ b/util/__init__.py @@ -1,6 +1,2 @@ -from .wiki import gen as gen_wiki -from .pages import prepare_after, prepare_before -from .release import main as make_release -from .install import install from .liner import liner, hard_liner from .versions import sort_vers diff --git a/util/utility/__init__.py b/util/utility/__init__.py new file mode 100644 index 00000000..706700bb --- /dev/null +++ b/util/utility/__init__.py @@ -0,0 +1,4 @@ +from .wiki import gen as gen_wiki +from .pages import prepare_after, prepare_before +from .release import main as make_release +from .install import install diff --git a/util/install.py b/util/utility/install.py similarity index 81% rename from util/install.py rename to util/utility/install.py index 3755f049..a62c61f4 100644 --- a/util/install.py +++ b/util/utility/install.py @@ -12,4 +12,4 @@ def install(ex: str, options: list[str], sys.exit(2) else: dest = options[0] - print(os.popen(f'sh -c "./util/install.sh {dest}"').read()) + print(os.popen(f'sh -c "./util/utility/install.sh {dest}"').read()) diff --git a/util/install.sh b/util/utility/install.sh similarity index 100% rename from util/install.sh rename to util/utility/install.sh diff --git a/util/pages.py b/util/utility/pages.py similarity index 99% rename from util/pages.py rename to util/utility/pages.py index f08b6d0c..4c215d15 100644 --- a/util/pages.py +++ b/util/utility/pages.py @@ -16,7 +16,7 @@ import json from urllib import request -from util.wiki import Wiki +from .wiki import Wiki """ The files dictionary specifies how and which files should be processed. diff --git a/util/release/__init__.py b/util/utility/release/__init__.py similarity index 95% rename from util/release/__init__.py rename to util/utility/release/__init__.py index 9a560ca2..7e7071a4 100644 --- a/util/release/__init__.py +++ b/util/utility/release/__init__.py @@ -4,7 +4,7 @@ from .changelog import write_changelog from .appimage import write_appimage from .release_py import write_release_py -from ..command import not_enough_args +from util.command import not_enough_args TAG_REGEX = r"^v([0-9]+)\.([0-9]+)\.([0-9]+)(-[0-9A-Za-z-]+)?$" diff --git a/util/release/appimage.py b/util/utility/release/appimage.py similarity index 100% rename from util/release/appimage.py rename to util/utility/release/appimage.py diff --git a/util/release/changelog.py b/util/utility/release/changelog.py similarity index 100% rename from util/release/changelog.py rename to util/utility/release/changelog.py diff --git a/util/release/release_py.py b/util/utility/release/release_py.py similarity index 100% rename from util/release/release_py.py rename to util/utility/release/release_py.py diff --git a/util/wiki.py b/util/utility/wiki.py old mode 100755 new mode 100644 similarity index 99% rename from util/wiki.py rename to util/utility/wiki.py index 5c867e2b..16043a70 --- a/util/wiki.py +++ b/util/utility/wiki.py @@ -2,7 +2,6 @@ """This script generates the Pokete wiki""" import os from os.path import exists, isdir -import sys import scrap_engine as se import release from pokete_classes.effects import effects, effect_list