Merge branch 'master' into typeshed

This commit is contained in:
Dave Halter
2018-12-15 22:19:02 +01:00

View File

@@ -10,7 +10,7 @@ __AUTHOR_EMAIL__ = 'davidhalter88@gmail.com'
# Get the version from within jedi. It's defined in exactly one place now. # Get the version from within jedi. It's defined in exactly one place now.
with open('jedi/__init__.py') as f: with open('jedi/__init__.py') as f:
tree = ast.parse(f.read()) tree = ast.parse(f.read())
version = tree.body[1].value.s version = tree.body[int(not hasattr(tree, 'docstring'))].value.s
readme = open('README.rst').read() + '\n\n' + open('CHANGELOG.rst').read() readme = open('README.rst').read() + '\n\n' + open('CHANGELOG.rst').read()
with open('requirements.txt') as f: with open('requirements.txt') as f: