Skip to content

Commit

Permalink
Merge pull request #187 from bradleyjones/master
Browse files Browse the repository at this point in the history
Make setuptools a requirement for building
  • Loading branch information
vvb authored Oct 3, 2018
2 parents 13bc80a + a91b011 commit 6f70d4b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
1 change: 1 addition & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
setuptools
pyparsing
six
5 changes: 1 addition & 4 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-

from setuptools import setup

try:
from setuptools import setup
except ImportError:
from distutils.core import setup

with open('requirements.txt') as rf:
requirements = rf.readlines()
Expand Down

0 comments on commit 6f70d4b

Please sign in to comment.