chore: update ci pipeline and poetry version

.github/workflows/ci.yaml

@@ -29,12 +29,10 @@ jobs:
           cache-dependency-path: poetry.lock
 
       - name: Install dependencies
-        run: poetry install
+        run: make install
 
       - name: Code Quality
-        run: |
-          poetry run black -l 80 --check .
+        run: make quality
 
       - name: Unit tests
-        run: |
-          poetry run pytest --cov .    
+        run: make test

Makefile

@@ -1,10 +1,15 @@
-.PHONY: test pep8 types clean install build publish tree env
+.PHONY: test quality pep8 black types clean install build publish tree env
 
-test: pep8
-	py.test --cov=flask_googlemaps -l --tb=short --maxfail=1 tests/
+test:
+	@poetry run pytest --cov .
+
+quality: pep8 black
 
 pep8:
-	@flake8 flask_googlemaps --ignore=F403
+	@poetry run flake8 flask_googlemaps --ignore=F403
+
+black:
+	@poetry run black -l 80 --check .
 
 types:
 	@mypy --py2 flask_googlemaps

flask_googlemaps/__init__.py

@@ -3,11 +3,12 @@
 __version__ = "0.4.1"
 
 from json import dumps
-from typing import Optional, Dict, Any, List, Union, Tuple, Text
+from typing import Optional, Dict, Any, List, Union, Tuple, Text  # noqa: F401
+
 import requests
 from flask import Blueprint, Markup, g, render_template
 
-from flask_googlemaps.icons import dots, Icon
+from flask_googlemaps.icons import dots, Icon  # noqa: F401
 
 DEFAULT_ICON = dots.red
 DEFAULT_CLUSTER_IMAGE_PATH = "static/images/m"
@@ -27,7 +28,8 @@ def __init__(
         cls="map",  # type: str
         language="en",  # type: str
         region="US",  # type: str
-        rectangles=None,  # type: Optional[List[Union[List, Tuple, Tuple[Tuple], Dict]]]
+        rectangles=None,
+        # type: Optional[List[Union[List, Tuple, Tuple[Tuple], Dict]]]
         circles=None,  # type: Optional[List[Union[List, Tuple, Dict]]]
         polylines=None,  # type: Optional[List[Union[List, Tuple, Dict]]]
         polygons=None,  # type: Optional[List[Union[List, Tuple, Dict]]]
@@ -269,7 +271,7 @@ def build_rectangle_dict(
     def add_rectangle(
         self, north=None, west=None, south=None, east=None, **kwargs
     ):
-        # type: (Optional[float], Optional[float], Optional[float], Optional[float], **Any) -> None
+        # type: (Optional[float], Optional[float], Optional[float], Optional[float], **Any) -> None # noqa: E501
         """Adds a rectangle dict to the Map.rectangles attribute
 
         The Google Maps API describes a rectangle using the LatLngBounds
@@ -757,14 +759,16 @@ def build_heatmap(self, heatmap_data, heatmap_layer):
             raise AttributeError("heatmap_later requires 'heatmap_data'")
         if not isinstance(heatmap_data, (list)):
             raise AttributeError(
-                "heatmap_data only accepts a list of dicts with keys 'lat' 'lng' and their corresponding values"
+                "heatmap_data only accepts a list of dicts with keys "
+                "'lat' 'lng' and their corresponding values"
             )
         for hm in heatmap_data:
             if isinstance(hm, dict):
                 self.add_heatmap(**hm)
             else:
                 raise AttributeError(
-                    "elements of list 'heatmap_data' must be a dict of keys 'lat' and 'lng' with their corresponding values"
+                    "elements of list 'heatmap_data' must be a dict of keys "
+                    "'lat' and 'lng' with their corresponding values"
                 )
 
     def add_heatmap(self, lat=None, lng=None, **kwargs):
@@ -877,7 +881,7 @@ def set_googlemaps_loaded():
 def get_address(API_KEY, lat, lon):
     # type: (str, float, float) -> dict
     add_dict = dict()
-    response = rq.get(
+    response = requests.get(
         "https://maps.googleapis.com/maps/api/geocode/json?latlng="
         + ",".join(map(str, [lat, lon]))
         + "&key="

flask_googlemaps/icons.py

@@ -9,7 +9,7 @@
 
 __all__ = ["dots", "alpha", "shapes", "pushpin", "paddle"]
 
-from typing import Optional, List
+from typing import Optional, List  # noqa: F401
 
 
 class Icon(object):