Run linter and tests in CI build (#48)

* Run linter and tests in CI build

* Fix linter invocation and upgrade its dependency

* Parallelize MyPy and Black checks

* Try Python 3.10 to see if generics error disappears

* Bump actions/setup-python to v4

* Remove poetry cache

* Move poetry install to after setup-python

* Tweak

* Try a poetry env use fix

* Try poetry env use one-liner

* Tweak

* Apply Black formatter

* Try without cache: poetry

* Set up poetry after python

* Try poetry 1.2.0b2

* Reordering

* try python 3.9

* alternate poetry install method

* Use install-poetry action

* Tweak

* Just install libgeos-dev

* Add libproj-dev

* Replicate

* Try generics again

* Reformat

* Add types-requests and types-pillow stubs to satisfy mypy

.github/workflows/test.yml

@@ -1,22 +1,71 @@
-name: Test
+name: Build
 
 on: [push, pull_request, workflow_dispatch]
 
 permissions:
   contents: read
 
 jobs:
-  build:
-    runs-on: ubuntu-latest
+  test:
+    name: Test
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
-      - name: Setup Poetry
-        run: pipx install poetry
-      - name: Set up Python
-        uses: actions/setup-python@v3
-        with:
-          cache: poetry
-          python-version: "3.9"
-      - name: Install dependencies
-        run: poetry install
-# TODO run tests
+      - uses: actions/setup-python@v4
+        with:
+          python-version: "3.10"
+      - uses: snok/install-poetry@v1
+      - name: Install GEOS
+        uses: lyricwulf/abc@v1
+        with:
+          macos: geos
+          linux: libgeos-dev
+      - name: Install PROJ
+        uses: lyricwulf/abc@v1
+        with:
+          macos: proj
+          linux: proj-bin libproj-dev
+      - run: poetry install
+      - run: poetry run pytest
+  black:
+    name: Black
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: "3.10"
+      - uses: snok/install-poetry@v1
+      - name: Install GEOS
+        uses: lyricwulf/abc@v1
+        with:
+          macos: geos
+          linux: libgeos-dev
+      - name: Install PROJ
+        uses: lyricwulf/abc@v1
+        with:
+          macos: proj
+          linux: proj-bin libproj-dev
+      - run: poetry install
+      - run: poetry run black --check src
+  mypy:
+    name: MyPy
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: "3.10"
+      - uses: snok/install-poetry@v1
+      - name: Install GEOS
+        uses: lyricwulf/abc@v1
+        with:
+          macos: geos
+          linux: libgeos-dev
+      - name: Install PROJ
+        uses: lyricwulf/abc@v1
+        with:
+          macos: proj
+          linux: proj-bin libproj-dev
+      - run: poetry install
+      - run: poetry run mypy

pyproject.toml

@@ -9,23 +9,24 @@ packages = [
 ]
 
 [tool.poetry.dependencies]
-python = "~3.9"
+python = "~3.10"
 numpy = "1.21.2"
 requests = "2.26.0"
 Shapely = "1.7.1"
-Rtree = "0.9.7"
+Rtree = "1.0.0"
 Pillow = "8.3.2"
 pyproj = "3.2.0"
 
 
 [tool.poetry.dev-dependencies]
 pytest-cov = "^3.0.0"
-black = "21.9b0"
+black = "22.3.0"
 isort = "5.9.3"
 mypy = "0.910"
 pytest = "6.2.5"
 prospector = {extras = ["with_vulture"], version = "1.5.1"}
-types-requests = "2.25.11"
+types-requests = "2.26.0"
+types-Pillow = "8.3.2"
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]

src/airport_data.py

@@ -367,7 +367,7 @@ def __hash__(self):
     def __repr__(self):
         return "<GTile ({}, {})@ZL{}>".format(self.x, self.y, self.zl)
 
-    @functools.lru_cache(maxsize=2 ** 14)
+    @functools.lru_cache(maxsize=2**14)
     def lower_zl_tile(self, target_zl=None):
         if target_zl and target_zl >= self.zl:
             return self
@@ -383,7 +383,7 @@ def lower_zl_tile(self, target_zl=None):
         else:
             return lower
 
-    @functools.lru_cache(maxsize=2 ** 13)
+    @functools.lru_cache(maxsize=2**13)
     def higher_zl_subtiles(self, target_zl=None):
         if target_zl and target_zl <= self.zl:
             return [self]
@@ -393,14 +393,14 @@ def higher_zl_subtiles(self, target_zl=None):
         return [
             GTile(x, y, zl)
             for x in range(
-                self.x * 2 ** zl_diff, (self.x + 16) * 2 ** zl_diff, 16
+                self.x * 2**zl_diff, (self.x + 16) * 2**zl_diff, 16
             )
             for y in range(
-                self.y * 2 ** zl_diff, (self.y + 16) * 2 ** zl_diff, 16
+                self.y * 2**zl_diff, (self.y + 16) * 2**zl_diff, 16
             )
         ]
 
