setup.py cleanup

Author: hackaugusto

HISTORY.rst

@@ -3,7 +3,7 @@
 History
 -------
 
-0.1.0 (20150-1-1)
+0.1.0 (2015-01-01)
 ---------------------
 
 * First release on PyPI.

setup.py

@@ -1,17 +1,18 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-
-
+import codecs
 from setuptools import setup
 from setuptools.command.test import test as TestCommand
 
 
 class PyTest(TestCommand):
+    def __init__(self, *args, **kwargs):
+        super(PyTest, self).__init__(*args, **kwargs)
+        self.test_suite = True
 
     def finalize_options(self):
         TestCommand.finalize_options(self)
         self.test_args = []
-        self.test_suite = True
 
     def run_tests(self):
         # import here, cause outside the eggs aren't loaded
@@ -20,22 +21,29 @@ def run_tests(self):
         raise SystemExit(errno)
 
 
-with open('README.rst') as readme_file:
-    readme = readme_file.read()
+with codecs.open('README.rst', encoding='utf8') as readme_file:
+    README = readme_file.read()
 
-with open('HISTORY.rst') as history_file:
-    history = history_file.read().replace('.. :changelog:', '')
+with codecs.open('HISTORY.rst', encoding='utf8') as history_file:
+    HISTORY = history_file.read().replace('.. :changelog:', '')
 
+LONG_DESCRIPTION = README + '\n\n' + HISTORY
 
-install_requires = set(x.strip() for x in open('requirements.txt'))
-install_requires_replacements = {
-    'https://github.com/ethereum/ethash/tarball/master#egg=pyethash': 'pyethash'}
+INSTALL_REQUIRES_REPLACEMENTS = {
+    'https://github.com/ethereum/ethash/tarball/master#egg=pyethash': 'pyethash',
+}
 
-install_requires = [install_requires_replacements.get(r, r) for r in install_requires]
-test_requirements = [
-    'ethereum-serpent>=1.8.1',
-    'pytest==2.9.1',
-]
+INSTALL_REQUIRES = list()
+with open('requirements.txt') as requirements_file:
+    for requirement in requirements_file:
+        dependency = INSTALL_REQUIRES_REPLACEMENTS.get(
+            requirement.strip(),
+            requirement.strip(),
+        )
+
+        INSTALL_REQUIRES.append(dependency)
+
+INSTALL_REQUIRES = list(set(INSTALL_REQUIRES))
 
 # *IMPORTANT*: Don't manually change the version here. Use the 'bumpversion' utility.
 # see: https://github.com/ethereum/pyethapp/wiki/Development:-Versions-and-Releases
@@ -44,9 +52,9 @@ def run_tests(self):
 setup(
     name='pyethapp',
     version=version,
-    description="Python Ethereum Client",
-    long_description=readme + '\n\n' + history,
-    author="HeikoHeiko",
+    description='Python Ethereum Client',
+    long_description=LONG_DESCRIPTION,
+    author='HeikoHeiko',
     author_email='[email protected]',
     url='https://github.com/ethereum/pyethapp',
     packages=[
@@ -55,20 +63,22 @@ def run_tests(self):
     package_data={
         'pyethapp': ['genesisdata/*.json']
     },
-    license="BSD",
+    license='BSD',
     zip_safe=False,
     keywords='pyethapp',
     classifiers=[
         'Development Status :: 2 - Pre-Alpha',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: BSD License',
         'Natural Language :: English',
-        "Programming Language :: Python :: 2",
+        'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 2.7',
     ],
     cmdclass={'test': PyTest},
-    install_requires=install_requires,
-    tests_require=test_requirements,
+    install_requires=INSTALL_REQUIRES,
+    tests_require=[
+        'ethereum-serpent>=1.8.1',
+    ],
     entry_points='''
     [console_scripts]
     pyethapp=pyethapp.app:app