Merge branch '0.5.0' into bug/tile

Author: rbavery

.github/workflows/release.yml

@@ -0,0 +1,31 @@
+name: Release Python package
+
+on:
+  workflow_run:
+    workflows: [tests]
+    branches: [main]
+    types: [completed]
+
+jobs:
+  release:
+    needs: test
+    runs-on: ubuntu-latest
+    name: Release package to PyPi
+    if: github.event_name == 'push' && contains(github.ref, 'refs/tags/')
+    steps:
+      - uses: actions/checkout@master
+      - name: Set up Python 3.8
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.8
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          python -m pip install tox tox-gh-actions
+      - name: Build and release 📦 to PyPI
+        with:
+          TWINE_USERNAME: ${{ secrets.TWINE_USERNAME }}
+          TWINE_PASSWORD: ${{ secrets.TWINE_PASSWORD }}
+        run: |
+          tox -e release
+

.github/workflows/tests.yml

@@ -4,14 +4,14 @@ on:
   - push
 
 jobs:
-  build:
+  test:
     runs-on: ubuntu-latest
     name: Docker | GDAL=${{ matrix.gdal-version }} | python=${{ matrix.python-version }}
-    container: osgeo/gdal:ubuntu-full-${{ matrix.gdal-version }}
+    container: osgeo/gdal:ubuntu-small-${{ matrix.gdal-version }}
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.8", "3.9"]
+        python-version: ["3.8", "3.9", "3.10"]
         gdal-version: ["3.4.0", "3.3.3"]
         include:
           - python-version: "3.8"
@@ -38,10 +38,16 @@ jobs:
             python${{ matrix.python-version }}-dev \
             python${{ matrix.python-version }}-venv \
             python3-pip \
-            g++
+            g++ \
+            libgl1
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          python -m pip install tox tox-gh-actions
+          python -m pip install tox
+      - name: Lint with tox
+        run: tox -e lint
+      - name: Format with tox
+        run: tox -e format
       - name: Test with tox
-        run: tox
+        run: tox -e test
+

.pre-commit-config.yaml

@@ -0,0 +1,14 @@
+repos:
+-   repo: https://github.com/pycqa/isort
+    rev: 5.10.1
+    hooks:
+    - id: isort
+-   repo: https://github.com/ambv/black
+    rev: 22.1.0
+    hooks:
+    - id: black
+      language_version: python3.9
+-   repo: https://gitlab.com/pycqa/flake8
+    rev: 3.9.2
+    hooks:
+    - id: flake8

docs/conf.py

@@ -14,8 +14,8 @@
 import sys
 
 sys.path.insert(0, os.path.abspath(".."))
+import numpy as np  # noqa: F401
 import sphinx_bootstrap_theme
-import numpy as np
 
 # -- Project information -----------------------------------------------------
 
@@ -25,7 +25,7 @@
 license = "MIT"
 import time
 
-copyright = u"2018-{}, CosmiQ Works: an IQT Lab".format(time.strftime("%Y"))
+copyright = "2018-{}, CosmiQ Works: an IQT Lab".format(time.strftime("%Y"))
 
 # The full version, including alpha/beta/rc tags
 release = "0.0.1"

requirements-test.txt

@@ -22,3 +22,4 @@ pytest
 tox
 isort
 flake8
+pre-commit

setup.cfg

@@ -0,0 +1,27 @@
+[flake8]
+extend-ignore = 
+    E203, # whitespace before ':' 
+    E501, # line too long
+    C901, # is too complex
+    E402, # module level import not at top of file (for docs)
+    E741, # ambiguous variable name
+
+exclude =
+    .git,
+    __pycache__,
+    docs/source/conf.py,
+    old,
+    build,
+    dist,
+    .tox
+max-line-length = 88
+max-complexity = 10
+count=true
+
+[isort]
+profile = black
+
+[black]
+line-length = 88
+target-version = ['py37', 'py38', 'py39', 'py310']
+experimental_string_processing = true

setup.py

@@ -1,9 +1,10 @@
-import os
-import sys
-import subprocess
 import logging
-from setuptools import setup, find_packages
+import os
 import re
+import subprocess
+import sys
+
+from setuptools import find_packages, setup
 
 
 def get_version():
@@ -51,6 +52,7 @@ def check_output(cmd):
         "pyproj>=2.1",
         "PyYAML>=5.4",
         "rasterio>=1.0.23",
+        "rio-cogeo>=3.0.2",
         "requests==2.22.0",
         "rtree>=0.9.3",
         "scikit-image>=0.16.2",
@@ -78,7 +80,7 @@ def check_output(cmd):
         "Programming Language :: Python :: 3.10",
         "Topic :: Scientific/Engineering :: GIS",
     ],
-    author=u"Ryan Avery",
+    author="Ryan Avery",
     author_email="[email protected]",
     url="https://github.com/CosmiQ/solaris",
     license="MIT",

solaris/__init__.py

@@ -1,4 +1,4 @@
 from . import data, utils, vector, tile
 
 #  data, eval, preproc, raster, tile, have gdal in them need to replace with rasterio
-__version__ = "0.0.1"
+__version__ = "0.5.0"

solaris/eval/__init__.py

@@ -1 +1 @@
-from . import base, iou, pixel, vector
+from . import base, iou, pixel, vector  # noqa: F401

solaris/eval/base.py

@@ -111,8 +111,6 @@ def eval_iou_spacenet_csv(
         scoring_dict_list = []
         self.ground_truth_GDF[iou_field] = 0.0
         iou_index = self.ground_truth_GDF.columns.get_loc(iou_field)
-        id_cols = 2
-        ground_truth_ids = self.ground_truth_GDF.iloc[:, :id_cols]
 
         for imageID in tqdm(imageIDList):
             self.ground_truth_GDF_Edit = self.ground_truth_GDF[