-    @functools.lru_cache(maxsize=2 ** 13)
+    @functools.lru_cache(maxsize=2**13)
     def zl_siblings(self):
         return self.lower_zl_tile().higher_zl_subtiles()
 
@@ -414,7 +414,7 @@ def surrounding_tiles(self, include_self=False):
         ]
 
     @staticmethod
-    @functools.lru_cache(maxsize=2 ** 15)
+    @functools.lru_cache(maxsize=2**15)
     def _cached_polygon(x, y, zl):
         lat_max, lon_min = geo.gtile_to_wgs84(x, y, zl)
         lat_min, lon_max = geo.gtile_to_wgs84(x + 16, y + 16, zl)
@@ -855,7 +855,7 @@ def _compacted_tile_set(tiles: set):
     # Airport Interface
     #
 
-    @functools.lru_cache(maxsize=2 ** 3)
+    @functools.lru_cache(maxsize=2**3)
     def gtiles(
         self,
         zl,

src/config.py

@@ -1479,8 +1479,7 @@ def apply_changes(self):
         if errors:
             error_text = (
                 "The following variables had wrong type\nand were reset to"
-                " their default value!\n\n* "
-                + "\n* ".join(errors)
+                " their default value!\n\n* " + "\n* ".join(errors)
             )
             self.popup("ERROR", error_text)
 

src/dem.py

@@ -200,7 +200,7 @@ def create_normal_map(self, pixx, pixy):
         dy[0, :] = (self.alt_dem[0, :] - self.alt_dem[1, :]) / (pixy)
         dy[-1, :] = (self.alt_dem[-2, :] - self.alt_dem[-1, :]) / (pixy)
         del self.alt_dem
-        norm = numpy.sqrt(1 + dx ** 2 + dy ** 2)
+        norm = numpy.sqrt(1 + dx**2 + dy**2)
         dx = dx / norm
         dy = dy / norm
         del norm
@@ -947,10 +947,10 @@ def http_request(url, source, verbose=False):
             "    ",
             source,
             "server may be down or busy, new tentative in",
-            2 ** tentative,
+            2**tentative,
             "sec...",
         )
-        time.sleep(2 ** tentative)
+        time.sleep(2**tentative)
 
 
 ##############################################################################

src/dsf.py

@@ -48,8 +48,8 @@ def __init__(self, level, bucket_size):
         if level == 0:
             self[("", "")] = self.Bucket()
         else:
