renamed main package to tradingmate (#154)

ilcardella · Jul 29, 2020 · 6b5a49d · 6b5a49d
1 parent 18b69ba
commit 6b5a49d
Show file tree

Hide file tree

Showing 44 changed files with 32 additions and 66 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -5,7 +5,7 @@ description = "Trading portfolio and real time stock price monitor"
 authors = ["Alberto Cardellini"]
 license = "MIT"
 packages = [
-    { include = "src" }
+    { include = "tradingmate" }
 ]
 include = ["config/config.json", "data/trading_log.json"]
 

diff --git a/setup.py b/setup.py
@@ -5,9 +5,9 @@
     name="TradingMate",
     version="2.2.0",
     python_requires=">=3",
-    package_dir={"": "src"},
-    packages=find_namespace_packages(where="src"),
-    scripts=["src/TradingMate.py"],
+    package_dir={"": "tradingmate"},
+    packages=find_namespace_packages(where="tradingmate"),
+    scripts=["tradingmate/TradingMate.py"],
     entry_points={"console_scripts": ["trading_mate = TradingMate:main"]},
     install_requires=[
         "alpha-vantage==2.2.0",
@@ -18,19 +18,19 @@
     package_data={
         "config": ["*.json"],
         "data": ["*.json"],
-        "src/UI/assets/gtk": ["*.glade"],
+        "tradingmate/UI/assets/gtk": ["*.glade"],
     },
     data_files=[
         (os.path.join(os.sep, "opt", "TradingMate", "config"), ["config/config.json"]),
         (os.path.join(os.sep, "opt", "TradingMate", "data"), ["data/trading_log.json"]),
         (
             os.path.join(os.sep, "opt", "TradingMate", "data", "assets", "gtk"),
             [
-                "src/UI/assets/gtk/add_trade_window_layout.glade",
-                "src/UI/assets/gtk/main_window_layout.glade",
-                "src/UI/assets/gtk/notebook_page_layout.glade",
-                "src/UI/assets/gtk/settings_window_layout.glade",
-                "src/UI/assets/gtk/log_window_layout.glade",
+                "tradingmate/UI/assets/gtk/add_trade_window_layout.glade",
+                "tradingmate/UI/assets/gtk/main_window_layout.glade",
+                "tradingmate/UI/assets/gtk/notebook_page_layout.glade",
+                "tradingmate/UI/assets/gtk/settings_window_layout.glade",
+                "tradingmate/UI/assets/gtk/log_window_layout.glade",
             ],
         ),
     ],

diff --git a/src/UI/__init__.py b/src/UI/__init__.py
diff --git a/src/UI/gtk/__init__.py b/src/UI/gtk/__init__.py
diff --git a/src/Utils/__init__.py b/src/Utils/__init__.py
diff --git a/test/test_configuration_manager.py b/test/test_configuration_manager.py
@@ -5,7 +5,7 @@
 
 currentdir = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))
 parentdir = os.path.dirname(currentdir)
-sys.path.insert(0, "{}/src".format(parentdir))
+sys.path.insert(0, "{}/tradingmate".format(parentdir))
 
 from Utils.ConfigurationManager import ConfigurationManager
 

diff --git a/test/test_db_handler.py b/test/test_db_handler.py
@@ -5,7 +5,7 @@
 
 currentdir = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))
 parentdir = os.path.dirname(currentdir)
-sys.path.insert(0, "{}/src".format(parentdir))
+sys.path.insert(0, "{}/tradingmate".format(parentdir))
 
 from Model.DatabaseHandler import DatabaseHandler
 from Utils.Trade import Trade

diff --git a/test/test_holding.py b/test/test_holding.py
@@ -5,7 +5,7 @@
 
 currentdir = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))
 parentdir = os.path.dirname(currentdir)
-sys.path.insert(0, "{}/src".format(parentdir))
+sys.path.insert(0, "{}/tradingmate".format(parentdir))
 
 from Model.Holding import Holding
 

diff --git a/test/test_portfolio.py b/test/test_portfolio.py
@@ -8,7 +8,7 @@
 
 currentdir = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))
 parentdir = os.path.dirname(currentdir)
