CHANGES.txt

 Changes
 =======
 
+1.0.22 (2019-03-20)
+-------------------
+
+- Add JPEG2000 to enums.Compression so that the compression of JP2 files can be
+  reported (#1654).
+- Remove mock import from compat and move to test code (#1651).
+
 1.0.21 (2019-02-28)
 -------------------
 

debian/changelog

+rasterio (1.0.22-1~exp1) unstable; urgency=medium
+
+  * Team upload.
+  * New upstream release.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Wed, 20 Mar 2019 17:09:03 +0100
+
 rasterio (1.0.21-1) unstable; urgency=medium
 
   * Team upload.

rasterio/__init__.py

@@ -42,7 +42,7 @@ import rasterio.path
 
 
 __all__ = ['band', 'open', 'pad', 'Env']
-__version__ = "1.0.21"
+__version__ = "1.0.22"
 __gdal_version__ = gdal_version()
 
 # Rasterio attaches NullHandler to the 'rasterio' logger and its

rasterio/compat.py

@@ -13,7 +13,6 @@ if sys.version_info[0] >= 3:   # pragma: no cover
     from urllib.parse import urlparse
     from collections import UserDict
     from inspect import getfullargspec as getargspec
-    from unittest import mock
 else:  # pragma: no cover
     string_types = basestring,
     text_type = unicode
@@ -23,4 +22,3 @@ else:  # pragma: no cover
     from urlparse import urlparse
     from UserDict import UserDict
     from inspect import getargspec
-    import mock

rasterio/enums.py

@@ -68,6 +68,7 @@ class Compression(Enum):
     zstd = 'ZSTD'
     lerc = 'LERC'
     webp = 'WEBP'
+    jpeg2000 = 'JPEG2000'
 
 
 class Interleaving(Enum):

tests/test_dataset.py

@@ -2,10 +2,15 @@
 
 
 import os
+try:
+    from unittest.mock import MagicMock
+except ImportError:
+    from mock import MagicMock
 
 import pytest
 
 import rasterio
+from rasterio.enums import Compression
 from rasterio.errors import RasterioIOError
 
 
@@ -26,3 +31,12 @@ def test_handle_closed(path_rgb_byte_tif):
         pass
     with pytest.raises(RasterioIOError):
         src.files
+
+
+@pytest.mark.parametrize('tag_value', [item.value for item in Compression])
+def test_dataset_compression(path_rgb_byte_tif, tag_value):
+    """Compression is found from tags"""
+    with rasterio.open(path_rgb_byte_tif) as dataset:
+        dataset.tags = MagicMock()
+        dataset.tags.return_value = {'COMPRESSION': tag_value}
+        assert dataset.compression == Compression(tag_value)

tests/test_env.py

@@ -8,13 +8,17 @@ import sys
 import boto3
 import pytest
 
+try:
+    from unittest import mock
+except ImportError:
+    import mock
+
 import rasterio
 from rasterio import _env
 from rasterio._env import del_gdal_config, get_gdal_config, set_gdal_config
 from rasterio.env import Env, defenv, delenv, getenv, setenv, ensure_env, ensure_env_credentialled
 from rasterio.env import GDALVersion, require_gdal_version
 from rasterio.errors import EnvError, RasterioIOError, GDALVersionError
-from rasterio.compat import mock
 from rasterio.rio.main import main_group
 from rasterio.session import AWSSession, OSSSession