From 34e0527dafbaba60e21e8163a313caa2eb18c32f Mon Sep 17 00:00:00 2001 From: Gnarwhal Date: Sun, 1 Sep 2024 19:02:36 +0000 Subject: [PATCH] https://duckduckgo.com/?t=ffab&q=how+to+run+a+setuptools+project Send help! --- examples | 2 +- src/sshare/__main__.py | 17 ----------------- src/sshare/main.py | 21 +++++++++++---------- 3 files changed, 12 insertions(+), 28 deletions(-) delete mode 100644 src/sshare/__main__.py diff --git a/examples b/examples index a1d5760..13160cb 160000 --- a/examples +++ b/examples @@ -1 +1 @@ -Subproject commit a1d5760b4936690ad9c1d925c16519b8e7edcc6b +Subproject commit 13160cb81a37b011082ad4e1e3a9f217540c2c24 diff --git a/src/sshare/__main__.py b/src/sshare/__main__.py deleted file mode 100644 index 2ae67cd..0000000 --- a/src/sshare/__main__.py +++ /dev/null @@ -1,17 +0,0 @@ -# This file is part of SSHare. -# -# SSHare is free software: you can redistribute it and/or modify it under the terms of -# the GNU General Public License as published by the Free Software Foundation, -# either version 3 of the License, or (at your option) any later version. -# -# SSHare is distributed in the hope that it will be useful, but WITHOUT ANY -# WARRANTY; without even the implied warranty of MERCHANTABILITY -# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -# more details. -# -# You should have received a copy of the GNU General Public License along with -# SSHare. If not, see . - -from main import main - -main() diff --git a/src/sshare/main.py b/src/sshare/main.py index e015c9d..3df6f07 100644 --- a/src/sshare/main.py +++ b/src/sshare/main.py @@ -24,11 +24,12 @@ import tomllib import subprocess import sys from pathlib import Path -from version import version -from plugins.config import Flag -from plugins.config import NoArgument -from plugins.config import NoDefault +from sshare.plugins.config import Flag +from sshare.plugins.config import NoArgument +from sshare.plugins.config import NoDefault + +from sshare.version import version class Congloggerate: def __init__(self, loggers): @@ -70,17 +71,17 @@ def main(): # so that it can be used to report errors while loading and # configuring plugins # i.e. before other logging plugins have had a chance to be initialised - logger = importlib.import_module("plugins.default.command_line") + logger = importlib.import_module("sshare.plugins.default.command_line") fatalicize(logger) # Load inbuilt plugins plugins_flat = [ Plugin("command_line", logger), - Plugin("file", importlib.import_module("plugins.default.file")), - Plugin("current_time", importlib.import_module("plugins.default.current_time")), - Plugin("append_type", importlib.import_module("plugins.default.append_type")), - Plugin("ssh", importlib.import_module("plugins.default.ssh")), - Plugin("log_result", importlib.import_module("plugins.default.log_result")), + Plugin("file", importlib.import_module("sshare.plugins.default.file")), + Plugin("current_time", importlib.import_module("sshare.plugins.default.current_time")), + Plugin("append_type", importlib.import_module("sshare.plugins.default.append_type")), + Plugin("ssh", importlib.import_module("sshare.plugins.default.ssh")), + Plugin("log_result", importlib.import_module("sshare.plugins.default.log_result")), ] plugins = {} for type in [ "logger", "source", "name", "upload", "result" ]: