Handle a warning, reformat, cleanup, version bump, and changes.

CHANGES.txt

@@ -1,5 +1,11 @@
 CHANGES
 
+1.0.0 (2019-12-04)
+------------------
+- Rasterio's NodataShadowWarning is handled in the mask reading tests.
+- Unused imports were removed from the setup script.
+- Rasterio version ~= 1.0 is specified in the setup requirements.
+
 1.0b1 (2019-12-03)
 ------------------
 - This module now relies on a rasterio dataset's dataset_mask method. The

rio_hist/__init__.py

@@ -1,7 +1,7 @@
 import logging
 
 
-__version__ = "1.0b1"
+__version__ = "1.0.0"
 
 log = logging.getLogger(__name__)
 log.addHandler(logging.NullHandler())

setup.py

@@ -1,7 +1,5 @@
 import os
-import sys
 from setuptools import setup, find_packages
-from setuptools.extension import Extension
 
 # Parse the version from the fiona module.
 with open('rio_hist/__init__.py') as f:
@@ -20,6 +18,7 @@
 def read(fname):
     return open(os.path.join(os.path.dirname(__file__), fname)).read()
 
+
 setup(name='rio-hist',
       version=version,
       description=u"Histogram matching plugin for rasterio",
@@ -33,7 +32,7 @@ def read(fname):
       packages=find_packages(exclude=['ez_setup', 'examples', 'tests']),
       include_package_data=True,
       zip_safe=False,
-      install_requires=["click", "rasterio", "rio_color>=0.4"],
+      install_requires=["click", "rasterio~=1.0", "rio_color>=0.4"],
       extras_require={
           'plot': ['matplotlib'],
           'test': ['pytest', 'pytest-cov', 'codecov']},

tests/test_read_mask.py

@@ -1,6 +1,9 @@
+from affine import Affine
 import numpy as np
+import pytest
 import rasterio
-from affine import Affine
+from rasterio.errors import NodataShadowWarning
+
 from rio_hist.utils import read_mask
 
 
@@ -115,17 +118,22 @@ def test_no_ndv():
     with rasterio.open('/tmp/rgb_no_ndv.tif') as src:
         assert np.array_equal(read_mask(src), alldata)
 
+
 def test_rgb_ndv():
     with rasterio.open('/tmp/rgb_ndv.tif') as src:
         assert np.array_equal(read_mask(src), alp)
 
+
 def test_rgba_no_ndv():
     with rasterio.open('/tmp/rgba_no_ndv.tif') as src:
         assert np.array_equal(read_mask(src), alp)
 
+
 def test_rgba_ndv():
     with rasterio.open('/tmp/rgba_ndv.tif') as src:
-        assert np.array_equal(read_mask(src), alp)
+        with pytest.warns(NodataShadowWarning):
+            assert np.array_equal(read_mask(src), alp)
+
 
 def test_rgb_msk():
     with rasterio.open('/tmp/rgb_msk.tif') as src:
@@ -134,10 +142,12 @@ def test_rgb_msk():
         for bmask in src.read_masks():
             assert np.array_equal(bmask, msk)
 
+
 def test_rgb_msk_int():
     with rasterio.open('/tmp/rgb_msk_internal.tif') as src:
         assert np.array_equal(read_mask(src), msk)
 
+
 def test_rgba_msk():
     with rasterio.open('/tmp/rgba_msk.tif') as src:
         # mask takes precendent over alpha