Merge pull request #152 from pllim/exterminate

WIP: stginga cleanup
spacetelescope · Feb 23, 2018 · 07f514c · 07f514c
2 parents cc4823d + 60a73b4
commit 07f514c
Show file tree

Hide file tree

Showing 45 changed files with 485 additions and 752 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,7 @@ language: python
 
 python:
     - 2.7
-    - 3.5
+    - 3.6
 
 # Setting sudo to false opts in to Travis-CI container-based builds.
 sudo: false
@@ -33,7 +33,7 @@ env:
         # For this package-template, we include examples of Cython modules,
         # so Cython is required for testing. If your package does not include
         # Cython code, you can set CONDA_DEPENDENCIES=''
-        - CONDA_DEPENDENCIES=''
+        - CONDA_DEPENDENCIES='numpy scipy astropy ginga'
 
         # If there are matplotlib or other GUI tests, uncomment the following
         # line to use the X virtual framebuffer.
@@ -42,32 +42,29 @@ env:
     matrix:
         # Make sure that egg_info works without dependencies
         - SETUP_CMD='egg_info'
-        # DISABLED UNTIL WE HAVE REAL TESTS
-        # Try all python versions with the latest numpy
-        #- SETUP_CMD='test'
+        # Run actual tests
+        - SETUP_CMD='test'
 
 matrix:
     include:
 
-        # DISABLED FOR NOW
-        # Do a coverage test in Python 3.
-        #- python: 3.5
-        #  env: SETUP_CMD='test --coverage'
-
         # Check for sphinx doc build warnings - we do this first because it
         # may run for a long time
-        - python: 3.5
+        - python: 3.6
           env: SETUP_CMD='build_docs -w'
-               PIP_DEPENDENCIES='ginga pandoc nbconvert tornado scipy'
 
         # DISABLED FOR NOW
-        # Try Astropy development version
+        # Do a coverage test in Python 3.
         #- python: 3.6
-        #  env: ASTROPY_VERSION=development
+        #  env: SETUP_CMD='test --coverage'
+
+        # Try Astropy development version
+        - python: 3.6
+          env: ASTROPY_VERSION=development
 
-        # Do a PEP8 test with pycodestyle
-        - python: 3.5
-          env: MAIN_CMD='pycodestyle stginga --count' SETUP_CMD=''
+        # Do a PEP8 test with flake8
+        - python: 3.6
+          env: MAIN_CMD='flake8 stginga --count' SETUP_CMD=''
 
 install:
 

diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,19 +1,30 @@
 0.3 (unreleased)
 ----------------
 
+This is the last release to support Python 2.
+
 New Features
 ^^^^^^^^^^^^
