Doc changes

changelog/2830.removal.rst

@@ -1,2 +1 @@
 Removed `MapCube` in favour of `MapSequence`
-

docs/code_ref/net.rst

@@ -17,6 +17,7 @@ Fido ~`sunpy.net.fido_factory.UnifiedDownloaderFactory` can be used like so::
 
 .. automodapi:: sunpy.net.fido_factory
 
+
 Dataretriever
 -------------
 
@@ -65,3 +66,9 @@ HELIO
 
 .. automodapi:: sunpy.net.helio.hec
     :headings: #~
+
+Attr
+----
+
+.. automodapi:: sunpy.net.attr
+   :no-heading:

docs/dev_guide/funding.rst

@@ -6,14 +6,21 @@ Submodule and funding
 Here we list whatever parts of SunPy have been funded by external sources such as Grants or Google Summer of Code (GSoC) and the like.
 This is a rough work in progress.
 
+Database
+--------
+
+Google Summer of Code (2013)
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+database/attrs.py
 
 Net
 ---
 
 Google Summer of Code (2014)
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-fido_factory.py, vso.py, the dataretriever Submodule
+fido_factory.py, vso.py, most of the dataretriever submodule
 
 ESA Summer of Code in Space (2011)
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

sunpy/database/attrs.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 from sqlalchemy import or_, and_, not_
 
 from sunpy.time import parse_time

sunpy/net/attr.py

@@ -24,7 +24,6 @@
 from astropy.utils.misc import isiterable
 
 from sunpy.util.multimethod import MultiMethod
-from sunpy.extern.six import iteritems
 
 _ATTR_TUPLE = namedtuple("attr", "name name_long desc")
 _REGEX = re.compile(r"^[\d]([^\d].*)?$")
@@ -121,7 +120,7 @@ def __and__(self, other):
         return AttrAnd([self, other])
 
     def __hash__(self):
-        return hash(frozenset(iteritems(vars(self))))
+        return hash(frozenset(vars(self).items()))
 
     def __or__(self, other):
         # Optimization.
@@ -151,7 +150,7 @@ def update_values(cls, adict):
 
         **It is recommended that clients register values for all attrs used by their `_can_handle_query` method.**
 
-        Paramaters
+        Parameters
         ----------
 
         adcit : `dict`
@@ -207,17 +206,20 @@ def update_values(cls, adict):
 
 
 class DummyAttr(Attr):
-    """ Empty attribute. Useful for building up queries. Returns other
+    """
+    Empty attribute. Useful for building up queries. Returns other
     attribute when ORed or ANDed. It can be considered an empty query
     that you can use as an initial value if you want to build up your
     query in a loop.
 
     So, if we wanted an attr matching all the time intervals between the times
     stored as (from, to) tuples in a list, we could do.
 
-    attr = DummyAttr()
-    for from\_, to in times:
-        attr |= Time(from\_, to)
+    .. code-block:: python
+
+       attr = DummyAttr()
+       for from, to in times:
+           attr |= Time(from, to)
     """
     def __and__(self, other):
         return other
@@ -351,7 +353,7 @@ def __repr__(self):
         return "<ValueAttr({att!r})>".format(att=self.attrs)
 
     def __hash__(self):
-        return hash(frozenset(self.attrs.iteritems.items()))
+        return hash(frozenset(self.attrs.items()))
 
     def __eq__(self, other):
         if not isinstance(other, self.__class__):

sunpy/net/dataretriever/client.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import copy
 import os
 from collections import OrderedDict, namedtuple

sunpy/net/jsoc/jsoc.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import print_function, absolute_import
-
 import os
 import time
 import urllib

sunpy/timeseries/sources/rhessi.py

@@ -84,7 +84,7 @@ def peek(self, title="RHESSI Observing Summary Count Rate", **kwargs):
 
         lc_linecolors = rhessi.hsi_linecolors()
 
-        for lc_color, (item, frame) in zip(lc_linecolors, self.data.iteritems()):
+        for lc_color, (item, frame) in zip(lc_linecolors, self.data.items()):
             axes.plot_date(self.data.index, frame.values, '-', label=item, lw=2, color=lc_color)
 
         axes.set_yscale("log")

tox.ini

@@ -9,6 +9,7 @@ deps =
     astropydev: git+git://github.com/astropy/astropy
     numpydev: git+git://github.com/numpy/numpy
     build_docs: sunpy-sphinx-theme
+    build_docs: git+git://github.com/hawkowl/towncrier
     codecov
     pytest-rerunfailures
     pytest-sugar