Merge pull request #42 from saxbophone/develop

Fix package to work with new pypi.org

Author: saxbophone

Makefile

@@ -5,9 +5,6 @@ install-deps:
 	pip install -r python_requirements/base.txt
 	pip install -r python_requirements/test.txt
 
-install-build-deps:
-	pip install -r python_requirements/build.txt
-
 clean:
 	rm -rf basest/*.py[cod] tests/*.py[cod] *.py[cod] *__pycache__*
 	rm -rf basest.egg-info build dist
@@ -30,3 +27,6 @@ stress-test:
 
 package:
 	python setup.py sdist bdist_wheel
+
+release: package
+	twine upload dist/*

basest/__init__.py

@@ -14,3 +14,5 @@
 
 
 __all__ = ['core', 'encoders', 'exceptions']
+
+name = 'basest'

python_requirements/build.txt

@@ -13,19 +13,13 @@
 
 import os
 
-from pip.req import parse_requirements
-from pypandoc import convert_text
 from setuptools import find_packages, setup
 
 
-def readme(filepath):
-    """
-    Utility function to convert the README file to RST format and return it.
-    """
-    return convert_text(
-        open(os.path.join(os.path.dirname(__file__), filepath)).read(),
-        'rst', format='md'
-    )
+def parse_requirements(filepath):
+    """ load requirements from a pip requirements file """
+    lineiter = (line.strip() for line in open(filepath))
+    return [line for line in lineiter if line and not line.startswith('#')]
 
 
 def retrieve_deps(filepath):
@@ -41,11 +35,14 @@ def retrieve_deps(filepath):
 
 setup(
     name='basest',
-    version='0.7.0',
+    version='0.7.1',
     description=(
         'Converts symbols from any number base to any other number base'
     ),
-    long_description=readme('README.md'),
+    long_description=open(
+        os.path.join(os.path.dirname(__file__), 'README.md')
+    ).read(),
+    long_description_content_type='text/markdown',
     url='https://github.com/saxbophone/basest-python',
     author='Joshua Saxby',
     author_email='[email protected]',
@@ -73,10 +70,10 @@ def retrieve_deps(filepath):
     ],
     keywords='number base encoder decoder conversion encoding decoding',
     packages=find_packages(),
-    install_requires=retrieve_deps('python_requirements/base.txt'),
+    install_requires=parse_requirements('python_requirements/base.txt'),
     extras_require={
-        'test': retrieve_deps('python_requirements/test.txt'),
-        'build': retrieve_deps('python_requirements/build.txt'),
+        'test': parse_requirements('python_requirements/test.txt'),
+        'build': parse_requirements('python_requirements/build.txt'),
     },
     package_data={
         '': ['README.md', 'LICENSE'],