Merge branch 'develop'

/ Eliminate version from requirements.txt

MANIFEST.in

@@ -1 +1,4 @@
 include requirements.txt
+include requirements_test.txt
+exclude *.egg-info
+

pytchat/__init__.py

@@ -2,11 +2,11 @@
 pytchat is a python library for fetching youtube live chat.
 """
 __copyright__    = 'Copyright (C) 2019 taizan-hokuto'
-__version__      = '0.0.1.7'
+__version__      = '0.0.1.9'
 __license__      = 'MIT'
 __author__       = 'taizan-hokuto'
 __author_email__ = '55448286+taizan-hokuto@users.noreply.github.com'
-__url__          = 'https://github.com/taizan-hokuto'
+__url__          = 'https://github.com/taizan-hokuto/pytchat'
 
 __all__ = ["core_async","core_multithread","processors"]
 

requirements.txt

@@ -1,9 +1,4 @@
-aiohttp==3.6.0
+aiohttp
-aioresponses==0.6.0
+pytz
-mock==3.0.5
+requests
-mocker==1.1.1
+urllib3
-pytest==5.1.2
-pytest-mock==1.10.4
-pytz==2019.2
-requests==2.22.0
-urllib3==1.25.3

requirements_test.txt

@@ -0,0 +1,5 @@
+aioresponses
+mock
+mocker
+pytest
+pytest-mock

setup.py

@@ -1,14 +1,18 @@
-from setuptools import setup, find_packages
+from setuptools import setup, find_packages, Command
 from codecs import open
-from os import path
+from os import path, system
 import re
 
 package_name = "pytchat"
 
 root_dir = path.abspath(path.dirname(__file__))
 
-def _requires_from_file(filename):
+def _requirements():
-    return open(filename).read().splitlines()
+    return [name.rstrip() for name in open(path.join(root_dir, 'requirements.txt')).readlines()]
+
+def _test_requirements():
+    return [name.rstrip() for name in open(path.join(root_dir, 'requirements_test.txt')).readlines()]
+
 
 with open(path.join(root_dir, package_name, '__init__.py')) as f:
     init_text = f.read()
@@ -27,18 +31,30 @@ assert url
 with open('README.md', encoding='utf-8') as f:
     long_description = f.read()
 
+class CleanCommand(Command):
+    """Custom clean command to tidy up the project root."""
+    user_options = []
+    def initialize_options(self):
+        pass
+    def finalize_options(self):
+        pass
+    def run(self):
+        #system('rm -vrf ./build ./dist ./*.pyc ./*.tgz ./*.egg-info')
+        system('rmdir /Q /S pytchat.egg-info, dist')
+
+
 setup(
     name=package_name,
     packages=find_packages(),
-
     version=version,
-
     url=url,
     author=author,
     author_email=author_email,
     long_description=long_description,
     long_description_content_type='text/markdown',
     license=license,
+    install_requires=_requirements(),
+    tests_require=_test_requirements(),
     description="a python library for fetching youtube live chat.",
     classifiers=[
         'Natural Language :: Japanese',
@@ -52,5 +68,7 @@ setup(
         'License :: OSI Approved :: MIT License',
     ],
     keywords='youtube livechat asyncio',
-    install_requires=_requires_from_file('requirements.txt')
+    cmdclass={
+        'clean': CleanCommand,
+    }
 )