[Git][debian-gis-team/python-cartopy][upstream] New upstream version 0.18.0+dfsg

[Bas Couwenberg]

Bas Couwenberg pushed to branch upstream at Debian GIS Project / python-cartopy


Commits:
70bc628e by Bas Couwenberg at 2020-05-04T05:50:08+02:00
New upstream version 0.18.0+dfsg
- - - - -


5 changed files:

- docs/source/_static/version_switch.js
- docs/source/whats_new.rst
- lib/cartopy/_version.py
- lib/cartopy/examples/contour_labels.py
- lib/cartopy/io/img_tiles.py


Changes:

=====================================
docs/source/_static/version_switch.js
=====================================
@@ -5,7 +5,8 @@
   'use strict';
 
   var all_versions = {
-    'latest': '0.17',
+    'latest': '0.18',
+    'v0.17': '0.17',
     'v0.16': '0.16',
     'v0.15': '0.15',
     'v0.14': '0.14',


=====================================
docs/source/whats_new.rst
=====================================
@@ -2,7 +2,7 @@ What's New in cartopy 0.18
 ==========================
 
 :Release: 0.18.0
-:Date: XXX Mar 2020
+:Date: 3rd May 2020
 
 For a full list of included Pull Requests and closed Issues, please see the
 `0.18 milestone <https://github.com/SciTools/cartopy/milestone/25>`_.


=====================================
lib/cartopy/_version.py
=====================================
@@ -23,8 +23,8 @@ def get_keywords():
     # setup.py/versioneer.py will grep for the variable names, so they must
     # each be defined on a line of their own. _version.py will just call
     # get_keywords().
-    git_refnames = " (HEAD -> master, tag: v0.18.0rc1, v0.18.x)"
-    git_full = "e6c1d06b7a7ecf808c8e65d26c3644c0af990c00"
+    git_refnames = " (tag: v0.18.0, refs/pull/1548/head, v0.18.x)"
+    git_full = "178a15e39d085758832d30aa9f77f34f708a7d1e"
     keywords = {"refnames": git_refnames, "full": git_full}
     return keywords
 


=====================================
lib/cartopy/examples/contour_labels.py
=====================================
@@ -14,8 +14,10 @@ from cartopy.examples.waves import sample_data
 
 
 def main():
+    fig = plt.figure()
+
     # Setup a global EckertIII map with faint coastlines.
-    ax = plt.axes(projection=ccrs.EckertIII())
+    ax = fig.add_subplot(1, 1, 1, projection=ccrs.EckertIII())
     ax.set_global()
     ax.coastlines('110m', alpha=0.1)
 
@@ -36,10 +38,10 @@ def main():
     # plt.setp(line_c.collections, visible=False)
 
     # Add a colorbar for the filled contour.
-    plt.colorbar(filled_c, orientation='horizontal')
+    fig.colorbar(filled_c, orientation='horizontal')
 
     # Use the line contours to place contour labels.
-    plt.clabel(
+    ax.clabel(
         line_c,  # Typically best results when labelling line contours.
         colors=['black'],
         manual=False,  # Automatic placement vs manual placement.


=====================================
lib/cartopy/io/img_tiles.py
=====================================
@@ -1,4 +1,4 @@
-# (C) British Crown Copyright 2011 - 2019, Met Office
+# (C) British Crown Copyright 2011 - 2020, Met Office
 #
 # This file is part of cartopy.
 #
@@ -552,8 +552,9 @@ class OrdnanceSurvey(GoogleWTS):
             The style of the Ordnance Survey map tiles. One of 'Outdoor',
             'Road', 'Light', 'Night', 'Leisure'. Defaults to 'Road'.
             Details about the style of layer can be found at:
-             - https://apidocs.os.uk/docs/layer-information
-             - https://apidocs.os.uk/docs/map-styles
+
+            - https://apidocs.os.uk/docs/layer-information
+            - https://apidocs.os.uk/docs/map-styles
         desired_tile_form: optional
             Defaults to 'RGB'.
         """



View it on GitLab: https://salsa.debian.org/debian-gis-team/python-cartopy/-/commit/70bc628e103a2d8d18d86fd04e1e9b1c7f3249da

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/python-cartopy/-/commit/70bc628e103a2d8d18d86fd04e1e9b1c7f3249da
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20200504/b12659fd/attachment-0001.html>