From 755fb90b94f5cc2f466328110e5f47020eb58f74 Mon Sep 17 00:00:00 2001 From: Dominic Hayes Date: Mon, 13 Aug 2018 14:17:36 -0700 Subject: [PATCH 1/2] Remove usage of PIP internals (https://pip.pypa.io/en/latest/user_guide/#using-pip-from-your-program), these aren't supported in python 3.6.6 (but in 3.6.5). --- .python-version | 2 +- setup.py | 14 +++++--------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/.python-version b/.python-version index d15b8b0..4f2c1d1 100644 --- a/.python-version +++ b/.python-version @@ -1 +1 @@ -3.6.5 +3.6.6 diff --git a/setup.py b/setup.py index f18b55a..d57be6c 100644 --- a/setup.py +++ b/setup.py @@ -1,11 +1,6 @@ import os from setuptools import setup, find_packages -from pip.download import PipSession -try: - from pip._internal.req import parse_requirements -except ImportError: - from pip.req import parse_requirements version = '0.2.2' @@ -13,12 +8,13 @@ def read(f): return open(os.path.join(os.path.dirname(__file__), f)).read().strip() -install_reqs = parse_requirements('requirements.txt', session=PipSession()) -reqs = [str(ir.req) for ir in install_reqs] +install_requires = [ + 'mistune <= 1', +] setup(name='sdiff', - version=version, + version='0.2.2', description=('sdiff compares the structure of two markdown texts'), long_description='\n\n'.join((read('README.md'), read('CHANGELOG'))), classifiers=[ @@ -32,5 +28,5 @@ def read(f): packages=find_packages(exclude=['tests']), package_data={}, namespace_packages=[], - install_requires = reqs, + install_requires = install_requires, include_package_data = False) From abbb420ef97af5b16ac4be1c999b41ce8f7f7a60 Mon Sep 17 00:00:00 2001 From: Dominic Hayes Date: Mon, 13 Aug 2018 14:19:49 -0700 Subject: [PATCH 2/2] no message --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index d57be6c..391bd2f 100644 --- a/setup.py +++ b/setup.py @@ -14,7 +14,7 @@ def read(f): ] setup(name='sdiff', - version='0.2.2', + version=version, description=('sdiff compares the structure of two markdown texts'), long_description='\n\n'.join((read('README.md'), read('CHANGELOG'))), classifiers=[