-sys.path.insert(0, "{}/src".format(parentdir))
+sys.path.insert(0, "{}/tradingmate".format(parentdir))
 
 from Model.Portfolio import Portfolio
 from Utils.ConfigurationManager import ConfigurationManager

diff --git a/test/test_trading_mate.py b/test/test_trading_mate.py
@@ -8,7 +8,7 @@
 
 currentdir = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))
 parentdir = os.path.dirname(currentdir)
-sys.path.insert(0, "{}/src".format(parentdir))
+sys.path.insert(0, "{}/tradingmate".format(parentdir))
 
 from TradingMate import TradingMate
 from Model.Portfolio import Portfolio

diff --git a/src/Model/DatabaseHandler.py → tradingmate/Model/DatabaseHandler.py b/src/Model/DatabaseHandler.py → tradingmate/Model/DatabaseHandler.py
@@ -3,10 +3,6 @@
 import inspect
 import logging
 
-currentdir = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))
-parentdir = os.path.dirname(currentdir)
-sys.path.insert(0, parentdir)
-
 from Utils.Utils import Utils
 from Utils.Trade import Trade
 

diff --git a/src/Model/Holding.py → tradingmate/Model/Holding.py b/src/Model/Holding.py → tradingmate/Model/Holding.py
@@ -3,10 +3,6 @@
 import sys
 import logging
 
-currentdir = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))
-parentdir = os.path.dirname(currentdir)
-sys.path.insert(0, parentdir)
-
 
 class Holding:
     def __init__(self, symbol, quantity, open_price=None):

diff --git a/src/Model/Portfolio.py → tradingmate/Model/Portfolio.py b/src/Model/Portfolio.py → tradingmate/Model/Portfolio.py
@@ -5,9 +5,6 @@
 import hashlib
 import time
 
-currentdir = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))
-parentdir = os.path.dirname(currentdir)
-sys.path.insert(0, parentdir)
 
 from .Holding import Holding
 from Utils.Utils import Actions, Messages

diff --git a/src/Model/StockPriceGetter.py → tradingmate/Model/StockPriceGetter.py b/src/Model/StockPriceGetter.py → tradingmate/Model/StockPriceGetter.py
@@ -3,9 +3,6 @@
 import inspect
 import logging
 
-currentdir = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))
-parentdir = os.path.dirname(currentdir)
-sys.path.insert(0, parentdir)
 
 from Utils.TaskThread import TaskThread
 from Utils.ConfigurationManager import ConfigurationManager

diff --git a/tradingmate/Model/__init__.py b/tradingmate/Model/__init__.py
@@ -0,0 +1,7 @@
+from . import DatabaseHandler, Holding, Portfolio, StockPriceGetter
+from .broker import (
+    AlphaVantageInterface,
+    StocksInterface,
+    StocksInterfaceFactory,
+    YFinanceInterface,
+)
diff --git a/src/Model/broker/AlphaVantageInterface.py → ...ate/Model/broker/AlphaVantageInterface.py b/src/Model/broker/AlphaVantageInterface.py → ...ate/Model/broker/AlphaVantageInterface.py
@@ -8,10 +8,6 @@
 import time
 from alpha_vantage.timeseries import TimeSeries
 
-currentdir = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))
-parentdir = os.path.dirname(currentdir)
-sys.path.insert(0, parentdir)
-
 from Utils.Utils import Markets
 from .StocksInterface import StocksInterface
 

diff --git a/src/Model/broker/StocksInterface.py → tradingmate/Model/broker/StocksInterface.py b/src/Model/broker/StocksInterface.py → tradingmate/Model/broker/StocksInterface.py
@@ -4,9 +4,6 @@
 import functools
 import threading
 
-currentdir = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))
-parentdir = os.path.dirname(currentdir)
-sys.path.insert(0, parentdir)
 
 # Mutex used for thread synchronisation
 lock = threading.Lock()

diff --git a/src/Model/broker/StocksInterfaceFactory.py → ...te/Model/broker/StocksInterfaceFactory.py b/src/Model/broker/StocksInterfaceFactory.py → ...te/Model/broker/StocksInterfaceFactory.py
@@ -2,11 +2,6 @@
 import sys
 import inspect
 
