From 86495052f824b690df9edb60d9551ddb6abdad27 Mon Sep 17 00:00:00 2001 From: galaunay Date: Mon, 23 Mar 2020 16:09:51 +0100 Subject: [PATCH] Fix setuptools version for travis --- requirements-dev.txt | 4 ++-- requirements-rpc.txt | 2 +- test/test-helper.el | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 81a1b4085..524400963 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,6 +1,6 @@ bumpversion==0.5.3 coverage==4.5.3 -mock==5.0.4 +mock==3.0.5 nose==1.3.7 -twine==3.1.1 +twine==1.15.0 wheel==0.34.2 diff --git a/requirements-rpc.txt b/requirements-rpc.txt index d22e13940..c34c65a47 100644 --- a/requirements-rpc.txt +++ b/requirements-rpc.txt @@ -2,4 +2,4 @@ jedi==0.16.0 rope==0.16.0 autopep8==1.5 yapf==0.29 -setuptools==46.1.1 +setuptools==44.1.0 diff --git a/test/test-helper.el b/test/test-helper.el index 74a715200..e9f681017 100644 --- a/test/test-helper.el +++ b/test/test-helper.el @@ -15,6 +15,8 @@ ;; Avoid asking stuff during tests (defun yes-or-no-p (&rest args) t) (defun y-or-n-p (&rest args) t) +;; Avoid verbose during test +(setq python-indent-guess-indent-offset-verbose nil) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;