Merge pull request #6 from Social-Media-Public-Analysis/murpheus

Implement Murpheus into Dozent
Social-Media-Public-Analysis · Dec 4, 2020 · 23b5a17 · 23b5a17
2 parents 430e30a + 867d073
commit 23b5a17
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 12 deletions.
diff --git a/data/test_data/test_sample_files.json.bz2 b/data/test_data/test_sample_files.json.bz2
diff --git a/data/test_data/test_sample_files_2.json.bz2 b/data/test_data/test_sample_files_2.json.bz2
diff --git 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 → dozent/dozent.py b/dozent/main.py → dozent/dozent.py
diff --git 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
@@ -2,4 +2,4 @@ pySmartDL
 aria2p
 pytest
 pyfiglet
-smpamorpheus
+murpheus==0.6
diff --git a/setup.py b/setup.py
@@ -2,22 +2,22 @@
 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',
   long_description_content_type="text/markdown",
   author = 'Ali Abbas, Eric Burt, Keelin Becker-Wheeler',
   author_email = '[email protected]',
   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
@@ -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,17 +9,17 @@ 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):
         """
         This test is fairly weak, just checking if the dates
         :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):