Merge pull request #6 from KevinMidboe/fix/setuptools-build

Fix: Setuptools build

Makefile

@@ -0,0 +1,17 @@
+.PHONY: clean
+binaries=dist build
+
+install:
+	python3 setup.py install
+
+build:
+	python3 setup.py build
+
+dist:
+	python3 setup.py sdist
+
+upload: clean dist
+	twine upload dist/*
+
+clean:
+	rm -rf $(binaries)

delugeClient/__init__.py

@@ -1,22 +1,25 @@
-import os
+#!/usr/bin/env python3.6
+# -*- encoding: utf-8 -*-
+
 from sys import path
+from os.path import dirname, join
 
-path.append(os.path.dirname(__file__))
+path.append(dirname(__file__))
-
-__version__=0.1
 
 import logging
-from delugeUtils import BASE_DIR
+from utils import BASE_DIR, ColorizeFilter
 
 logger = logging.getLogger('deluge_cli')
 logger.setLevel(logging.DEBUG)
 
-fh = logging.FileHandler(os.path.join(BASE_DIR, 'deluge_cli.log'))
+fh = logging.FileHandler(join(BASE_DIR, 'deluge_cli.log'))
 fh.setLevel(logging.DEBUG)
 ch = logging.StreamHandler()
 ch.setLevel(logging.ERROR)
 
 formatter = logging.Formatter('%(asctime)s %(levelname)8s %(name)s | %(message)s')
 fh.setFormatter(formatter)
+
 logger.addHandler(fh)
 logger.addHandler(ch)
+logger.addFilter(ColorizeFilter())

delugeClient/__main__.py

@@ -37,7 +37,7 @@ from pprint import pprint
 
 from deluge import Deluge
 from utils import ColorizeFilter, BASE_DIR
-from __init__ import __version__
+from __version__ import __version__
 
 logger = logging.getLogger('deluge_cli')
 logger.setLevel(logging.DEBUG)

delugeClient/__version__.py

@@ -0,0 +1 @@
+__version__ = '0.2.1'

delugeClient/deluge.py

@@ -9,7 +9,7 @@ import logging.config
 
 from deluge_client import DelugeRPCClient
 from sshtunnel import SSHTunnelForwarder
-from delugeUtils import getConfig, BASE_DIR
+from utils import getConfig, BASE_DIR
 
 from torrent import Torrent
 

delugeClient/utils.py

@@ -50,7 +50,7 @@ def getConfig():
   for key, value in requiredParameters:
     if value == '':
       logger.error('Missing value for variable: "{}" in config: \
-"$HOME/.config/delugeClient/config.ini".'.format(key))
+"{}.'.format(key, user_config_dir))
       exit(1)
 
   return config

setup.py

@@ -1,25 +1,34 @@
+#!/usr/bin/env python3
+# -*- encoding: utf-8 -*-
 from setuptools import setup, find_packages
-
+from sys import path
-import delugeClient
+from os.path import dirname
 
 with open("README.md", "r", encoding="utf-8") as fh:
   long_description = fh.read()
 
+exec(open('delugeClient/__version__.py').read())
+
 setup(
   name="delugeClient-kevin",
-  version=delugeClient.__version__,
+  version=__version__,
+  packages=find_packages(),
+  package_data={
+    'delugeClient': ['default_config.ini'],
+  },
+  python_requires=">=3.6",
   author="KevinMidboe",
   description="Deluge client with custom functions written in python",
   long_description=long_description,
   long_description_content_type="text/markdown",
   url="https://github.com/kevinmidboe/delugeClient",
   install_requires=[
-    'colored==1.4.2',
+    'colored',
-    'deluge-client==1.9.0',
+    'deluge-client',
-    'docopt==0.6.2',
+    'docopt',
-    'requests==2.25.1',
+    'requests',
-    'sshtunnel==0.4.0',
+    'sshtunnel',
-    'websockets==9.1'
+    'websockets'
   ],
   classifiers=[
     'Programming Language :: Python',
@@ -30,10 +39,5 @@ setup(
     'console_scripts': [
       'delugeclient = delugeClient.__main__:main',
    ],
-  },
+  }
-  packages=find_packages(),
-  package_data={
-    'delugeClient': ['default_config.ini'],
-  },
-  python_requires=">=3.6",
 )