From c56ea94614cdfc6c03a76a45075b3f187100b6db Mon Sep 17 00:00:00 2001
From: Henrik Nilsson <henrik@lhjnilsson.com>
Date: Thu, 23 Jul 2020 13:40:44 +0200
Subject: [PATCH 1/2] To Build and run Zipline in Docker using python3.6

---
 Dockerfile          | 2 +-
 etc/requirements.in | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index ac23c42c84..8406b913fc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,7 +21,7 @@
 #
 #    docker exec -it zipline zipline run -f /projects/my_algo.py --start 2015-1-1 --end 2016-1-1 -o /projects/result.pickle
 #
-FROM python:3.5
+FROM python:3.6
 
 #
 # set up environment
diff --git a/etc/requirements.in b/etc/requirements.in
index 402d8a23ad..f69f3cc863 100644
--- a/etc/requirements.in
+++ b/etc/requirements.in
@@ -17,10 +17,10 @@ multipledispatch>=0.6.0
 toolz>=0.8.2
 
 # Scientific Libraries
-numpy>=1.11.3
+numpy>=1.11.3,<=1.18.0
 pandas>=0.18.1,<=0.22
 pandas-datareader>=0.2.1
-scipy>=0.17.1
+scipy>1.0.0,<=1.1.0
 # Needed for parts of pandas.stats
 patsy>=0.4.0
 statsmodels>=0.6.1

From 75b8ce1e08fb7b93b3d0a9c6cb118721501d081e Mon Sep 17 00:00:00 2001
From: Henrik Nilsson <henrik@lhjnilsson.com>
Date: Thu, 23 Jul 2020 13:48:43 +0200
Subject: [PATCH 2/2] Thanks for making 3.6 work! Updated some doc

---
 README.rst              | 3 +--
 docs/source/install.rst | 8 +-------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/README.rst b/README.rst
index 061a359901..f1102d3aaa 100644
--- a/README.rst
+++ b/README.rst
@@ -41,8 +41,7 @@ Features
 Installation
 ============
 
-Zipline currently supports Python 2.7 and Python 3.5, and may be installed via
-either pip or conda.
+Zipline currently supports Python 3.6, and may be installed via either pip or conda.
 
 **Note:** Installing Zipline is slightly more involved than the average Python
 package. See the full `Zipline Install Documentation`_ for detailed
diff --git a/docs/source/install.rst b/docs/source/install.rst
index a2cf3ec89f..571c70917e 100644
--- a/docs/source/install.rst
+++ b/docs/source/install.rst
@@ -133,13 +133,7 @@ the `Conda User Guide <https://conda.io/projects/conda/en/latest/user-guide/task
 
 Assuming ``conda`` has been set up, you can create a ``conda`` environment:
 
-- Python 2.7:
-
-.. code-block:: bash
-
-    $ conda create -n env_zipline python=2.7
-
-- Python 3.5:
+- Python 3.6:
 
 .. code-block:: bash