diff --git a/data/test_data/test_sample_files.json.bz2 b/data/test_data/test_sample_files.json.bz2 new file mode 100644 index 0000000..32649e0 Binary files /dev/null and b/data/test_data/test_sample_files.json.bz2 differ diff --git a/data/test_data/test_sample_files_2.json.bz2 b/data/test_data/test_sample_files_2.json.bz2 new file mode 100644 index 0000000..7bb0eaa Binary files /dev/null and b/data/test_data/test_sample_files_2.json.bz2 differ diff --git a/dozent/__init__.py b/dozent/__init__.py index 60c41aa..1246cd2 100644 --- a/dozent/__init__.py +++ b/dozent/__init__.py @@ -1,4 +1,4 @@ -from dozent.main import Dozent +from dozent.dozent import Dozent from dozent.catch_thread_exceptions import install as _catch_thread_exceptions from dozent.preprocess import Preprocess diff --git a/dozent/main.py b/dozent/dozent.py similarity index 100% rename from dozent/main.py rename to dozent/dozent.py diff --git a/dozent/preprocess.py b/dozent/preprocess.py index fd6d3f9..d7307f1 100644 --- a/dozent/preprocess.py +++ b/dozent/preprocess.py @@ -3,7 +3,7 @@ import tarfile import zipfile -from smpamorpheus.data_loading import DataLoading +from murpheus.data_loading import DataLoading from pathlib import Path from typing import Union, List diff --git a/requirements.txt b/requirements.txt index 00e478d..2ab04e8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,4 +2,4 @@ pySmartDL aria2p pytest pyfiglet -smpamorpheus \ No newline at end of file +murpheus==0.6 \ No newline at end of file diff --git a/setup.py b/setup.py index 6228d79..1114b65 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ setup( name = 'dozent', packages = ['dozent'], - version = '0.4', + version = '0.5', license='MIT', description = 'Dozent is a powerful downloader that is used to download a ton of twitter data from the internet archive.', long_description='README.md', @@ -10,14 +10,14 @@ author = 'Ali Abbas, Eric Burt, Keelin Becker-Wheeler', author_email = 'eric.burt@protonmail.com', url = 'https://github.com/Social-Media-Public-Analysis/dozent', - download_url = 'https://github.com/Social-Media-Public-Analysis/dozent/archive/v_04.tar.gz', + download_url = 'https://github.com/Social-Media-Public-Analysis/dozent/archive/v_05.tar.gz', keywords = ['TWITTER', 'SCRAPER', 'DOWNLOAD'], install_requires=[ 'pySmartDL', 'aria2p', 'pytest', 'pyfiglet', - 'smpamorpheus', + 'murpheus', ], classifiers=[ 'Development Status :: 3 - Alpha', diff --git a/tests/test_dozent.py b/tests/test_dozent.py index 5adc672..1dbb9b1 100644 --- a/tests/test_dozent.py +++ b/tests/test_dozent.py @@ -1,6 +1,6 @@ import unittest -from dozent.main import Dozent -from dozent import main +from dozent.dozent import Dozent +from dozent import dozent from datetime import date @@ -9,8 +9,8 @@ def setUp(self): pass def test_days_of_support_defined(self): - self.assertTrue(type(main.FIRST_DAY_OF_SUPPORT) == date) - self.assertTrue(type(main.LAST_DAY_OF_SUPPORT) == date) + self.assertTrue(type(dozent.FIRST_DAY_OF_SUPPORT) == date) + self.assertTrue(type(dozent.LAST_DAY_OF_SUPPORT) == date) def test_dozent_get_date_links(self): """ @@ -18,8 +18,8 @@ def test_dozent_get_date_links(self): :return: """ dozent_obj = Dozent() - len_of_links = len(dozent_obj.get_links_for_days(start_date=main.FIRST_DAY_OF_SUPPORT, - end_date=main.LAST_DAY_OF_SUPPORT)) + len_of_links = len(dozent_obj.get_links_for_days(start_date=dozent.FIRST_DAY_OF_SUPPORT, + end_date=dozent.LAST_DAY_OF_SUPPORT)) self.assertTrue(len_of_links >= 12 * (2017 - 2020)) def test_make_date_from_date_link_day_when_is_defined(self):