From 4711b85b5039f18d118a516f73be481b3d1d49a9 Mon Sep 17 00:00:00 2001 From: "oleg.hoefling" Date: Fri, 7 Dec 2018 17:49:39 +0100 Subject: [PATCH 1/3] used pytest.param to comply with pytest>=4 --- test/test_evaluate/test_imports.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/test_evaluate/test_imports.py b/test/test_evaluate/test_imports.py index fc0a790a..ec349c01 100644 --- a/test/test_evaluate/test_imports.py +++ b/test/test_evaluate/test_imports.py @@ -87,10 +87,10 @@ def test_import_not_in_sys_path(Script): ("from flask.ext.", "bar"), ("from flask.ext.", "baz"), ("from flask.ext.", "moo"), - pytest.mark.xfail(("import flask.ext.foo; flask.ext.foo.", "Foo")), - pytest.mark.xfail(("import flask.ext.bar; flask.ext.bar.", "Foo")), - pytest.mark.xfail(("import flask.ext.baz; flask.ext.baz.", "Foo")), - pytest.mark.xfail(("import flask.ext.moo; flask.ext.moo.", "Foo")), + pytest.param("import flask.ext.foo; flask.ext.foo.", "Foo", marks=pytest.mark.xfail), + pytest.param("import flask.ext.bar; flask.ext.bar.", "Foo", marks=pytest.mark.xfail), + pytest.param("import flask.ext.baz; flask.ext.baz.", "Foo", marks=pytest.mark.xfail), + pytest.param("import flask.ext.moo; flask.ext.moo.", "Foo", marks=pytest.mark.xfail), ]) def test_flask_ext(Script, code, name): """flask.ext.foo is really imported from flaskext.foo or flask_foo. From 70800a6dc2fa5661dc32a88a59ae5271a56ee8e2 Mon Sep 17 00:00:00 2001 From: "oleg.hoefling" Date: Fri, 7 Dec 2018 18:22:29 +0100 Subject: [PATCH 2/3] bumped pytest dependency to 3.1.0 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index d964d541..d1f8704e 100755 --- a/setup.py +++ b/setup.py @@ -33,7 +33,7 @@ setup(name='jedi', install_requires=install_requires, extras_require={ 'testing': [ - 'pytest>=2.3.5', + 'pytest>=3.1.0', # docopt for sith doctests 'docopt', # coloroma for colored debug output From 86ae11eb4330687ff37d08bc1ac2ec3bb4e208f4 Mon Sep 17 00:00:00 2001 From: Dave Halter Date: Sat, 15 Dec 2018 20:08:16 +0100 Subject: [PATCH 3/3] Add a new release 0.13.2 --- CHANGELOG.rst | 5 +++++ jedi/__init__.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index f74658f3..117174f1 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -3,6 +3,11 @@ Changelog --------- +0.13.2 (2018-12-15) ++++++++++++++++++++ + +- Fixed a bug that led to Jedi spawning a lot of subprocesses. + 0.13.1 (2018-10-02) +++++++++++++++++++ diff --git a/jedi/__init__.py b/jedi/__init__.py index a90f106b..9d687fa6 100644 --- a/jedi/__init__.py +++ b/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.13.1' +__version__ = '0.13.2' from jedi.api import Script, Interpreter, set_debug_function, \ preload_module, names