Merge pull request #36 from jbhagan/master

Release version 0.4.2

.travis.yml

@@ -5,11 +5,3 @@ install:
 - pip install -r requirements.txt
 script:
 - pytest
-deploy:
-  provider: pypi
-  user: "__token__"  
-  password:
-    secure: SFxXFZpTEShqGKRO+2TXaXUKuREc2WWUuLPJVmX4mty8VKTyvQgl/8PqlBOtL1md0bOV7TdkFUqZzYAGVh98LJBmYiiecLfHZ+vQjYRnQuWCfLl1gSSJ5wZ4l0lsk6kzQ6R5rzI3uoawALO0c0aDMdzD1fO+qbxIFGa5alAaPI6uVdjgcPZ+YhKuXafM4leiAQQFZb9csMFhOiPE9vIv3+0qaaTxatTHcSpaSVxi7wEexYxS9q/1ribC9sU2lmDXkjp38+KT5eryTgozNgX+1Cj3otI6iuz8SQ6Ki44AZ241AzGp/cp4ExAXLM4Urlg+03U5GW12LIYXu/DoXcEgfHUnLOWEDmDJlzb4tm61FGJ36db+z98JruhSIKzN0Y4nf37y/QDgM6yWuEqBebRM4kPT/vwQu7RmZBPsxLCVMOxe/zCyYLaX6hvHqHWCGOR6nXoWFvKfDlLHtbrOFTgZOLjTePenWX5k65lk4l28Pj6R/9dZYlXLUpQI7cmbeaBAmGBp9SuoWgIySbEiSNPxUUfv2jn1L856p5hoNfT/AZmq8zkHZJrVXHAQt/WLEHmJ+fCmapdbP1C4jZZGZVHNsfNqY4rPlr97mlPj6dZY0SL876IE6s2TFfZw6kjitdWAxAFLcpPNwX2N7UKc+MsMSIoOqc5mmSlA0mI7CizPzfM=
-  skip_cleanup: true
-  on:
-    tags: true

README.rst

@@ -1,9 +1,10 @@
 JWST Coronagraph Visibility Tool
 ================================
 
-Current version: 0.4.1 (beta).
+Current version: 0.4.2 (beta).
+SIAF version: PRDOPSSOC-M-026
 
-`Download for macOS (31 MB) <https://github.com/spacetelescope/jwst_coronagraph_visibility/releases/download/0.4.1/jwst_coronagraph_visibility-0.4.1-macos.zip>`_ | `Download Python source <https://github.com/spacetelescope/jwst_coronagraph_visibility/archive/0.4.1.zip>`_ | ``$ pip install jwst-coronagraph-visibility``
+`Download for macOS (754.5 MB) <https://github.com/spacetelescope/jwst_coronagraph_visibility/releases/download/0.4.2/jwst_coronagraph_visibility_tool_macos.zip>`_ | `Download Python source <https://github.com/spacetelescope/jwst_coronagraph_visibility/archive/0.4.2.zip>`_ | ``$ pip install jwst-coronagraph-visibility``
 
 **Report any issues at https://github.com/spacetelescope/jwst_coronagraph_visibility/issues/new or via email to the authors.**
 
@@ -18,7 +19,7 @@ The allowed pointing of JWST leads to target visibility that depends on ecliptic
 
 We stress that the CVT is designed to provide quick illustrations of the possible observable orientations for a given target. As such, the CVT rapidly approximates JWST’s pointing restrictions and **does not query the official JWST Proposal Constraint Generator (PCG)**. The CVT does not include detailed pointing restrictions like Earth and Moon avoidance, etc. Additionally, results may differ from official constraints by a degree or so. **Users should treat the results as close approximations.**
 
