Merge branch 'master' into docs-influxdb

This commit is contained in:
Curtis 2018-04-16 15:12:09 -07:00 committed by GitHub
commit 1904a187e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions

View File

@ -16,14 +16,20 @@ import datetime
from distutils import log from distutils import log
from distutils.core import Command from distutils.core import Command
from pip.download import PipSession
from pip.req import parse_requirements
from setuptools.command.develop import develop from setuptools.command.develop import develop
from setuptools.command.install import install from setuptools.command.install import install
from setuptools.command.sdist import sdist from setuptools.command.sdist import sdist
from setuptools import setup, find_packages from setuptools import setup, find_packages
from subprocess import check_output from subprocess import check_output
import pip
if tuple(map(int, pip.__version__.split('.'))) >= (10, 0, 0):
from pip._internal.download import PipSession
from pip._internal.req import parse_requirements
else:
from pip.download import PipSession
from pip.req import parse_requirements
ROOT = os.path.realpath(os.path.join(os.path.dirname(__file__))) ROOT = os.path.realpath(os.path.join(os.path.dirname(__file__)))
# When executing the setup.py, we need to be able to import ourselves, this # When executing the setup.py, we need to be able to import ourselves, this