[Git][debian-gis-team/pycoast][upstream] New upstream version 1.2.2+dfsg

[Antonio Valentino]

Antonio Valentino pushed to branch upstream at Debian GIS Project / pycoast


Commits:
a2b056d9 by Antonio Valentino at 2019-01-17T06:58:21Z
New upstream version 1.2.2+dfsg
- - - - -


5 changed files:

- .travis.yml
- CHANGELOG.md
- pycoast/cw_base.py
- pycoast/cw_pil.py
- pycoast/version.py


Changes:

=====================================
.travis.yml
=====================================
@@ -5,7 +5,7 @@ env:
   - PYTHON_VERSION=$TRAVIS_PYTHON_VERSION
   - NUMPY_VERSION=stable
   - MAIN_CMD='python setup.py'
-  - CONDA_DEPENDENCIES='sphinx pillow numpy pyproj coveralls coverage mock aggdraw six pyshp'
+  - CONDA_DEPENDENCIES='sphinx pillow pyproj coveralls coverage mock aggdraw six pyshp'
   - PIP_DEPENDENCIES=''
   - SETUP_XVFB=False
   - EVENT_TYPE='push pull_request'
@@ -22,6 +22,9 @@ matrix:
     os: linux
   - env: PYTHON_VERSION=3.6
     os: osx
+  - env: PYTHON_VERSION=3.6
+    os: windows
+    language: bash
 install:
 - git clone --depth 1 git://github.com/astropy/ci-helpers.git
 - source ci-helpers/travis/setup_conda.sh


=====================================
CHANGELOG.md
=====================================
@@ -1,3 +1,14 @@
+## Version 1.2.2 (2019/01/16)
+
+### Pull Requests Merged
+
+#### Bugs fixed
+
+* [PR 24](https://github.com/pytroll/pycoast/pull/24) - Fix default font loading for 'add_grid'
+
+In this release 1 pull request was closed.
+
+
 ## Version 1.2.1 (2018/11/12)
 
 ### Pull Requests Merged


=====================================
pycoast/cw_base.py
=====================================
@@ -76,6 +76,9 @@ class ContourWriterBase(object):
     def _draw_grid_labels(self, draw, xys, linetype, txt, font, **kwargs):
         """Draw text with default PIL module
         """
+        if font is None:
+            # NOTE: Default font does not use font size in PIL writer
+            font = self._get_font(kwargs.get('outline', 'black'), font, 12)
         placement_def = kwargs[linetype].lower()
         for xy in xys:
             # note xy[0] is xy coordinate pair,
@@ -173,9 +176,6 @@ class ContourWriterBase(object):
                 kwargs['minor_outline_opacity']
             minor_line_kwargs['width'] = kwargs['minor_width']
 
-        # set text fonts
-        if font is None:
-            font = ImageFont.load_default()
         # text margins (at sides of image frame)
         y_text_margin = 4
         x_text_margin = 4


=====================================
pycoast/cw_pil.py
=====================================
@@ -464,4 +464,6 @@ class ContourWriterPIL(ContourWriterBase):
 
     def _get_font(self, outline, font_file, font_size):
         """Return a font."""
+        if font_file is None:
+            return ImageFont.load_default()
         return ImageFont.truetype(font_file, font_size)


=====================================
pycoast/version.py
=====================================
@@ -23,9 +23,9 @@ 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: v1.2.1)"
-    git_full = "eb186a0495fe0578f35c30c625ce77d337efd236"
-    git_date = "2018-11-12 13:16:08 -0600"
+    git_refnames = " (HEAD -> master, tag: v1.2.2)"
+    git_full = "5ca4031ada1fadfb61c8dd73259d33c4f69498b4"
+    git_date = "2019-01-16 10:44:14 -0600"
     keywords = {"refnames": git_refnames, "full": git_full, "date": git_date}
     return keywords
 



View it on GitLab: https://salsa.debian.org/debian-gis-team/pycoast/commit/a2b056d9277358f3d6767db6629c2fd1a9a5cab1

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/pycoast/commit/a2b056d9277358f3d6767db6629c2fd1a9a5cab1
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/20190117/f1cd8e1d/attachment-0001.html>