From e6a979d55031a3088302551554d7983473a0a160 Mon Sep 17 00:00:00 2001 From: Alan Huang Date: Thu, 22 Mar 2018 05:49:17 -0500 Subject: [PATCH 1/2] fix ipython requirement ipython 6.0+ requires python 3.3+ --- dev-requirements.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dev-requirements.txt b/dev-requirements.txt index 3248113dc4..4d633fc34f 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1,2 +1,3 @@ pytest -ipython +ipython<6.0; python_version < '3.3' +ipython>=6.0; python_version >= '3.3' From 4d1f66a5147ba8d9d226fda5598459b3aeb5ac5e Mon Sep 17 00:00:00 2001 From: Alan Huang Date: Fri, 23 Mar 2018 16:09:51 -0500 Subject: [PATCH 2/2] requirements: move ipython from dev to main --- dev-requirements.txt | 2 -- requirements.txt | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dev-requirements.txt b/dev-requirements.txt index 4d633fc34f..e079f8a603 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1,3 +1 @@ pytest -ipython<6.0; python_version < '3.3' -ipython>=6.0; python_version >= '3.3' diff --git a/requirements.txt b/requirements.txt index b124b8a2f4..3b10ee2c21 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,4 +3,5 @@ pytz praw pyenchant pygeoip +ipython requests>=2.0.0,<2.11.0