Merge branch 'master' of github.com:davidhalter/jedi

.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
-

setup.py

@@ -3,15 +3,18 @@
 from setuptools import setup, find_packages
 
 import ast
-
+import sys
 
 __AUTHOR__ = 'David Halter'
 __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 @@
           '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',