removed bad code and made compatible with pip 10 (#5458)
This commit is contained in:
parent
4eab463969
commit
c6e4699e5b
2 changed files with 8 additions and 10 deletions
|
|
@ -20,7 +20,6 @@ rauth>=0.6.2
|
|||
requests
|
||||
redis
|
||||
selenium
|
||||
-e git+https://github.com/frappe/python-pdfkit.git#egg=pdfkit
|
||||
babel
|
||||
ipython
|
||||
html2text==2016.9.19
|
||||
|
|
|
|||
17
setup.py
17
setup.py
|
|
@ -3,21 +3,18 @@ import os, shutil
|
|||
from distutils.command.clean import clean as Clean
|
||||
|
||||
from setuptools import setup, find_packages
|
||||
try: # for pip >= 10
|
||||
from pip._internal.req import parse_requirements
|
||||
except ImportError: # for pip <= 9.0.3
|
||||
from pip.req import parse_requirements
|
||||
import re, ast
|
||||
|
||||
# get version from __version__ variable in frappe/__init__.py
|
||||
_version_re = re.compile(r'__version__\s+=\s+(.*)')
|
||||
|
||||
with open('requirements.txt') as f:
|
||||
install_requires = f.read().strip().split('\n')
|
||||
|
||||
with open('frappe/__init__.py', 'rb') as f:
|
||||
version = str(ast.literal_eval(_version_re.search(
|
||||
f.read().decode('utf-8')).group(1)))
|
||||
|
||||
requirements = parse_requirements("requirements.txt", session="")
|
||||
|
||||
class CleanCommand(Clean):
|
||||
def run(self):
|
||||
Clean.run(self)
|
||||
|
|
@ -52,10 +49,12 @@ setup(
|
|||
packages=find_packages(),
|
||||
zip_safe=False,
|
||||
include_package_data=True,
|
||||
install_requires=[str(ir.req) for ir in requirements],
|
||||
dependency_links=[str(ir._link) for ir in requirements if ir._link],
|
||||
install_requires=install_requires,
|
||||
dependency_links=[
|
||||
'https://github.com/frappe/python-pdfkit.git#egg=pdfkit'
|
||||
],
|
||||
cmdclass = \
|
||||
{
|
||||
'clean': CleanCommand
|
||||
}
|
||||
)
|
||||
)
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue