From f8804931838e9fadbb74cd7e86c9683e77595de2 Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 3 Jun 2019 10:30:12 -0400 Subject: [PATCH 1/5] Fix error with missing data file --- deletefb/tools/common.py | 2 +- setup.py | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/deletefb/tools/common.py b/deletefb/tools/common.py index c107abf..a33f32b 100644 --- a/deletefb/tools/common.py +++ b/deletefb/tools/common.py @@ -40,7 +40,7 @@ def logger(name): Returns: logging.Logger """ - config_path = "deletefb/logging_conf.json" + config_path = "../logging_conf.json" if not isfile(config_path): # called from file (deletefb.py) os.chdir("..") with open(config_path, "r", encoding="utf-8") as config_file: diff --git a/setup.py b/setup.py index ce75ca6..1a4eedf 100644 --- a/setup.py +++ b/setup.py @@ -13,6 +13,11 @@ setuptools.setup( long_description_content_type="text/markdown", url="https://github.com/weskerfoot/DeleteFB", packages=setuptools.find_packages(), + include_package_data=True, + package_data={ + # If any package contains *.txt or *.rst files, include them: + '': ['*.json'], + }, install_requires = [ "selenium", "selenium-requests", From 73e98905c0d8263fe404c8976f3d25e6605b2729 Mon Sep 17 00:00:00 2001 From: Wesley Kerfoot Date: Mon, 3 Jun 2019 10:40:20 -0400 Subject: [PATCH 2/5] Construct path to logging conf using __file__ variable --- deletefb/tools/common.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/deletefb/tools/common.py b/deletefb/tools/common.py index a33f32b..8cc4385 100644 --- a/deletefb/tools/common.py +++ b/deletefb/tools/common.py @@ -40,7 +40,11 @@ def logger(name): Returns: logging.Logger """ - config_path = "../logging_conf.json" + + # Make sure the path always points to the correct directory + config_path = os.path.dirname( + os.path.realpath(__file__)) + "/../logging_conf.json" + if not isfile(config_path): # called from file (deletefb.py) os.chdir("..") with open(config_path, "r", encoding="utf-8") as config_file: From 9bc86fa644735d06dd346b3b6fa3b522e3fc6942 Mon Sep 17 00:00:00 2001 From: Wesley Kerfoot Date: Mon, 3 Jun 2019 10:40:48 -0400 Subject: [PATCH 3/5] Bump version --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 1a4eedf..19c796c 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ with open("README.md", "r") as fh: setuptools.setup( name="delete-facebook-posts", - version="1.1.2", + version="1.1.3", author="Wesley Kerfoot", author_email="wes@wesk.tech", description="A Selenium Script to Delete Facebook Posts", From 2ac334c70f59c236b37ea1dd32b6c780e3c61e82 Mon Sep 17 00:00:00 2001 From: Wesley Kerfoot Date: Mon, 3 Jun 2019 10:48:27 -0400 Subject: [PATCH 4/5] Change logging confg path --- deletefb/logging_conf.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deletefb/logging_conf.json b/deletefb/logging_conf.json index 2078e80..e8037ec 100644 --- a/deletefb/logging_conf.json +++ b/deletefb/logging_conf.json @@ -27,7 +27,7 @@ "level": "INFO", "class": "logging.handlers.WatchedFileHandler", "formatter": "verbose", - "filename": "deletefb/deletefb.log", + "filename": "./deletefb.log", "mode": "a", "encoding": "utf-8" } From 238e6ef69aba5d8dfba5e2bfbf336c43e0571ca6 Mon Sep 17 00:00:00 2001 From: Wesley Kerfoot Date: Mon, 3 Jun 2019 10:48:54 -0400 Subject: [PATCH 5/5] Bump minor version --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 19c796c..87e82db 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ with open("README.md", "r") as fh: setuptools.setup( name="delete-facebook-posts", - version="1.1.3", + version="1.1.4", author="Wesley Kerfoot", author_email="wes@wesk.tech", description="A Selenium Script to Delete Facebook Posts",