From 87f125062983a3f07102f7752eba489bf63ae202 Mon Sep 17 00:00:00 2001 From: krateng Date: Sat, 9 Apr 2022 21:02:17 +0200 Subject: [PATCH] Moved setup to top level --- maloja/__main__.py | 2 +- maloja/{proccontrol => }/setup.py | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) rename maloja/{proccontrol => }/setup.py (96%) diff --git a/maloja/__main__.py b/maloja/__main__.py index e26fdea..72a9d1a 100644 --- a/maloja/__main__.py +++ b/maloja/__main__.py @@ -11,7 +11,7 @@ from doreah.io import col from . import __pkginfo__ as pkginfo from . import globalconf from .proccontrol import tasks -from .proccontrol.setup import setup +from .setup import setup diff --git a/maloja/proccontrol/setup.py b/maloja/setup.py similarity index 96% rename from maloja/proccontrol/setup.py rename to maloja/setup.py index 8872357..beb6cd0 100644 --- a/maloja/proccontrol/setup.py +++ b/maloja/setup.py @@ -1,10 +1,12 @@ -from importlib import resources -from distutils import dir_util -from doreah.io import col, ask, prompt -from doreah import auth import os -from ..globalconf import data_dir, dir_settings, malojaconfig +from importlib import resources +from distutils import dir_util + +from doreah.io import col, ask, prompt +from doreah import auth + +from .globalconf import data_dir, dir_settings, malojaconfig @@ -48,7 +50,7 @@ def setup(): # OWN API KEY - from ..apis import apikeystore + from .apis import apikeystore if len(apikeystore) == 0: answer = ask("Do you want to set up a key to enable scrobbling? Your scrobble extension needs that key so that only you can scrobble tracks to your database.",default=True,skip=SKIP) if answer: