Merge pull request #293 from WeatherGod/metadata_updates

WeatherGod · web-flow · commit dd6d3f606aa7 · 2017-02-01T22:13:22.000-05:00
Version bump to 1.1.0. Update Changelog. Update package metadata.
diff --git a/.travis.yml b/.travis.yml
@@ -47,11 +47,6 @@ matrix:
         - NUMPY=numpy==1.7.0
         - MPL=matplotlib==1.2.0
         - BUILD_LIBGEOS=internal
-    - python: 3.3
-      env: 
-        - NUMPY=numpy==1.7.0
-        - MPL=matplotlib==1.2.0
-        - BUILD_LIBGEOS=internal
 
     # "middle of the road" environment
     # use prepackaged binaries
@@ -60,6 +55,7 @@ matrix:
       env: 
         - MPL=matplotlib==1.4.3
         - NUMPY=numpy==1.9.3
+        - BUILD_LIBGEOS=internal
       
     # "latest and greatest" stable environments
     # this uses the current stable versions
@@ -70,7 +66,10 @@ matrix:
     - python: 3.5
       env: 
         - BUILD_LIBGEOS=3.5.0
-    
+    - python: 3.6
+      env: 
+        - BUILD_LIBGEOS=3.5.0
+   
     # "current development" environment
     # this test is diagnostic for development versions and is not required to pass
     - python: "nightly"
diff --git a/Changelog b/Changelog
@@ -1,20 +1,27 @@
-version 1.0.8 (not yet released)
+version 1.1.0 (git tag v1.1.0rel)
 --------------------------------
