From c8e856c9b3ebb052e69ca0339662766080ae0594 Mon Sep 17 00:00:00 2001
From: Aaron Ayres <aayres@enthought.com>
Date: Wed, 28 Oct 2020 15:54:10 -0500
Subject: [PATCH 1/3] install pyside2 from edm not pip

---
 ci/edmtool.py | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/ci/edmtool.py b/ci/edmtool.py
index 6931c888d..d8510527c 100644
--- a/ci/edmtool.py
+++ b/ci/edmtool.py
@@ -101,7 +101,7 @@
 github_url_fmt = "git+http://github.com/enthought/{0}.git#egg={0}"
 
 extra_dependencies = {
-    'pyside2': set(),  # pyside2 is pip-installed during the install step
+    'pyside2': {'pyside2'},
     'pyqt': {'pyqt'},
     'pyqt5': {'pyqt5'},
     'null': set()
@@ -147,11 +147,6 @@ def install(runtime, toolkit, environment, source):
          " --no-dependencies"),
         "edm run -e {environment} -- pip install . --no-deps",
     ]
-    # pip install pyside2, because we don't have it in EDM yet
-    if toolkit == 'pyside2':
-        commands.append(
-            "edm run -e {environment} -- pip install pyside2==5.11"
-        )
     
     click.echo("Creating environment '{environment}'".format(**parameters))
     execute(commands, parameters)

From 1b6c2a377586680f168f9a2aa2222748f697154c Mon Sep 17 00:00:00 2001
From: Aaron Ayres <aayres@enthought.com>
Date: Wed, 28 Oct 2020 16:13:23 -0500
Subject: [PATCH 2/3] ci was failing, make same change done on traits ui to add
 enthought/lgpl

---
 ci/edmtool.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/ci/edmtool.py b/ci/edmtool.py
index d8510527c..f28641cb8 100644
--- a/ci/edmtool.py
+++ b/ci/edmtool.py
@@ -139,10 +139,16 @@ def install(runtime, toolkit, environment, source):
     parameters = get_parameters(runtime, toolkit, environment)
     parameters['packages'] = ' '.join(
         dependencies | extra_dependencies.get(toolkit, set()))
+
+    if toolkit == "pyside2":
+        additional_repositories = "--add-repository enthought/lgpl"
+    else:
+        additional_repositories = ""
+
     # edm commands to setup the development environment
     commands = [
         "edm environments create {environment} --force --version={runtime}",
-        "edm install -y -e {environment} {packages}",
+        "edm install -y -e {environment} {packages} " + additional_repositories,
         ("edm run -e {environment} -- pip install -r ci/requirements.txt"
          " --no-dependencies"),
         "edm run -e {environment} -- pip install . --no-deps",

From 375dd4e09fe81dc00ed1b7b220e060a07fda6f7a Mon Sep 17 00:00:00 2001
From: Aaron Ayres <aayres@enthought.com>
Date: Wed, 28 Oct 2020 16:46:12 -0500
Subject: [PATCH 3/3] use newest edm version so new change will work

---
 .travis.yml  | 2 +-
 appveyor.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 08033bf87..4d865eab5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,7 +20,7 @@ addons:
     
 env:
   global:
-    - INSTALL_EDM_VERSION=2.0.0
+    - INSTALL_EDM_VERSION=3.0.1
       PYTHONUNBUFFERED="1"
       QT_DEBUG_PLUGINS="1"
 
diff --git a/appveyor.yml b/appveyor.yml
index 26f5ae41a..8c5833266 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -5,7 +5,7 @@ environment:
 
   global:
     PYTHONUNBUFFERED: "1"
-    INSTALL_EDM_VERSION: "2.0.0"
+    INSTALL_EDM_VERSION: "3.0.1"
 
   matrix:
     - RUNTIME: '3.6'