Merge pull request #92 from bourque/update-django-version

Update django version for webapp
spacetelescope · Jun 22, 2018 · e3fe502 · e3fe502
2 parents d8d671e + 82e2e60
commit e3fe502
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/environment.yml b/environment.yml
@@ -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
@@ -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',