From b99dd2a72dee79194d6b7505670795e92644d04c Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <prudiger@anaconda.com>
Date: Sun, 13 Oct 2019 10:19:11 +0200
Subject: [PATCH 1/4] Activate env in appveyor

---
 .appveyor.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.appveyor.yml b/.appveyor.yml
index 49efaa352f..a65948cc25 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -8,6 +8,8 @@ environment:
 install:
   - "SET PATH=%CONDA%;%CONDA%\\Scripts;%PATH%"
   - "conda install -y -c pyviz pyctdev && doit ecosystem_setup"
+  - "doit env_create %CHANS_DEV% --name=test --python=%PY%"
+  - "activate test"
   - "doit develop_install -o recommended -o tests %CHANS_DEV%"
   - "bokeh sampledata"
 

From f245697e2736c0f27e86e1d0dc4b5e0ce5b17865 Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <prudiger@anaconda.com>
Date: Wed, 6 Nov 2019 15:47:23 -0600
Subject: [PATCH 2/4] Updated bokeh requirements

---
 pyproject.toml | 1 +
 setup.py       | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 04ad94da47..d1410ee238 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,7 @@
 [build-system]
 requires = [
     "param >=1.7.0",
+	"bokeh >=1.4.0",
     "pyct >=0.4.4",
     "setuptools >=30.3.0",
 ]
diff --git a/setup.py b/setup.py
index 99d5415617..b3ac522bef 100644
--- a/setup.py
+++ b/setup.py
@@ -86,7 +86,7 @@ def run(self):
 ########## dependencies ##########
 
 install_requires = [
-    'bokeh >=1.3.0',
+    'bokeh >=1.4.0',
     'param >=1.9.0',
     'pyviz_comms >=0.7.2',
     'markdown',
@@ -141,7 +141,7 @@ def run(self):
     'param >=1.9.0',
     'pyct >=0.4.4',
     'setuptools >=30.3.0',
-    'bokeh >=1.3.0',
+    'bokeh >=1.4.0',
     'pyviz_comms >=0.6.0',
     'nodejs >=9.11.1',
 ]

From 6c3f168a3d5316552d0227522bf095a41a981f6f Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <prudiger@anaconda.com>
Date: Wed, 6 Nov 2019 17:12:00 -0600
Subject: [PATCH 3/4] Revert changes to dodo

---
 dodo.py | 24 ------------------------
 1 file changed, 24 deletions(-)

diff --git a/dodo.py b/dodo.py
index 1a28190c76..b1299294ac 100644
--- a/dodo.py
+++ b/dodo.py
@@ -21,27 +21,3 @@ def task_pip_on_conda():
 def _build_dev(channel):
     channels = " ".join(['-c %s' % c for c in channel])
     return "conda build %s conda.recipe/ --build-only" % channels
-
-
-def task_develop_install():
-    """python develop install, with specified optional groups of dependencies (installed by conda only).
-
-    Typically ``conda install "test dependencies" && pip install -e . --no-deps``.
-
-    Pass --options multiple times to specify other optional groups
-    (see project's setup.py for available options).
-
-    E.g.
-
-    ``doit develop_install -o examples -o tests``
-    ``doit develop_install -o all``
-
-    """
-    return {'actions': [
-        CmdAction(_conda_build_deps),
-        CmdAction(_conda_install_with_options_hacked),
-        #CmdAction(_build_dev), # Switch to locally built version at later point
-        #"conda install --use-local panel"
-        "conda uninstall panel --force",
-        "python setup.py develop --no-deps"],
-            'params': [_options_param,_channel_param]}

From c44d278a0c5a940f2470b87f1d930c8e5853251d Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <prudiger@anaconda.com>
Date: Wed, 6 Nov 2019 17:25:34 -0600
Subject: [PATCH 4/4] Fixed flakes

---
 dodo.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/dodo.py b/dodo.py
index b1299294ac..d31d3717e7 100644
--- a/dodo.py
+++ b/dodo.py
@@ -3,8 +3,6 @@
     os.environ["PYCTDEV_ECOSYSTEM"] = "conda"
 
 from pyctdev import *  # noqa: api
-from pyctdev import CmdAction
-from pyctdev._conda import _options_param, _channel_param, _conda_build_deps, _conda_install_with_options_hacked
 
 def task_pip_on_conda():	
     """Experimental: provide pip build env via conda"""