-currentdir = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))
-parentdir = os.path.dirname(currentdir)
-sys.path.insert(0, parentdir)
-
-
 from .YFinanceInterface import YFinanceInterface
 from .AlphaVantageInterface import AlphaVantageInterface
 

diff --git a/src/Model/broker/YFinanceInterface.py → ...ingmate/Model/broker/YFinanceInterface.py b/src/Model/broker/YFinanceInterface.py → ...ingmate/Model/broker/YFinanceInterface.py
@@ -7,10 +7,6 @@
 import time
 import yfinance as yf
 
-currentdir = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))
-parentdir = os.path.dirname(currentdir)
-sys.path.insert(0, parentdir)
-
 from Utils.Utils import Markets
 from .StocksInterface import StocksInterface
 

diff --git a/tradingmate/Model/broker/__init__.py b/tradingmate/Model/broker/__init__.py
@@ -0,0 +1,6 @@
+from . import (
+    AlphaVantageInterface,
+    StocksInterface,
+    StocksInterfaceFactory,
+    YFinanceInterface,
+)
diff --git a/src/TradingMate.py → tradingmate/TradingMate.py b/src/TradingMate.py → tradingmate/TradingMate.py
@@ -6,10 +6,6 @@
 import subprocess
 import re
 
-currentdir = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))
-parentdir = os.path.dirname(currentdir)
-sys.path.insert(0, parentdir)
-
 from Model.DatabaseHandler import DatabaseHandler
 from Model.Portfolio import Portfolio
 from Utils.ConfigurationManager import ConfigurationManager

diff --git a/src/UI/DataInterface.py → tradingmate/UI/DataInterface.py b/src/UI/DataInterface.py → tradingmate/UI/DataInterface.py
diff --git a/src/UI/TradingMateClient.py → tradingmate/UI/TradingMateClient.py b/src/UI/TradingMateClient.py → tradingmate/UI/TradingMateClient.py
diff --git a/src/Model/__init__.py → tradingmate/UI/__init__.py b/src/Model/__init__.py → tradingmate/UI/__init__.py
diff --git a/.../assets/gtk/add_trade_window_layout.glade → .../assets/gtk/add_trade_window_layout.glade b/.../assets/gtk/add_trade_window_layout.glade → .../assets/gtk/add_trade_window_layout.glade
diff --git a/...s/gtk/explore_markets_window_layout.glade → ...s/gtk/explore_markets_window_layout.glade b/...s/gtk/explore_markets_window_layout.glade → ...s/gtk/explore_markets_window_layout.glade
diff --git a/src/UI/assets/gtk/log_window_layout.glade → ...ate/UI/assets/gtk/log_window_layout.glade b/src/UI/assets/gtk/log_window_layout.glade → ...ate/UI/assets/gtk/log_window_layout.glade
diff --git a/src/UI/assets/gtk/main_window_layout.glade → ...te/UI/assets/gtk/main_window_layout.glade b/src/UI/assets/gtk/main_window_layout.glade → ...te/UI/assets/gtk/main_window_layout.glade
diff --git a/src/UI/assets/gtk/notebook_page_layout.glade → .../UI/assets/gtk/notebook_page_layout.glade b/src/UI/assets/gtk/notebook_page_layout.glade → .../UI/assets/gtk/notebook_page_layout.glade
diff --git a/...I/assets/gtk/settings_window_layout.glade → ...I/assets/gtk/settings_window_layout.glade b/...I/assets/gtk/settings_window_layout.glade → ...I/assets/gtk/settings_window_layout.glade
diff --git a/src/UI/gtk/AddTradeWindow.py → tradingmate/UI/gtk/AddTradeWindow.py b/src/UI/gtk/AddTradeWindow.py → tradingmate/UI/gtk/AddTradeWindow.py
diff --git a/src/UI/gtk/ConfirmDialog.py → tradingmate/UI/gtk/ConfirmDialog.py b/src/UI/gtk/ConfirmDialog.py → tradingmate/UI/gtk/ConfirmDialog.py
diff --git a/src/UI/gtk/ExploreMarketsWindow.py → tradingmate/UI/gtk/ExploreMarketsWindow.py b/src/UI/gtk/ExploreMarketsWindow.py → tradingmate/UI/gtk/ExploreMarketsWindow.py
diff --git a/src/UI/gtk/LogWindow.py → tradingmate/UI/gtk/LogWindow.py b/src/UI/gtk/LogWindow.py → tradingmate/UI/gtk/LogWindow.py
diff --git a/src/UI/gtk/MessageDialog.py → tradingmate/UI/gtk/MessageDialog.py b/src/UI/gtk/MessageDialog.py → tradingmate/UI/gtk/MessageDialog.py
diff --git a/src/UI/gtk/PortfolioPage.py → tradingmate/UI/gtk/PortfolioPage.py b/src/UI/gtk/PortfolioPage.py → tradingmate/UI/gtk/PortfolioPage.py
diff --git a/src/UI/gtk/SettingsWindow.py → tradingmate/UI/gtk/SettingsWindow.py b/src/UI/gtk/SettingsWindow.py → tradingmate/UI/gtk/SettingsWindow.py
diff --git a/src/UI/gtk/UIHandler.py → tradingmate/UI/gtk/UIHandler.py b/src/UI/gtk/UIHandler.py → tradingmate/UI/gtk/UIHandler.py
diff --git a/src/Model/broker/__init__.py → tradingmate/UI/gtk/__init__.py b/src/Model/broker/__init__.py → tradingmate/UI/gtk/__init__.py
diff --git a/src/Utils/ConfigurationManager.py → tradingmate/Utils/ConfigurationManager.py b/src/Utils/ConfigurationManager.py → tradingmate/Utils/ConfigurationManager.py
@@ -4,10 +4,6 @@
 import json
 import logging
 