-            for i in range(2 ** level):
-                for j in range(2 ** level):
+            for i in range(2**level):
+                for j in range(2**level):
                     key = (
                         numpy.binary_repr(i).zfill(level),
                         numpy.binary_repr(j).zfill(level),

src/filenames.py

@@ -358,7 +358,7 @@ def jpeg_file_name_from_attributes(
             + "_"
             + str(til_x_left)
             + "_"
-            + str(2 ** zoomlevel - 16 - til_y_top)
+            + str(2**zoomlevel - 16 - til_y_top)
             + g2xpl_16_suffix
             + ".jpg"
         )
@@ -421,7 +421,7 @@ def dds_file_name_from_attributes(
             + "_"
             + str(til_x_left)
             + "_"
-            + str(2 ** zoomlevel - 16 - til_y_top)
+            + str(2**zoomlevel - 16 - til_y_top)
             + g2xpl_16_suffix
             + "."
             + file_ext

src/geo.py

@@ -135,7 +135,7 @@ def transform(s_epsg, t_epsg, s_x, s_y):
 ##############################################################################
 
 ##############################################################################
-@functools.lru_cache(maxsize=2 ** 16)
+@functools.lru_cache(maxsize=2**16)
 def gtile_to_wgs84(til_x, til_y, zoomlevel):
     """
     Returns the latitude and longitude of the top left corner of the tile

src/gui.py

@@ -1499,7 +1499,7 @@ def compute_size(self):
                     greediness=config.cover_greediness,
                     greediness_threshold=config.cover_greediness_threshold,
                 )
-                / 2 ** 30
+                / 2**30
             )
 
         self.gb.set("{:0.1f}".format(total_size) + " GiB")
@@ -1620,7 +1620,7 @@ def save_zone_list(self):
 class Ortho4XP_Earth_Preview(tk.Toplevel):
 
     earthzl = 6
-    resolution = 2 ** earthzl * 256
+    resolution = 2**earthzl * 256
 
     list_del_ckbtn = [
         "OSM data",
@@ -1774,8 +1774,8 @@ def __init__(self, parent, lat, lon):
             scrollregion=(
                 1,
                 1,
-                2 ** self.earthzl * 256 - 1,
-                2 ** self.earthzl * 256 - 1,
+                2**self.earthzl * 256 - 1,
+                2**self.earthzl * 256 - 1,
             )
         )  # self.canvas.bbox(ALL))
         (x0, y0) = geo.wgs84_to_pix(lat + 0.5, lon + 0.5, self.earthzl)
@@ -2324,8 +2324,8 @@ def draw_canvas(self, nx0, ny0):
             self.imageNW = Image.open(filepreviewNW)
             self.photoNW = ImageTk.PhotoImage(self.imageNW)
             self.canv_imgNW = self.canvas.create_image(
-                nx0 * 2 ** self.earthzl * 256 / 8,
-                ny0 * 2 ** self.earthzl * 256 / 8,
+                nx0 * 2**self.earthzl * 256 / 8,
+                ny0 * 2**self.earthzl * 256 / 8,
                 anchor=NW,
                 image=self.photoNW,
             )
@@ -2343,8 +2343,8 @@ def draw_canvas(self, nx0, ny0):
             self.imageNE = Image.open(filepreviewNE)
             self.photoNE = ImageTk.PhotoImage(self.imageNE)
             self.canv_imgNE = self.canvas.create_image(
-                (nx0 + 1) * 2 ** self.earthzl * 256 / 8,
-                ny0 * 2 ** self.earthzl * 256 / 8,
+                (nx0 + 1) * 2**self.earthzl * 256 / 8,
+                ny0 * 2**self.earthzl * 256 / 8,
                 anchor=NW,
                 image=self.photoNE,
             )
@@ -2354,8 +2354,8 @@ def draw_canvas(self, nx0, ny0):
             self.imageSW = Image.open(filepreviewSW)
             self.photoSW = ImageTk.PhotoImage(self.imageSW)
             self.canv_imgSW = self.canvas.create_image(
-                nx0 * 2 ** self.earthzl * 256 / 8,
-                (ny0 + 1) * 2 ** self.earthzl * 256 / 8,
+                nx0 * 2**self.earthzl * 256 / 8,
+                (ny0 + 1) * 2**self.earthzl * 256 / 8,
                 anchor=NW,
                 image=self.photoSW,
             )
@@ -2370,8 +2370,8 @@ def draw_canvas(self, nx0, ny0):
             self.imageSE = Image.open(filepreviewSE)
             self.photoSE = ImageTk.PhotoImage(self.imageSE)
             self.canv_imgSE = self.canvas.create_image(
-                (nx0 + 1) * 2 ** self.earthzl * 256 / 8,
-                (ny0 + 1) * 2 ** self.earthzl * 256 / 8,
+                (nx0 + 1) * 2**self.earthzl * 256 / 8,
+                (ny0 + 1) * 2**self.earthzl * 256 / 8,
                 anchor=NW,
                 image=self.photoSE,
             )

src/imagery.py

@@ -579,7 +579,7 @@ def initialize_providers_dict() -> None:
                             ]
                             provider["resolutions"] = numpy.array(
                                 [
-                                    20037508.34 / (128 * 2 ** i)
+                                    20037508.34 / (128 * 2**i)
                                     for i in range(21)
                                 ]
                             )
@@ -861,7 +861,7 @@ def initialize_local_combined_providers_dict(tile):
                             )
                             kernel = numpy.array(range(1, 2 * mask_width))
                             kernel[mask_width:] = range(mask_width - 1, 0, -1)
-                            kernel = kernel / mask_width ** 2
+                            kernel = kernel / mask_width**2
                             for i in range(0, len(img_array)):
                                 img_array[i] = numpy.convolve(
                                     img_array[i], kernel, "same"
@@ -1257,7 +1257,7 @@ def get_wmts_image(tilematrix, til_x, til_y, provider, http_session):
             url = url.replace("{x}", str(til_x))
             url = url.replace("{y}", str(til_y))
             url = url.replace("{|y|}", str(abs(til_y) - 1))
-            url = url.replace("{-y}", str(2 ** tilematrix - 1 - til_y))
+            url = url.replace("{-y}", str(2**tilematrix - 1 - til_y))
             url = url.replace(
                 "{quadkey}", geo.gtile_to_quadkey(til_x, til_y, tilematrix)
             )
@@ -1348,17 +1348,17 @@ def get_wmts_image(tilematrix, til_x, til_y, provider, http_session):
             return (success, data)
         elif success and down_sample:
             x0 = (
-                (til_x_orig - 2 ** down_sample * til_x)
+                (til_x_orig - 2**down_sample * til_x)
                 * width
-                // (2 ** down_sample)
+                // (2**down_sample)
             )
             y0 = (
-                (til_y_orig - 2 ** down_sample * til_y)
+                (til_y_orig - 2**down_sample * til_y)
                 * height
-                // (2 ** down_sample)
+                // (2**down_sample)
             )
-            x1 = x0 + width // (2 ** down_sample)
-            y1 = y0 + height // (2 ** down_sample)
+            x1 = x0 + width // (2**down_sample)
+            y1 = y0 + height // (2**down_sample)
             return (
                 success,
                 data.crop((x0, y0, x1, y1)).resize(
@@ -1541,8 +1541,8 @@ def build_texture_from_bbox_and_size(t_bbox, t_epsg, t_size, provider):
             - 1
         )
         if downscale >= 1:
-            width /= 2 ** downscale
-            height /= 2 ** downscale
+            width /= 2**downscale
+            height /= 2**downscale
             subt_size = (width, height)
         else:
             subt_size = None