-- Use new notification system for ChangeHistory that will go with Ginga 2.7.
+- Use new notification system for ``ChangeHistory`` that goes with Ginga 2.7.
   [#147,#149,ejeschke/ginga#621]
-- Added example to auto-start MultiDim in ginga_config.py. [#144]
+- Added example to auto-start ``MultiDim`` in ``ginga_config.py``. [#144]
+
+API changes
+^^^^^^^^^^^
+- ``MIPick``, ``MultiImage``, and ``Smoothing`` plugins are moved to
+  "experimental" folder. So is the custom layout that goes with ``MultiImage``
+  and ``MIPick``. These are no longer actively supported. [#152]
+- ``WBrowser`` now supports docstring rendering while offline when Internet
+  connection is unavalable. [#152]
 
 Bug fixes
 ^^^^^^^^^
-- Use toolkit-agnostic treeview deselection for MosaicAuto. [#142]
+- Use toolkit-agnostic treeview deselection for ``MosaicAuto``. [#142]
 
 Other Changes and Additions
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
-- Updated astropy-helpers to v2.0.2.
+- Updated ``astropy-helpers`` to v2.0.4. [#152]
+- Deprecated Jupyter notebook support is removed. [#152]
 
 0.2.1 (2017-07-20)
 ------------------

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -11,6 +11,7 @@ recursive-include docs *
 recursive-include licenses *
 recursive-include cextern *
 recursive-include scripts *
+recursive-include experimental *
 
 prune build
 prune docs/_build

diff --git a/README.rst b/README.rst
@@ -1,18 +1,21 @@
 stginga
 =======
 
-.. image:: http://img.shields.io/badge/powered%20by-AstroPy-orange.svg?style=flat
-    :target: http://www.astropy.org
-    :alt: Powered by Astropy Badge
+.. image:: https://readthedocs.org/projects/stginga/badge/?version=latest
+    :target: https://stginga.readthedocs.io/en/latest/?badge=latest
+    :alt: Documentation Status
 
 .. image:: https://travis-ci.org/spacetelescope/stginga.svg?branch=master
     :target: https://travis-ci.org/spacetelescope/stginga
     :alt: Travis CI results
 
-.. image:: https://readthedocs.org/projects/stginga/badge/?version=latest
-    :target: https://stginga.readthedocs.io/en/latest/?badge=latest
-    :alt: Documentation Status
+.. image:: https://ci.appveyor.com/api/projects/status/ulg6cmh15xpyyvp5?svg=true
+    :target: https://ci.appveyor.com/project/pllim/stginga
+    :alt: Appveyor CI results
 
+.. image:: http://img.shields.io/badge/powered%20by-AstroPy-orange.svg?style=flat
+    :target: http://www.astropy.org
+    :alt: Powered by Astropy Badge
 
 `Ginga <https://github.com/ejeschke/ginga>`_ products specific to STScI data
 analysis.
diff --git a/appveyor.yml b/appveyor.yml
@@ -14,7 +14,7 @@ environment:
       # so Cython is required for testing. If your package does not include
       # Cython code, you can set CONDA_DEPENDENCIES=''
       #CONDA_DEPENDENCIES: "Cython"
-      CONDA_DEPENDENCIES: ""
+      CONDA_DEPENDENCIES: "numpy scipy astropy ginga"
 
   matrix:
 

diff --git a/astropy_helpers b/astropy_helpers
diff --git a/docs/_templates/autosummary/base.rst b/docs/_templates/autosummary/base.rst
diff --git a/docs/_templates/autosummary/class.rst b/docs/_templates/autosummary/class.rst
diff --git a/docs/_templates/autosummary/module.rst b/docs/_templates/autosummary/module.rst
diff --git a/docs/conf.py b/docs/conf.py
@@ -173,42 +173,3 @@
 
     edit_on_github_source_root = ""
     edit_on_github_doc_root = "docs"
-
-# -- Extra stuff specific to stginga -------------------------------------------
-
-# a simple/non-configurable extension that generates the rst files for ipython
-# notebooks
-def notebooks_to_rst(app):
-    from glob import glob
-
-    # post "big-split", nbconvert is a separate namespace
-    from nbconvert.nbconvertapp import NbConvertApp
-    from nbconvert.writers import FilesWriter
-
-    class OrphanizerWriter(FilesWriter):
-        def write(self, output, resources, **kwargs):
-            output = ':orphan:\n\n' + output
-            FilesWriter.write(self, output, resources, **kwargs)
-
-    olddir = os.path.abspath(os.curdir)
-    try:
-        srcdir = os.path.abspath(os.path.split(__file__)[0])
-        os.chdir(os.path.join(srcdir, 'stginga', 'notebooks'))
-        nbs = glob('*.ipynb')
-
-        app = NbConvertApp()
-        app.initialize(argv=[])
-        app.writer = OrphanizerWriter()
-
-        app.export_format = 'rst'
-        app.notebooks = nbs
-
-        app.start()
-    except:
-        pass
-    finally:
-        os.chdir(olddir)
-
-
-def setup(app):
-    app.connect('builder-inited', notebooks_to_rst)
diff --git a/docs/index.rst b/docs/index.rst
@@ -27,5 +27,4 @@ Using ``stginga``
 
    stginga/run
    stginga/plugins_manual/index
-   stginga/ipynb
    stginga/ref_api
diff --git a/docs/rtd-pip-requirements b/docs/rtd-pip-requirements
@@ -1,10 +1,5 @@
 numpy
-matplotlib
-Cython
 scipy>=0.18
 astropy-helpers
-astropy
-tornado
-jupyter_client
-nbconvert
-ginga>=2.6.2
+astropy>=2
+ginga>=2.7
diff --git a/docs/stginga/install.rst b/docs/stginga/install.rst
@@ -5,16 +5,20 @@ Installation
 
 ``stginga`` requires:
 
-* Astropy 1.1 or later.
-* SciPy 0.16 or later.
-* Ginga 2.6 or later, available from
+* Astropy 2.0 or later.
+* SciPy 0.18 or later.
+* Ginga 2.7 or later, available from
   `Ginga's GitHub page <https://github.com/ejeschke/ginga/>`_.
-* The latest version of ``stginga`` available from
-  `stginga's GitHub page <https://github.com/spacetelescope/stginga>`_.
 
-We suggest using  `Anaconda <https://www.continuum.io/downloads>`_ as a
-Python distribution that is known to work with ``stginga``.
+We suggest using `Anaconda <https://www.continuum.io/downloads>`_ as a
+Python distribution that is known to work with ``stginga``::
 
-To install ``stginga`` from source::
+    conda install stginga -c http://ssb.stsci.edu/astroconda
 
-    python setup.py install [--prefix=/my/install/path]
+Alternately, ``stginga`` 0.3 and beyond is also available on PyPI::
+
+    pip install stginga
+
+If you wish to install the development version instead::
+
+    pip install git+https://github.com/spacetelescope/stginga.git@master
diff --git a/docs/stginga/ipynb.rst b/docs/stginga/ipynb.rst
+7 −2		.travis.yml
+25 −0		CHANGES.rst
+2 −2		README.rst
+51 −9		ah_bootstrap.py
+1 −1		appveyor.yml
+1 −1		astropy_helpers/extern/automodapi/__init__.py
+21 −9		astropy_helpers/extern/automodapi/automodsumm.py
+1 −1		astropy_helpers/git_helpers.py
+1 −1		astropy_helpers/openmp_helpers.py
+3 −3		astropy_helpers/utils.py
+3 −1		astropy_helpers/version_helpers.py
+1 −1		setup.py
+0 −19		tox.ini