-currentdir = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))
-parentdir = os.path.dirname(currentdir)
-sys.path.insert(0, parentdir)
-
 from Utils.Utils import Utils
 
 

diff --git a/src/Utils/TaskThread.py → tradingmate/Utils/TaskThread.py b/src/Utils/TaskThread.py → tradingmate/Utils/TaskThread.py
@@ -6,10 +6,6 @@
 import inspect
 import time
 
-currentdir = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))
-parentdir = os.path.dirname(currentdir)
-sys.path.insert(0, parentdir)
-
 
 class TaskThread(threading.Thread):
     """Thread that executes a task every N seconds"""

diff --git a/src/Utils/Trade.py → tradingmate/Utils/Trade.py b/src/Utils/Trade.py → tradingmate/Utils/Trade.py
@@ -7,10 +7,6 @@
 import datetime
 import hashlib
 
-currentdir = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))
-parentdir = os.path.dirname(currentdir)
-sys.path.insert(0, parentdir)
-
 from Utils.Utils import Actions
 
 TIME_FORMAT = "%H:%M"

diff --git a/src/Utils/Utils.py → tradingmate/Utils/Utils.py b/src/Utils/Utils.py → tradingmate/Utils/Utils.py
@@ -5,10 +5,6 @@
 import json
 import logging
 
-currentdir = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))
-parentdir = os.path.dirname(currentdir)
-sys.path.insert(0, parentdir)
-
 
 class Actions(Enum):
     BUY = 1
@@ -32,7 +28,9 @@ class Messages(Enum):
     ERROR_SAVE_SETTINGS = "Unable to save the settings"
     WINDOW_UNSUPPORTED_ACTION = "This window does not support the selected action"
     ARE_YOU_SURE = "Are you sure?"
-    UNSUPPORTED_BROKER_FEATURE = "Configured stock interface does not support this feature"
+    UNSUPPORTED_BROKER_FEATURE = (
+        "Configured stock interface does not support this feature"
+    )
     SOMETHING_WRONG = "Something went wrong"
 
 

diff --git a/tradingmate/Utils/__init__.py b/tradingmate/Utils/__init__.py
@@ -0,0 +1 @@
+from . import ConfigurationManager, TaskThread, Trade, Utils