-Additionally, detector geometry (e.g. conversion from sky coordinates to the instrument's ``Idl`` frame) is provided by the SIAF (Science Image Aperture File). The SIAF is a standardized format for manipulating instrument apertures and coordinate conversions, maintained by STScI as part of operating JWST. As of this writing (January 2020), the code includes its own copies of the PRDOPSSOC-M-026 version of the NIRCam and MIRI SIAFs.
+Additionally, detector geometry (e.g. conversion from sky coordinates to the instrument's ``Idl`` frame) is provided by the SIAF (Science Image Aperture File). The SIAF is a standardized format for manipulating instrument apertures and coordinate conversions, maintained by STScI as part of operating JWST.
 
 For installation instructions and usage instructions, see the `documentation <https://github.com/spacetelescope/jwst_coronagraph_visibility/blob/master/docs/index.rst>`_ on GitHub or ``docs/index.rst`` in this repository.
 
@@ -35,6 +36,11 @@ Known Issues
 Release Notes
 -------------
 
+0.4.2
+^^^^^
+* Update to fix bug in Mac OS app bundle.
+
+
 0.4.1
 ^^^^^
 * Minor update to setup.py file that enables proper display of documentation on PyPI. No code was changed in this release, but a new release is necessary in order to update PyPI.

requirements.txt

@@ -1,4 +1,4 @@
 numpy>=1.9.0
-matplotlib>=1.4.2
+matplotlib>=2.2.4
 requests>=2.8.1
 pysiaf>=0.6.3

run_jwst_coronagraph_visibility.spec

@@ -4,19 +4,18 @@ from PyInstaller.utils import hooks
 
 block_cipher = None
 
-if sys.version_info[0] == 2:
-    hiddenimports = ['Tkinter', 'FileDialog']
-else:
-    hiddenimports = ['tkinter', 'tkinter.filedialog']
+
+hiddenimports = ["tkinter", "tkinter.filedialog"]
+pysiaf_hooks = hooks.collect_data_files('pysiaf')
 
 a = Analysis(['run_jwst_coronagraph_visibility.py'],
              pathex=['.'],
              binaries=None,
-             datas=hooks.collect_data_files('jwxml'),
+             datas=pysiaf_hooks,
              hiddenimports=hiddenimports,
              hookspath=[],
              runtime_hooks=[],
-             excludes=[],
+             excludes=['PyQt5'],
              win_no_prefer_redirects=False,
              win_private_assemblies=False,
              cipher=block_cipher)
@@ -45,5 +44,5 @@ app = BUNDLE(coll,
              name='JWST Coronagraph Visibility Tool.app',
              icon='./jwst.icns',
              bundle_identifier='edu.stsci.jwst_coronagraph_visibility',
-             info_plist={'NSHighResolutionCapable': 'True'},
+             info_plist={'NSHighResolutionCapable': 'True', 'CFBundleShortVersionString':'0.4.2'},
              )

setup.py

@@ -12,7 +12,7 @@
 here = path.abspath(path.dirname(__file__))
 
 # Get the long description from the README file
-with open(path.join(here, 'README.rst'), encoding='utf-8') as f:
+with open(path.join(here, 'README.rst')) as f:
     long_description = f.read()
 
 setup(
@@ -21,7 +21,7 @@
     # Versions should comply with PEP440.  For a discussion on single-sourcing
     # the version across setup.py and the project code, see
     # https://packaging.python.org/en/latest/single_source_version.html
-    version='0.4.1',
+    version='0.4.2',
 
     description='JWST coronagraphic target observability calculator',
     long_description=long_description,
@@ -48,8 +48,7 @@
 
         # Specify the Python versions you support here. In particular, ensure
         # that you indicate whether you support Python 2, Python 3 or both.
-        'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
     ],
 
     # What does your project relate to?
@@ -65,7 +64,7 @@
     # https://packaging.python.org/en/latest/requirements.html
     install_requires=[
         'numpy>=1.9.0',
-        'matplotlib>=1.4.2',
+        'matplotlib>=2.2.4',
         'requests>=2.8.1',
         'pysiaf>=0.6.3',
     ],