From 59b286578b08494b4eaea5853bde6253638d3580 Mon Sep 17 00:00:00 2001
From: Marshall Perrin <mperrin@stsci.edu>
Date: Wed, 30 May 2018 16:54:58 -0400
Subject: [PATCH] Release 0.7.0

---
 docs/relnotes.rst       | 2 +-
 setup.py                | 4 ++--
 webbpsf/webbpsf_core.py | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/relnotes.rst b/docs/relnotes.rst
index 6778f467..eb7e32de 100644
--- a/docs/relnotes.rst
+++ b/docs/relnotes.rst
@@ -35,7 +35,7 @@ Version History and Change Log
 Version 0.7.0
 =============
 
-*2018 June 1*
+*2018 May 30*
 
 
 Note, when upgrading to this version you will need to update to the latest data files as well. This is
diff --git a/setup.py b/setup.py
index bb43185a..d75211df 100755
--- a/setup.py
+++ b/setup.py
@@ -61,7 +61,7 @@
 builtins._ASTROPY_PACKAGE_NAME_ = PACKAGENAME
 
 # VERSION should be PEP386 compatible (http://www.python.org/dev/peps/pep-0386)
-VERSION = '0.7.0rc1'
+VERSION = '0.7.0'
 
 # Indicates if this version is a release version
 RELEASE = 'dev' not in VERSION
@@ -116,7 +116,7 @@
           'poppy>=0.6.1',
           'astropy>=1.2.0',
           'jwxml>=0.3.0',
-          'pysiaf', 'six',
+          'pysiaf>=0.1.8', 'six',
           'pytest'  # unlisted requirement for pysiaf - see https://github.com/spacetelescope/pysiaf/issues/16
                     # Remove this requirement once that issue is addressed.
       ],
diff --git a/webbpsf/webbpsf_core.py b/webbpsf/webbpsf_core.py
index cb1bc38b..df00f495 100644
--- a/webbpsf/webbpsf_core.py
+++ b/webbpsf/webbpsf_core.py
@@ -618,7 +618,7 @@ class JWInstrument(SpaceTelescopeInstrument):
 
     telescope : name of telescope
     pupilopd : filename or FITS file object
-    include_si_wfe : boolean (default: False)
+    include_si_wfe : boolean (default: True)
         Should SI internal WFE be included in models? Requires
         the presence of ``si_zernikes_isim_cv3.fits`` in the
         ``WEBBPSF_PATH``.
@@ -659,7 +659,7 @@ def __init__(self, *args, **kwargs):
         # where is the source on the detector, in 'Science frame' pixels?
         self.detector_position = (1024, 1024)
 
-        self.include_si_wfe = False
+        self.include_si_wfe = True
         """Should calculations include the Science Instrument internal WFE?"""
         self.options['jitter'] = 'gaussian'
         self.options['jitter_sigma'] = 0.007