From c7984c0710f81210b2ecf165ba7fd88c3b7ac405 Mon Sep 17 00:00:00 2001 From: Dave Halter Date: Sat, 20 May 2017 17:22:24 -0400 Subject: [PATCH] Add a requirements.txt. Also use it within setup.py. It doesn't seem possible to define dependencies for tox with install_requires. --- MANIFEST.in | 1 + requirements.txt | 1 + setup.py | 3 ++- test/test_parso_integration/test_parser_utils.py | 6 ++++-- tox.ini | 1 + 5 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 requirements.txt diff --git a/MANIFEST.in b/MANIFEST.in index e2ff1cbe..5ba58e6c 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -7,6 +7,7 @@ include sith.py include conftest.py include pytest.ini include tox.ini +include requirements.txt include jedi/evaluate/compiled/fake/*.pym include jedi/parser/python/grammar*.txt recursive-include test * diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 00000000..ba6b3065 --- /dev/null +++ b/requirements.txt @@ -0,0 +1 @@ +parso==0.0.1 diff --git a/setup.py b/setup.py index 7fda6c74..fc0bd637 100755 --- a/setup.py +++ b/setup.py @@ -10,7 +10,8 @@ __AUTHOR_EMAIL__ = 'davidhalter88@gmail.com' readme = open('README.rst').read() + '\n\n' + open('CHANGELOG.rst').read() packages = ['jedi', 'jedi.evaluate', 'jedi.evaluate.compiled', 'jedi.api'] -install_requires = ['parso==0.0.1'] +with open('requirements.txt') as f: + install_requires = f.read().splitlines() setup(name='jedi', version=jedi.__version__, diff --git a/test/test_parso_integration/test_parser_utils.py b/test/test_parso_integration/test_parser_utils.py index 16663c95..a1611799 100644 --- a/test/test_parso_integration/test_parser_utils.py +++ b/test/test_parso_integration/test_parser_utils.py @@ -1,4 +1,6 @@ -from jedi._compatibility import u, is_py3 +# -*- coding: utf-8 -*- + +from jedi._compatibility import is_py3 from jedi import parser_utils from parso.python import parse from parso.python import tree @@ -67,7 +69,7 @@ def test_hex_values_in_docstring(): if is_py3: assert doc == '\xff' else: - assert doc == u('�') + assert doc == u'�' @pytest.mark.parametrize( diff --git a/tox.ini b/tox.ini index a2847586..56fbb49d 100644 --- a/tox.ini +++ b/tox.ini @@ -8,6 +8,7 @@ deps = docopt # coloroma for colored debug output colorama + -rrequirements.txt setenv = # https://github.com/tomchristie/django-rest-framework/issues/1957 # tox corrupts __pycache__, solution from here: