Merge branch 'dev'

CHANGELOG.rst

@@ -3,6 +3,17 @@
 Changelog
 ---------
 
+0.10.2 (2017-04-05)
++++++++++++++++++++
+
+- Python Packaging sucks. Some files were not included in 0.10.1.
+
+0.10.1 (2017-04-05)
++++++++++++++++++++
+
+- Fixed a few very annoying bugs.
+- Prepared the parser to be factored out of Jedi.
+
 0.10.0 (2017-02-03)
 +++++++++++++++++++
 

MANIFEST.in

@@ -8,7 +8,7 @@ include conftest.py
 include pytest.ini
 include tox.ini
 include jedi/evaluate/compiled/fake/*.pym
-include jedi/parser/grammar*.txt
+include jedi/parser/python/grammar*.txt
 recursive-include test *
 recursive-include docs *
 recursive-exclude * *.pyc

jedi/__init__.py

@@ -36,7 +36,7 @@ As you see Jedi is pretty simple and allows you to concentrate on writing a
 good text editor, while still having very good IDE features for Python.
 """
 
-__version__ = '0.10.1'
+__version__ = '0.10.2'
 
 from jedi.api import Script, Interpreter, NotFoundError, set_debug_function
 from jedi.api import preload_module, defined_names, names

setup.py

@@ -21,6 +21,7 @@ setup(name='jedi',
       description='An autocompletion tool for Python that can be used for text editors.',
       author=__AUTHOR__,
       author_email=__AUTHOR_EMAIL__,
+      include_package_data=True,
       maintainer=__AUTHOR__,
       maintainer_email=__AUTHOR_EMAIL__,
       url='https://github.com/davidhalter/jedi',