Permalink
Browse files

revert #1439 changes

adding external dependencies to setup.py was a bad idea
  • Loading branch information...
fyfe committed Mar 31, 2018
1 parent 587eb77 commit 86d758d841b24509d45dad5cb64056e5c9b26915
Showing with 9 additions and 11 deletions.
  1. +0 −1 dev-requirements.txt
  2. +9 −9 setup.py
  3. +0 −1 test-requirements.txt
View
@@ -1,3 +1,2 @@
django-bower
django-debug-toolbar
packaging
View
@@ -13,21 +13,21 @@
import io
from os import path
from packaging.requirements import Requirement
from pip.req import parse_requirements
from setuptools import find_packages, setup
def get_requirements(requirements_file):
"""Parse requirements file."""
"""Use pip to parse requirements file."""
requirements = []
if path.isfile(requirements_file):
with io.open(requirements_file, encoding="utf-8") as fp:
for line in fp:
if line.startswith("#") or line.strip() == "":
continue
req = Requirement(line)
if req.marker is None or req.marker.evaluate():
requirements.append('%s%s' % (req.name, req.specifier))
for req in parse_requirements(requirements_file, session="hack"):
# check markers, such as
#
# rope_py3k ; python_version >= '3.0'
#
if req.match_markers():
requirements.append(str(req.req))
return requirements
View
@@ -5,4 +5,3 @@ testfixtures==4.7.0
tox
psycopg2-binary>=2.7.4
mysqlclient>=1.3.3
packaging

0 comments on commit 86d758d

Please sign in to comment.