From f6ea8c0bb6a55899d97370fdb82ffbb34165eb43 Mon Sep 17 00:00:00 2001
From: Joshua Saxby <joshua.a.saxby@gmail.com>
Date: Wed, 31 Oct 2018 22:10:48 +0000
Subject: [PATCH] Fix package to work with new pypi.org Wow! That was quicker
 than expected!

---
 basest/__init__.py |  2 ++
 setup.py           | 19 ++++++++++++-------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/basest/__init__.py b/basest/__init__.py
index 5000eaf..f9aab1d 100644
--- a/basest/__init__.py
+++ b/basest/__init__.py
@@ -14,3 +14,5 @@
 
 
 __all__ = ['core', 'encoders', 'exceptions']
+
+name = 'basest'
diff --git a/setup.py b/setup.py
index fffe09a..053ed51 100644
--- a/setup.py
+++ b/setup.py
@@ -13,8 +13,6 @@
 
 import os
 
-from pip.req import parse_requirements
-from pypandoc import convert_text
 from setuptools import find_packages, setup
 
 
@@ -28,6 +26,12 @@ def readme(filepath):
     )
 
 
+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):
     """
     Given a file path that points to a requirements file that pip can
@@ -41,11 +45,12 @@ 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='joshua.a.saxby@gmail.com',
@@ -73,10 +78,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'],