more misc cleanup

tests/test_ndr.py

@@ -3,7 +3,6 @@ import os
 import shutil
 import tempfile
 import unittest
-import pytest
 
 import numpy
 import pandas
@@ -17,6 +16,7 @@ gdal.UseExceptions()
 REGRESSION_DATA = os.path.join(
     os.path.dirname(__file__), '..', 'data', 'invest-test-data', 'ndr')
 
+
 class NDRTests(unittest.TestCase):
     """Regression tests for InVEST SDR model."""
 

tests/test_recreation.py

@@ -15,7 +15,6 @@ import string
 import tempfile
 import threading
 import time
-import pytest
 import unittest
 from unittest.mock import patch
 import zipfile
@@ -43,6 +42,7 @@ SAMPLE_DATA = os.path.join(REGRESSION_DATA, 'input')
 
 LOGGER = logging.getLogger('test_recreation')
 
+
 def _timeout(max_timeout):
     """Timeout decorator, parameter in seconds."""
     def timeout_decorator(target):

tests/test_scenic_quality.py

@@ -4,7 +4,6 @@ import os
 import shutil
 import tempfile
 import unittest
-import pytest
 
 import numpy
 import pygeoprocessing
@@ -20,6 +19,7 @@ _SRS = osr.SpatialReference()
 _SRS.ImportFromEPSG(32731)  # WGS84 / UTM zone 31s
 WKT = _SRS.ExportToWkt()
 
+
 class ScenicQualityTests(unittest.TestCase):
     """Tests for the InVEST Scenic Quality model."""
 

tests/test_sdr.py

@@ -3,7 +3,6 @@ import os
 import shutil
 import tempfile
 import unittest
-import pytest
 
 import numpy
 import pygeoprocessing
@@ -15,6 +14,7 @@ REGRESSION_DATA = os.path.join(
     os.path.dirname(__file__), '..', 'data', 'invest-test-data', 'sdr')
 SAMPLE_DATA = os.path.join(REGRESSION_DATA, 'input')
 
+
 def assert_expected_results_in_vector(expected_results, vector_path):
     """Assert one feature vector maps to expected_results key/value pairs."""
     watershed_results_vector = gdal.OpenEx(vector_path, gdal.OF_VECTOR)

tests/test_seasonal_water_yield_regression.py

@@ -3,7 +3,6 @@ import os
 import shutil
 import tempfile
 import unittest
-import pytest
 
 import numpy
 import pandas
@@ -17,6 +16,7 @@ REGRESSION_DATA = os.path.join(
     os.path.dirname(__file__), '..', 'data', 'invest-test-data',
     'seasonal_water_yield')
 
+
 def make_simple_shp(base_shp_path, origin):
     """Make a 100x100 ogr rectangular geometry shapefile.