pycoast 1.7.0__tar.gz → 1.8.0__tar.gz

pycoast-1.8.0/LICENSE.txt

@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

{pycoast-1.7.0 → pycoast-1.8.0}/MANIFEST.in

@@ -3,7 +3,6 @@ recursive-include docs/source *
 include pycoast/tests/*.png
 recursive-include pycoast/tests/ *
 include LICENSE.txt
-include MANIFEST.in
 
 include versioneer.py
 include pycoast/version.py

{pycoast-1.7.0/pycoast.egg-info → pycoast-1.8.0}/PKG-INFO

@@ -1,23 +1,46 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: pycoast
-Version: 1.7.0
+Version: 1.8.0
 Summary: Writing of coastlines, borders and rivers to images in Python
-Home-page: UNKNOWN
 Author: Esben S. Nielsen
 Author-email: esn@dmi.dk
-License: UNKNOWN
-Platform: UNKNOWN
+License: Apache-2.0
 Classifier: Development Status :: 5 - Production/Stable
-Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
 Classifier: Programming Language :: Python
 Classifier: Operating System :: OS Independent
 Classifier: Intended Audience :: Science/Research
 Classifier: Topic :: Scientific/Engineering
 Requires-Python: >3.9
+License-File: LICENSE.txt
+Requires-Dist: aggdraw
+Requires-Dist: pyshp
+Requires-Dist: numpy
+Requires-Dist: pyproj
+Requires-Dist: pillow
 Provides-Extra: docs
+Requires-Dist: sphinx; extra == "docs"
+Requires-Dist: pyresample; extra == "docs"
+Requires-Dist: pytest; extra == "docs"
+Requires-Dist: pytest-lazy-fixtures; extra == "docs"
+Requires-Dist: sphinx_rtd_theme; extra == "docs"
+Requires-Dist: sphinxcontrib-apidoc; extra == "docs"
 Provides-Extra: tests
-License-File: LICENSE.txt
-License-File: AUTHORS.md
+Requires-Dist: pyresample; extra == "tests"
+Requires-Dist: pytest; extra == "tests"
+Requires-Dist: pytest-cov; extra == "tests"
+Requires-Dist: coverage; extra == "tests"
+Requires-Dist: coveralls; extra == "tests"
+Requires-Dist: pytest-lazy-fixtures; extra == "tests"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: license
+Dynamic: license-file
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 PyCoast
 =======
@@ -66,4 +89,19 @@ Example
     >>> cw.add_borders(img, area_def, outline=(255, 0, 0))
     >>> img.show()
 
+License
+-------
+
+Copyright 2011 Pycoast developers
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use these files except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
 
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

{pycoast-1.7.0 → pycoast-1.8.0}/README

@@ -44,3 +44,20 @@ Example
     >>> cw.add_rivers(img, area_def, level=5, outline='blue')
     >>> cw.add_borders(img, area_def, outline=(255, 0, 0))
     >>> img.show()
+
+License
+-------
+
+Copyright 2011 Pycoast developers
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use these files except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

{pycoast-1.7.0 → pycoast-1.8.0}/docs/source/conf.py

@@ -11,6 +11,7 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 """Sphinx configuration file for generating package documentation."""
+
 from __future__ import annotations
 
 import os

{pycoast-1.7.0 → pycoast-1.8.0}/pycoast/__init__.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 """Pycoast package for adding geographic-based decorations to images."""
+
 from pycoast.cw_base import get_resolution_from_area  # noqa
 
 from .cw_agg import ContourWriterAGG  # noqa

{pycoast-1.7.0 → pycoast-1.8.0}/pycoast/cw_agg.py

@@ -1,21 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-# pycoast, Writing of coastlines, borders and rivers to images in Python
-#
-# Copyright (C) 2011-2020 PyCoast Developers
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """ContourWriter based on the aggdraw library."""
 
 import logging
@@ -133,8 +115,8 @@ class ContourWriterAGG(ContourWriterBase):
         outline_opacity = kwargs.get("outline_opacity", 255)
 
         # draw '|'
-        (x_bm, y_bm) = (x, y - half_ptsize)  # bottom middle point
-        (x_tm, y_tm) = (x, y + half_ptsize)  # top middle point
+        x_bm, y_bm = (x, y - half_ptsize)  # bottom middle point
+        x_tm, y_tm = (x, y + half_ptsize)  # top middle point
         self._draw_line(
             draw,
             [x_bm, y_bm, x_tm, y_tm],
@@ -143,8 +125,8 @@ class ContourWriterAGG(ContourWriterBase):
             outline_opacity=outline_opacity,
         )
         # draw '-'
-        (x_lm, y_lm) = (x - half_ptsize, y)  # left middle point
-        (x_rm, y_rm) = (x + half_ptsize, y)  # right middle point
+        x_lm, y_lm = (x - half_ptsize, y)  # left middle point
+        x_rm, y_rm = (x + half_ptsize, y)  # right middle point
         self._draw_line(
             draw,
             [x_lm, y_lm, x_rm, y_rm],
@@ -153,8 +135,8 @@ class ContourWriterAGG(ContourWriterBase):
             outline_opacity=outline_opacity,
         )
         # draw '/'
-        (x_bl, y_bl) = (x - half_ptsize, y - half_ptsize)  # bottom left point
-        (x_tr, y_tr) = (x + half_ptsize, y + half_ptsize)  # top right point
+        x_bl, y_bl = (x - half_ptsize, y - half_ptsize)  # bottom left point
+        x_tr, y_tr = (x + half_ptsize, y + half_ptsize)  # top right point
         self._draw_line(
             draw,
             [x_bl, y_bl, x_tr, y_tr],
@@ -163,8 +145,8 @@ class ContourWriterAGG(ContourWriterBase):
             outline_opacity=outline_opacity,
         )
         # draw '\'
-        (x_tl, y_tl) = (x - half_ptsize, y + half_ptsize)  # top left point
-        (x_br, y_br) = (x + half_ptsize, y - half_ptsize)  # bottom right point
+        x_tl, y_tl = (x - half_ptsize, y + half_ptsize)  # top left point
+        x_br, y_br = (x + half_ptsize, y - half_ptsize)  # bottom right point
         self._draw_line(
             draw,
             [x_tl, y_tl, x_br, y_br],

{pycoast-1.7.0 → pycoast-1.8.0}/pycoast/cw_base.py

@@ -1,22 +1,5 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-# pycoast, Writing of coastlines, borders and rivers to images in Python
-#
-# Copyright (C) 2011-2022 PyCoast Developers
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """Base class for contour writers."""
+
 from __future__ import annotations
 
 import ast
@@ -26,6 +9,7 @@ import json
 import logging
 import math
 import os
+from pathlib import Path
 from typing import Generator
 
 import numpy as np
@@ -501,11 +485,11 @@ class ContourWriterBase(object):
         return overlays
 
     def add_overlay_from_dict(self, overlays, area_def, cache_epoch=None, background=None):
-        """Create and return a transparent image adding all the overlays contained in the `overlays` dict.
+        """Create and return a transparent image adding all the overlays contained in the ``overlays`` dict.
 
         Optionally caches overlay results for faster rendering of images with
         the same provided AreaDefinition and parameters. Cached results are
-        identified by hashing the AreaDefinition and the overlays dictionary.
+        identified by hashing the AreaDefinition and the ``overlays`` dictionary.
 
         Note that if ``background`` is provided and caching is not used, the
         result will be the final result of applying the overlays onto the
@@ -530,24 +514,33 @@ class ContourWriterBase(object):
                 provided dictionary (see below).
             background: pillow image instance
                 The image on which to write the overlays on. If it's None (default),
-                a new image is created, otherwise the provide background is
+                a new image is created, otherwise the provided background is
                 used and changed *in place*.
 
+        The keys in ``overlays`` that will be taken into account are:
+        cache, coasts, rivers, borders, shapefiles, grid, cities, points
+
+        For all of them except ``cache``, the items are the same as the
+        corresponding functions in pycoast, so refer to the docstrings of
+        these functions (add_coastlines, add_rivers, add_borders,
+        add_shapefile_shapes, add_grid, add_cities, add_points).
+        For cache, two parameters are configurable:
 
-            The keys in `overlays` that will be taken into account are:
-            cache, coasts, rivers, borders, shapefiles, grid, cities, points
+        - `file`:
+            specify the directory and the prefix
+            of the file to save the caches decoration to (for example
+            /var/run/black_coasts_red_borders)
+        - `regenerate`:
+            True or False (default) to force the overwriting
+            of an already cached file.
 
-            For all of them except `cache`, the items are the same as the
-            corresponding functions in pycoast, so refer to the docstrings of
-            these functions (add_coastlines, add_rivers, add_borders,
-            add_shapefile_shapes, add_grid, add_cities, add_points).
-            For cache, two parameters are configurable:
+        :Returns: PIL.Image.Image
 
-            - `file`: specify the directory and the prefix
-                  of the file to save the caches decoration to (for example
-                  /var/run/black_coasts_red_borders)
-            - `regenerate`: True or False (default) to force the overwriting
-                  of an already cached file.
+            Resulting overlays as an Image object. If caching was used then
+            the Image wraps an open file and should be closed by the caller.
+            If caching was not used or the cached image was recreated then
+            this is an in-memory Image object. Regardless, it can be closed
+            by calling the ``.close()`` method of the Image.
 
         """
         overlay_helper = _OverlaysFromDict(self, overlays, area_def, cache_epoch, background)
@@ -556,12 +549,22 @@ class ContourWriterBase(object):
     def add_overlay_from_config(self, config_file, area_def, background=None):
         """Create and return a transparent image adding all the overlays contained in a configuration file.
 
+        See :meth:`add_overlay_from_dict` for more information.
+
         :Parameters:
             config_file : str
                 Configuration file name
             area_def : object
                 Area Definition of the creating image
 
+        :Returns: PIL.Image.Image
+
+            Resulting overlays as an Image object. If caching was used then
+            the Image wraps an open file and should be closed by the caller.
+            If caching was not used or the cached image was recreated then
+            this is an in-memory Image object. Regardless, it can be closed
+            by calling the ``.close()`` method of the Image.
+
         """
         overlays = self._config_to_dict(config_file)
         return self.add_overlay_from_dict(overlays, area_def, os.path.getmtime(config_file), background)
@@ -705,8 +708,7 @@ class ContourWriterBase(object):
         # cities.red is a reduced version of the files avalable at http://download.geonames.org
         # Fields: 0=name (UTF-8), 1=asciiname, 2=longitude [°E], 3=latitude [°N], 4=countrycode
         cities_filename = os.path.join(db_root_path, os.path.join("CITIES", "cities.txt"))
-        cities_parser = GeoNamesCitiesParser(cities_filename)
-        for city_name, lon, lat in cities_parser.iter_cities_names_lon_lat(cities_list):
+        for city_name, lon, lat in iter_cities_names_lon_lat(cities_filename, cities_list):
             try:
                 x, y = area_def.get_array_indices_from_lonlat(lon, lat)
             except ValueError:
@@ -1132,14 +1134,12 @@ def _get_pixel_index(shape, area_extent, x_size, y_size, prj, x_offset=0, y_offs
     return index_arrays, is_reduced
 
 
-class GeoNamesCitiesParser:
-    """Helper for parsing citiesN.txt files from GeoNames.org."""
-
-    def __init__(self, cities_filename: str):
-        self._cities_file = open(cities_filename, mode="r", encoding="utf-8")
-
-    def iter_cities_names_lon_lat(self, cities_list: list[str]) -> Generator[tuple[str, float, float], None, None]:
-        for city_row in self._cities_file:
+def iter_cities_names_lon_lat(
+    cities_filename: str | Path, cities_list: list[str]
+) -> Generator[tuple[str, float, float], None, None]:
+    """Iterate over citiesN.txt files from GeoNames.org."""
+    with open(cities_filename, mode="r", encoding="utf-8") as cities_file:
+        for city_row in cities_file:
             city_info = city_row.split("\t")
             if not city_info or not (city_info[1] in cities_list or city_info[2] in cities_list):
                 continue
@@ -1441,7 +1441,7 @@ class _OverlaysFromDict:
 def _apply_cached_foreground_on_background(background, foreground):
     premult_foreground = foreground.convert("RGBa")
     if background.mode == "RGBA":
-        # Cached foreground and background are both RGBA, not extra conversions needed
+        # Cached foreground and background are both RGBA, no extra conversions needed
         background.paste(premult_foreground, mask=premult_foreground)
         return
     background_rgba = background.convert("RGBA")
@@ -1521,7 +1521,7 @@ class _GridDrawer:
         min_lons[min_lons > 180] = min_lons[min_lons > 180] - 360
 
         # Get min_lons not in maj_lons
-        min_lons = np.lib.arraysetops.setdiff1d(min_lons, maj_lons)
+        min_lons = np.setdiff1d(min_lons, maj_lons)
 
         # lats along major lon lines
         lin_lats = np.arange(
@@ -1542,7 +1542,7 @@ class _GridDrawer:
         min_lats = np.arange(round_lat_min + increase_min_lat, lat_max - shorten_max_lat, dlat)
 
         # Get min_lats not in maj_lats
-        min_lats = np.lib.arraysetops.setdiff1d(min_lats, maj_lats)
+        min_lats = np.setdiff1d(min_lats, maj_lats)
 
         # lons along major lat lines (extended slightly to avoid missing the end)
         lin_lons = np.linspace(lon_min, lon_max + Dlon / 5.0, max(self._x_size, self._y_size) // 5)

{pycoast-1.7.0 → pycoast-1.8.0}/pycoast/cw_pil.py

@@ -1,21 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-# pycoast, Writing of coastlines, borders, and rivers to images in Python
-#
-# Copyright (C) 2011-2020 PyCoast Developers
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """PIL-based ContourWriter."""
 
 import logging
@@ -89,23 +71,23 @@ class ContourWriterPIL(ContourWriterBase):
         outline = kwargs.get("outline", "white")
 
         # draw '|'
-        (x_bm, y_bm) = (x, y - half_ptsize)  # bottom middle point
-        (x_tm, y_tm) = (x, y + half_ptsize)  # top middle point
+        x_bm, y_bm = (x, y - half_ptsize)  # bottom middle point
+        x_tm, y_tm = (x, y + half_ptsize)  # top middle point
         self._draw_line(draw, [x_bm, y_bm, x_tm, y_tm], outline=outline)
 
         # draw '-'
-        (x_lm, y_lm) = (x - half_ptsize, y)  # left middle point
-        (x_rm, y_rm) = (x + half_ptsize, y)  # right middle point
+        x_lm, y_lm = (x - half_ptsize, y)  # left middle point
+        x_rm, y_rm = (x + half_ptsize, y)  # right middle point
         self._draw_line(draw, [x_lm, y_lm, x_rm, y_rm], outline=outline)
 
         # draw '/'
-        (x_bl, y_bl) = (x - half_ptsize, y - half_ptsize)  # bottom left point
-        (x_tr, y_tr) = (x + half_ptsize, y + half_ptsize)  # top right point
+        x_bl, y_bl = (x - half_ptsize, y - half_ptsize)  # bottom left point
+        x_tr, y_tr = (x + half_ptsize, y + half_ptsize)  # top right point
         self._draw_line(draw, [x_bl, y_bl, x_tr, y_tr], outline=outline)
 
         # draw '\'
-        (x_tl, y_tl) = (x - half_ptsize, y + half_ptsize)  # top left point
-        (x_br, y_br) = (x + half_ptsize, y - half_ptsize)  # bottom right point
+        x_tl, y_tl = (x - half_ptsize, y + half_ptsize)  # top left point
+        x_br, y_br = (x + half_ptsize, y - half_ptsize)  # bottom right point
         self._draw_line(draw, [x_tl, y_tl, x_br, y_br], outline=outline)
 
     def add_shapefile_shapes(

pycoast-1.8.0/pycoast/tests/__init__.py

@@ -0,0 +1 @@
+"""Pycoast unit tests."""