From b7eb06e266967faaba1e7eb3cea0298864e161f5 Mon Sep 17 00:00:00 2001 From: Kevin Midboe Date: Mon, 26 Sep 2022 00:15:16 +0200 Subject: [PATCH 1/5] Moved __version__ to separate file --- delugeClient/__init__.py | 2 +- delugeClient/__main__.py | 2 +- delugeClient/__version__.py | 1 + setup.py | 9 ++++++++- 4 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 delugeClient/__version__.py diff --git a/delugeClient/__init__.py b/delugeClient/__init__.py index 796f680..995e9d3 100644 --- a/delugeClient/__init__.py +++ b/delugeClient/__init__.py @@ -3,7 +3,7 @@ from sys import path path.append(os.path.dirname(__file__)) -__version__=0.1 +path.append(dirname(__file__)) import logging from delugeUtils import BASE_DIR diff --git a/delugeClient/__main__.py b/delugeClient/__main__.py index e595240..5da7518 100644 --- a/delugeClient/__main__.py +++ b/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) diff --git a/delugeClient/__version__.py b/delugeClient/__version__.py new file mode 100644 index 0000000..b650ceb --- /dev/null +++ b/delugeClient/__version__.py @@ -0,0 +1 @@ +__version__ = '0.2' diff --git a/setup.py b/setup.py index 9b683ee..90fd34c 100644 --- a/setup.py +++ b/setup.py @@ -5,9 +5,16 @@ import delugeClient 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, From 1b2620b6f24d5ac78a6fbba1d345da08afe9134e Mon Sep 17 00:00:00 2001 From: Kevin Midboe Date: Mon, 26 Sep 2022 00:17:06 +0200 Subject: [PATCH 2/5] Renamed file delugeUtils -> utils --- delugeClient/__init__.py | 2 +- delugeClient/deluge.py | 2 +- delugeClient/{delugeUtils.py => utils.py} | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename delugeClient/{delugeUtils.py => utils.py} (97%) diff --git a/delugeClient/__init__.py b/delugeClient/__init__.py index 995e9d3..3232ec7 100644 --- a/delugeClient/__init__.py +++ b/delugeClient/__init__.py @@ -6,7 +6,7 @@ path.append(os.path.dirname(__file__)) path.append(dirname(__file__)) import logging -from delugeUtils import BASE_DIR +from utils import BASE_DIR, ColorizeFilter logger = logging.getLogger('deluge_cli') logger.setLevel(logging.DEBUG) diff --git a/delugeClient/deluge.py b/delugeClient/deluge.py index 1fcef47..8a94fff 100644 --- a/delugeClient/deluge.py +++ b/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 diff --git a/delugeClient/delugeUtils.py b/delugeClient/utils.py similarity index 97% rename from delugeClient/delugeUtils.py rename to delugeClient/utils.py index 91fb2ec..8b2cad1 100644 --- a/delugeClient/delugeUtils.py +++ b/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 From e03247bcc62caae9fdebbd04aa5c5464f8195b2c Mon Sep 17 00:00:00 2001 From: Kevin Midboe Date: Mon, 26 Sep 2022 00:17:32 +0200 Subject: [PATCH 3/5] Re-ordered setup & logging actions/lines --- delugeClient/__init__.py | 13 ++++++++----- setup.py | 25 +++++++++++-------------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/delugeClient/__init__.py b/delugeClient/__init__.py index 3232ec7..74889f4 100644 --- a/delugeClient/__init__.py +++ b/delugeClient/__init__.py @@ -1,7 +1,8 @@ -import os -from sys import path +#!/usr/bin/env python3.6 +# -*- encoding: utf-8 -*- -path.append(os.path.dirname(__file__)) +from sys import path +from os.path import dirname, join path.append(dirname(__file__)) @@ -11,12 +12,14 @@ 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) \ No newline at end of file +logger.addHandler(ch) +logger.addFilter(ColorizeFilter()) \ No newline at end of file diff --git a/setup.py b/setup.py index 90fd34c..6744077 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,8 @@ +#!/usr/bin/env python3 +# -*- encoding: utf-8 -*- from setuptools import setup, find_packages - -import delugeClient +from sys import path +from os.path import dirname with open("README.md", "r", encoding="utf-8") as fh: long_description = fh.read() @@ -21,12 +23,12 @@ setup( long_description_content_type="text/markdown", url="https://github.com/kevinmidboe/delugeClient", install_requires=[ - 'colored==1.4.2', - 'deluge-client==1.9.0', - 'docopt==0.6.2', - 'requests==2.25.1', - 'sshtunnel==0.4.0', - 'websockets==9.1' + 'colored', + 'deluge-client', + 'docopt', + 'requests', + 'sshtunnel', + 'websockets' ], classifiers=[ 'Programming Language :: Python', @@ -37,10 +39,5 @@ setup( 'console_scripts': [ 'delugeclient = delugeClient.__main__:main', ], - }, - packages=find_packages(), - package_data={ - 'delugeClient': ['default_config.ini'], - }, - python_requires=">=3.6", + } ) From 32cb0e51a718a1da2cde26b00b345e9c0b4361dc Mon Sep 17 00:00:00 2001 From: Kevin Midboe Date: Mon, 26 Sep 2022 00:18:19 +0200 Subject: [PATCH 4/5] Created make file w/ build, dist, install & upload --- Makefile | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 Makefile diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..ce4c1c2 --- /dev/null +++ b/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) From c48b4aa68b8f3cae31118022294ab20fd898891d Mon Sep 17 00:00:00 2001 From: Kevin Midboe Date: Mon, 26 Sep 2022 00:19:25 +0200 Subject: [PATCH 5/5] Bumped to version 0.2.1 --- delugeClient/__version__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/delugeClient/__version__.py b/delugeClient/__version__.py index b650ceb..fc79d63 100644 --- a/delugeClient/__version__.py +++ b/delugeClient/__version__.py @@ -1 +1 @@ -__version__ = '0.2' +__version__ = '0.2.1'