-* removes inline pyshp and pyproj code and uses makes these packages required
-  external dependencies (handling issue 230).
-* add 'textcolor' kwarg to drawmeridians and drawparallels (issue 145).
+* Updated packaged data to use GSHHG v2.3.6 (PR #311 & #320)
+* pyshp/pyproj are now external dependencies (PR #234)
+* Proper clipping of plots regardless of projection (issue #175)
+* drawmapscale() supports "feet" as an input unit (PR #289)
+* nightshade() supports datetime timezone-aware datetime objects
+  as long as the timezone is UTC. Still assumes timezone-naive
+  objects are UTC as well. (issue #272)
+* Properly perform input validation/casting (issue #260)
+* Support newer versions of OWSLib (PR #259)
+* Use integer indexes (PR #246)
+* Stop ResourceWarnings for unclosed files in py3k (PR #244)
+* add 'textcolor' kwarg to drawmeridians and drawparallels (issue #145).
 * don't assume grid is regular when adding cyclic point in addcyclic. 
   New kwargs 'axis' and 'cyclic' added.  More than one array
-  can be handled at a time, as long as the last one is longitude. Issue 139.
-* fix for coastline drawing glitch (issue 123).
-* update shapefile.py to version 1.2.0 from pyshp.googlecode.com. Add back
-  in modification clobbered in upgrade to version 1.1.7 (issue 30).
+  can be handled at a time, as long as the last one is longitude. (issue #139).
+* fix for coastline drawing glitch (issue #123).
 * added 'facecolor' keyward argument to drawcounties() method; gives user
   ability to fill counties with specified matplotlib color argument.
 * fix drawgreatcircle bug so that lines exiting and reentering a projection
   region don't draw horizontally across the map. 
 * on non-windows platforms, only link against libgeos C API (and not against
-  C++ API anymore; issue 140). This is recommended by the authors/maintainers
+  C++ API anymore; issue #140). This is recommended by the authors/maintainers
   of GEOS.  Also, this means that on e.g. Debian Linux, basemap can now be
   installed from source simply using 'pip install basemap' when the libgeos
   packages are installed globally using the package management.
diff --git a/doc/conf.py b/doc/conf.py
@@ -42,7 +42,7 @@
 
 # General substitutions.
 project = 'Basemap Matplotlib Toolkit'
-copyright = '2011, Jeffrey Whitaker'
+copyright = '2011, Jeffrey Whitaker; 2016 The matplotlib development team'
 
 # The default replacements for |version| and |release|, also used in various
 # other places throughout the built documents.
diff --git a/doc/index.rst b/doc/index.rst
@@ -1,5 +1,5 @@
-Welcome to the Matplotlib Basemap Toolkit documentation!
-========================================================
+Welcome to the Matplotlib Basemap Toolkit documentation
+=======================================================
 
 .. toctree::
    :maxdepth: 2
diff --git a/doc/users/installing.rst b/doc/users/installing.rst
@@ -21,28 +21,27 @@ Python 2.4 (or later, including Python 3)
 numpy 1.2.1 (or later)
     array support for python (`download <http://sourceforge.net/project/showfiles.php?group_id=1369&package_id=175103>`__)
 
-**Required libraries that ship with basemap**
+`PROJ4 <https://trac.osgeo.org/proj/>`__ Cartographic Projections Library.
+
+**Required library that ships with basemap**
 
 `GEOS <http://trac.osgeo.org/geos/>`__ (Geometry Engine - Open Source) library 3.1.1 or later.
     Source code is included in the geos-3.3.3 directory. 
     When building from source, must be built and installed separately
     from basemap (see build instructions below).
     Included in Windows binary installers.
 
-`PROJ4 <http://trac.osgeo.org/proj/>`__ Cartographic Projections Library.
-    Patched version automatically built into basemap.
-
 **Optional libraries**
 
-PIL
-    Python Imaging Library (`download <http://www.pythonware.com/products/pil/>`__),
+Pillow
+    Python Imaging Library (`download <https://python-pillow.org/>`__),
     only needed for :func:`~mpl_toolkits.basemap.Basemap.bluemarble`, :func:`~mpl_toolkits.basemap.Basemap.etopo`, :func:`~mpl_toolkits.basemap.Basemap.shadedrelief` and :func:`~mpl_toolkits.basemap.Basemap.warpimage` instance methods.
 
 Installation
 ============
 
 Download either Windows binary installers or source tarballs 
-`here <http://sourceforge.net/projects/matplotlib/files/matplotlib-toolkits/>`__. 
+`here <https://github.com/matplotlib/basemap/releases/>`__. 
 
 To install from the source, follow these steps:
 
diff --git a/doc/users/intro.rst b/doc/users/intro.rst
@@ -21,14 +21,30 @@ datasets (from `Generic Mapping Tools <http://gmt.soest.hawaii.edu/>`_)
 are provided, along with methods for plotting them. The `GEOS library 
 <http://geos.refractions.net>`_ is used internally to clip the coastline and polticial boundary features to the desired map projection region.
 
-Basemap provides facilities for reading `shapefiles
-<http://en.wikipedia.org/wiki/Shapefile>`_.
-
-Basemap is geared toward the needs of earth scientists, particular 
-oceanographers and meteorologists.  I originally wrote Basemap to help in my
-research (climate and weather forecasting), since at the time 
+Basemap is geared toward the needs of earth scientists, particularly
+oceanographers and meteorologists.  Jeff Whitaker originally wrote Basemap
+to help in his research (climate and weather forecasting), since at the time 
 `CDAT <http://www-pcmdi.llnl.gov/software/cdat/support/vcs/vcs.html>`_ was 
 the only other tool in python for plotting data on map projections.  Over
 the years, the capabilities of Basemap have evolved as scientists in other
 disciplines (such as biology, geology and geophysics) requested and 
-contributed new features.  
+contributed new features.
+
+Cartopy, New Management, and EoL Announcement
+=============================================
+
+Starting in 2016, Basemap came under new management. The
+`Cartopy project <http://scitools.org.uk/cartopy/>`_ will replace
+Basemap, but it hasn't yet implemented all of Basemap's features.
+All new software development should try to use Cartopy whenever possible,
+and existing software should start the process of switching over to use
+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
+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,
+a release of Basemap will be made and support from Ben Root will end.
+
diff --git a/lib/mpl_toolkits/basemap/__init__.py b/lib/mpl_toolkits/basemap/__init__.py
@@ -49,7 +49,7 @@
 else:
     basemap_datadir = os.sep.join([os.path.dirname(__file__), 'data'])
 
-__version__ = '1.0.8'
+__version__ = '1.1.0'
 
 # module variable that sets the default value for the 'latlon' kwarg.
 # can be set to True by user so plotting functions can take lons,lats
diff --git a/setup.py b/setup.py
@@ -115,20 +115,22 @@ def checkversion(GEOS_dir):
   "pyshp >= 1.2.0"
 ]
 
-__version__ = "1.0.8"
+__version__ = "1.1.0"
 setup(
   name              = "basemap",
   version           = __version__,
   description       = "Plot data on map projections with matplotlib",
   long_description  = """
   An add-on toolkit for matplotlib that lets you plot data
   on map projections with coastlines, lakes, rivers and political boundaries.
-  See http://www.scipy.org/wikis/topical_software/Maps for an
-  example of what it can do.""",
-  url               = "http://matplotlib.sourceforge.net/toolkits.html",
-  download_url      = "https://downloads.sourceforge.net/project/matplotlib/matplotlib-toolkits/basemap-{0}/basemap-{0}.tar.gz".format(__version__),
+  See http://matplotlib.org/basemap/users/examples.html for
+  examples of what it can do.""",
+  url               = "http://matplotlib.org/basemap/",
+  download_url      = "https://github.com/matplotlib/basemap/archive/v{0}rel.tar.gz".format(__version__),
   author            = "Jeff Whitaker",
   author_email      = "jeffrey.s.whitaker@noaa.gov",
+  maintainer        = "Ben Root",
+  maintainer_email  = "ben.v.root@gmail.com",
   install_requires  = requirements,
   platforms         = ["any"],
   license           = "OSI Approved",
