Merge pull request #442 from WeatherGod/doc_updates

Updating old sourceforge links. Other doc improvments and such.

Author: WeatherGod

doc/index.rst

@@ -13,3 +13,11 @@ Indices and tables
 * :ref:`genindex`
 * :ref:`modindex`
 * :ref:`search`
+
+Deprecation Notice
+==================
+
+Basemap is deprecated in favor of the
+`Cartopy project <http://scitools.org.uk/cartopy/>`_.
+See notes in :ref:`deprecation_notice` for more details.
+

doc/users/download.rst

@@ -1,5 +1,9 @@
 Download
 ========
 
-Source code and Windows installers can be found
-`here <http://sourceforge.net/projects/matplotlib/files/matplotlib-toolkits/>`__ 
+Source code can be found
+`here <http://github.com/matplotlib/basemap/releases/>`__
+
+The recommended installation method is using anaconda through the
+conda-forge channel. Basemap is no longer uploaded to PyPI due to its
+size and non-python external dependencies.

doc/users/examples.rst

@@ -20,19 +20,19 @@ There are a number of Basemap instance methods for plotting data:
 * :func:`~mpl_toolkits.basemap.Basemap.drawgreatcircle`: draw a `great circle <http://en.wikipedia.org/wiki/Great_circle>`__.
 
 Many of these instances methods simply forward to the corresponding matplotlib
-`Axes <http://matplotlib.sourceforge.net/api/axes_api.html>`__ instance method, 
+`Axes <https://matplotlib.org/api/axes_api.html>`__ instance method, 
 with some extra pre/post processing and argument checking. 
 You can also plot on the map directly with the matplotlib 
-`pyplot <http://matplotlib.sourceforge.net/api/pyplot_api.html>`__ interface,
-or the `OO api <http://matplotlib.sourceforge.net/examples/api/index.html>`__, 
-using the `Axes <http://matplotlib.sourceforge.net/api/axes_api.html>`__ instance 
+`pyplot <https://matplotlib.org/api/pyplot_api.html>`__ interface,
+or the `OO api <https://matplotlib.org/examples/api/index.html>`__, 
+using the `Axes <https://matplotlib.org/api/axes_api.html>`__ instance 
 associated with the Basemap.
 
 For more specifics of how to use the Basemap instance methods,
 see :ref:`api-index`.
 
 Here are the examples (many of which utilize the 
-`netcdf4-python <http://netcdf4-python.googlecode.com>`__ module
+`netcdf4-python <http://unidata.github.io/netcdf4-python/>`__ module
 to retrieve datasets over http):
 
 * Plot contour lines on a basemap
@@ -74,4 +74,4 @@ to retrieve datasets over http):
 
 * Draw day-night terminator on a map.
 
-.. plot:: users/figures/plotdaynight.py
+.. plot:: users/figures/plotdaynight.py

doc/users/intro.rst

@@ -13,7 +13,7 @@ are other libraries that provide similar capabilities in Python.
 
 Basemap does not do any plotting on it's own, but provides the facilities to transform coordinates to one of 25 different map projections (using the 
 `PROJ.4 <http://trac.osgeo.org/proj/>`_ C library).  `Matplotlib
-<http://matplotlib.sourceforge.net>`_ is then
+<https://matplotlib.org>`_ is then
 used to plot contours, images, vectors, lines or points
 in the transformed coordinates.
 Shoreline, river and political boundary
@@ -30,6 +30,8 @@ the years, the capabilities of Basemap have evolved as scientists in other
 disciplines (such as biology, geology and geophysics) requested and 
 contributed new features.
 
+.. _deprecation_notice:
+
 Cartopy, New Management, and EoL Announcement
 =============================================
 
@@ -42,7 +44,7 @@ Cartopy. All maintenance and development efforts should be focused on
 Cartopy.
 
 Ben Root has volunteered to take over maintenance of Basemap until 2020.
-Pull requests will be reviewed, and bugs will be fixed. Also, the
+Pull requests will be reviewed, and regressions will be fixed. Also, this
 maintenance will ensure compatibility with packages like NumPy and Matplotlib.
 New features will be accepted, but we stress that new development efforts
 should be focused on Cartopy. When Python 2.7 is officially EoL'ed in 2020,

requirements.txt

@@ -1,4 +1,4 @@
-matplotlib>=1.0.0
+matplotlib>=1.0.0,!=3.0.1
 numpy>=1.2.1
 pyproj>=1.9.3
 pyshp>=1.2.0

setup.py

@@ -126,7 +126,7 @@ def checkversion(GEOS_dir):
   on map projections with coastlines, lakes, rivers and political boundaries.
   See http://matplotlib.org/basemap/users/examples.html for
   examples of what it can do.""",
-  url               = "http://matplotlib.org/basemap/",
+  url               = "https://matplotlib.org/basemap/",
   download_url      = "https://github.com/matplotlib/basemap/archive/v{0}rel.tar.gz".format(__version__),
   author            = "Jeff Whitaker",
   author_email      = "[email protected]",