From 88d8113fc18ca8a83e9f4d0c05576c32837cf387 Mon Sep 17 00:00:00 2001
From: Matthew Bourque <bourque@stsci.edu>
Date: Wed, 20 Jun 2018 11:13:49 -0400
Subject: [PATCH 1/3] Updated django version

---
 environment.yml | 4 ++--
 setup.py        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/environment.yml b/environment.yml
index 32f8d9c43..19631709a 100644
--- a/environment.yml
+++ b/environment.yml
@@ -1,4 +1,4 @@
-name: jwql
+name: jwql_test
 channels:
 - defaults
 - http://ssb.stsci.edu/astroconda-dev
@@ -6,7 +6,7 @@ dependencies:
 - astropy=3.0
 - astroquery=0.3.8
 - bokeh=0.12.5
-- django=1.11.8
+- django=2.0.5
 - jwst=0.7.8rc9
 - matplotlib=2.1.1
 - numpy=1.14.0
diff --git a/setup.py b/setup.py
index eca1e20d0..282b5e1b0 100644
--- a/setup.py
+++ b/setup.py
@@ -7,7 +7,7 @@
 AUTHORS = 'Matthew Bourque, Sara Ogaz, Joe Filippazzo, Bryan Hilbert, Misty Cracraft, Graham Kanarek'
 AUTHORS += 'Johannes Sahlmann, Lauren Chambers, Catherine Martlin'
 
-REQUIRES = ['astropy', 'astroquery', 'bokeh==0.12.5', 'django', 'matplotlib', 'numpy', 'python-dateutil', 'sphinx', 'sphinx-automodapi', 'sqlalchemy']
+REQUIRES = ['astropy', 'astroquery', 'bokeh==0.12.5', 'django=2.0.5', 'matplotlib', 'numpy', 'python-dateutil', 'sphinx', 'sphinx-automodapi', 'sqlalchemy']
 
 setup(
     name='jwql',

From e2464976e4b5a7f6523654255a00cc977c2e85a9 Mon Sep 17 00:00:00 2001
From: Matthew Bourque <bourque@stsci.edu>
Date: Wed, 20 Jun 2018 11:21:35 -0400
Subject: [PATCH 2/3] Switching environment name back to jwql.  Naming it
 jwql_test was a mistake on my part.

---
 environment.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/environment.yml b/environment.yml
index 19631709a..6a56d9db2 100644
--- a/environment.yml
+++ b/environment.yml
@@ -1,4 +1,4 @@
-name: jwql_test
+name: jwql
 channels:
 - defaults
 - http://ssb.stsci.edu/astroconda-dev

From 371a8582f1c15969d1de49c71c2a7c7cde967fcf Mon Sep 17 00:00:00 2001
From: Matthew Bourque <bourque@stsci.edu>
Date: Wed, 20 Jun 2018 11:30:17 -0400
Subject: [PATCH 3/3] Forgot that two equal signs are required :(

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 282b5e1b0..aabfb9f34 100644
--- a/setup.py
+++ b/setup.py
@@ -7,7 +7,7 @@
 AUTHORS = 'Matthew Bourque, Sara Ogaz, Joe Filippazzo, Bryan Hilbert, Misty Cracraft, Graham Kanarek'
 AUTHORS += 'Johannes Sahlmann, Lauren Chambers, Catherine Martlin'
 
-REQUIRES = ['astropy', 'astroquery', 'bokeh==0.12.5', 'django=2.0.5', 'matplotlib', 'numpy', 'python-dateutil', 'sphinx', 'sphinx-automodapi', 'sqlalchemy']
+REQUIRES = ['astropy', 'astroquery', 'bokeh==0.12.5', 'django==2.0.5', 'matplotlib', 'numpy', 'python-dateutil', 'sphinx', 'sphinx-automodapi', 'sqlalchemy']
 
 setup(
     name='jwql',