From 22c97b0917a3e9db934f7ec6586698fef63bed05 Mon Sep 17 00:00:00 2001 From: Thomas A Caswell Date: Mon, 6 Nov 2017 10:29:06 -0800 Subject: [PATCH] FIX: install on python 3.7 (#971) * FIX: install on python 3.7 https://github.com/python/cpython/pull/46 / https://bugs.python.org/issue29463 move the module comment into the AST node and hence out of the tree which means the 2nd entry in the tree is now the import rather than the `__version__` string. Adds nightly on travis. * BLD: update python tags in setup.py * CI: switch to 3.7-dev * CI: allow failure on 3.7 dev --- .travis.yml | 4 +++- setup.py | 9 +++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8bd67fff..7916832e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,11 +8,14 @@ python: - 3.5 - 3.6 - pypy + - "3.7-dev" + matrix: allow_failures: - python: pypy - env: TOXENV=cov - env: TOXENV=sith + - python: 3.7-dev include: - python: 3.5 env: TOXENV=cov @@ -27,4 +30,3 @@ after_script: pip install --quiet coveralls; coveralls; fi - diff --git a/setup.py b/setup.py index 72df7c53..3f3b7e54 100755 --- a/setup.py +++ b/setup.py @@ -3,7 +3,7 @@ from setuptools import setup, find_packages import ast - +import sys __AUTHOR__ = 'David Halter' __AUTHOR_EMAIL__ = 'davidhalter88@gmail.com' @@ -11,7 +11,10 @@ __AUTHOR_EMAIL__ = 'davidhalter88@gmail.com' # Get the version from within jedi. It's defined in exactly one place now. with open('jedi/__init__.py') as f: tree = ast.parse(f.read()) -version = tree.body[1].value.s +if sys.version_info > (3, 7): + version = tree.body[0].value.s +else: + version = tree.body[1].value.s readme = open('README.rst').read() + '\n\n' + open('CHANGELOG.rst').read() with open('requirements.txt') as f: @@ -47,6 +50,8 @@ setup(name='jedi', 'Programming Language :: Python :: 3.3', 'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.5', + 'Programming Language :: Python :: 3.6', + 'Programming Language :: Python :: 3.7', 'Topic :: Software Development :: Libraries :: Python Modules', 'Topic :: Text Editors :: Integrated Development Environments (IDE)', 'Topic :: Utilities',