Skip to content

Commit

Permalink
Merge pull request #12 from ehenneken/master
Browse files Browse the repository at this point in the history
fix for install_requires
  • Loading branch information
ehenneken committed Sep 29, 2016
2 parents e5ef2f4 + c95a948 commit a130e46
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,19 @@
import os
import sys
import re
from pip.req import parse_requirements

try:
from setuptools import setup

except ImportError:
from distutils.core import setup

major, minor1, minor2, release, serial = sys.version_info

readfile_kwargs = {"encoding": "utf-8"} if major >= 3 else {}



def readfile(filename):
with open(filename, **readfile_kwargs) as fp:
contents = fp.read()
Expand All @@ -26,11 +28,14 @@ def readfile(filename):

version = version_regex.findall(contents)[0]

install_reqs = parse_requirements(os.path.join(os.path.dirname(__file__), "requirements.txt"))
reqs = [str(ir.req) for ir in install_reqs]

setup(
name = 'adsutils',
version = version,
long_description = readfile(os.path.join(os.path.dirname(__file__), "README.md")),
install_requires = readfile(os.path.join(os.path.dirname(__file__), "requirements.txt")),
install_requires = reqs,
author = 'Edwin Henneken',
author_email = 'ehenneken@cfa.harvard.edu',
url = 'http://github.com/adsabs/adsutils',
Expand Down

0 comments on commit a130e46

Please sign in to comment.