Warn if a profile is inialized with affine and transform

rasterio/profiles.py

@@ -22,7 +22,9 @@ def __init__(self, data={}, **kwds):
         initdata.update(**kwds)
 
         if 'affine' in initdata and 'transform' in initdata:
-            raise TypeError("affine and transform cannot both be specified")
+            warnings.warn("affine item is deprecated, use transform only",
+                          DeprecationWarning)
+            del initdata['affine']
         elif 'affine' in initdata:
             warnings.warn("affine item is deprecated, use transform instead",
                           DeprecationWarning)

tests/test_profile.py

@@ -126,10 +126,14 @@ def test_profile_affine_stashing(recwarn):
     assert profile['transform'] == 'foo'
 
 
-def test_profile_mixed_error():
-    """Passing both affine and transform raises TypeError"""
-    with pytest.raises(TypeError):
-        Profile(affine='foo', transform='bar')
+def test_profile_mixed_error(recwarn):
+    """Warn if both affine and transform are passed"""
+    warnings.simplefilter('always')
+    profile = Profile(affine='foo', transform='bar')
+    assert len(recwarn) == 1
+    assert recwarn.pop(DeprecationWarning)
+    assert 'affine' not in profile
+    assert profile['transform'] == 'bar'
 
 
 def test_profile_affine_alias(recwarn):