[fiona] 04/05: Refresh patches.
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Thu May 5 23:52:44 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository fiona.
commit a6b7b6455a3b4c0d2e43072381c647fbc6e6b7ba
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Fri May 6 01:44:01 2016 +0200
Refresh patches.
---
debian/changelog | 1 +
debian/patches/0003-GDAL-2.0.patch | 8 ++++++--
...t-at-fiona.remove-for-deleting-data-sources.patch | 14 +++++++-------
debian/patches/0008-Disable-GDAL-2-ImportError.patch | 20 ++++++++++++++++++++
debian/patches/series | 1 +
5 files changed, 35 insertions(+), 9 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index ffc14f1..11628d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ fiona (1.6.4-1) UNRELEASED; urgency=medium
* Team upload.
* New upstream release.
+ * Refresh patches.
-- Bas Couwenberg <sebastic at debian.org> Fri, 06 May 2016 01:10:19 +0200
diff --git a/debian/patches/0003-GDAL-2.0.patch b/debian/patches/0003-GDAL-2.0.patch
index 85e276e..2c173e6 100644
--- a/debian/patches/0003-GDAL-2.0.patch
+++ b/debian/patches/0003-GDAL-2.0.patch
@@ -519,7 +519,7 @@ Subject: [PATCH 01/16] sperate implementation for gdal2
+ void OGR_F_SetFieldInteger64 (void *feature, int n, long long value)
--- a/fiona/ogrext.pyx
+++ /dev/null
-@@ -1,1243 +0,0 @@
+@@ -1,1245 +0,0 @@
-# These are extension functions and classes using the OGR C API.
-
-import datetime
@@ -571,6 +571,8 @@ Subject: [PATCH 01/16] sperate implementation for gdal2
- 'date', # OFTDate, Date
- 'time', # OFTTime, Time
- 'datetime', # OFTDateTime, Date and Time
+- 'int', # OFTInteger64, Single 64bit integer #Not supported
+- None, # OFTInteger64List, List of 64bit integers #Not supported
- ]
-
-# Mapping of Fiona field type names to Python types.
@@ -1765,7 +1767,7 @@ Subject: [PATCH 01/16] sperate implementation for gdal2
-
--- /dev/null
+++ b/fiona/ogrext1.pyx
-@@ -0,0 +1,1229 @@
+@@ -0,0 +1,1231 @@
+# These are extension functions and classes using the OGR C API.
+
+import datetime
@@ -1815,6 +1817,8 @@ Subject: [PATCH 01/16] sperate implementation for gdal2
+ 'date', # OFTDate, Date
+ 'time', # OFTTime, Time
+ 'datetime', # OFTDateTime, Date and Time
++ 'int', # OFTInteger64, Single 64bit integer #Not supported
++ None, # OFTInteger64List, List of 64bit integers #Not supported
+ ]
+
+# Mapping of Fiona field type names to Python types.
diff --git a/debian/patches/0005-Initial-attempt-at-fiona.remove-for-deleting-data-sources.patch b/debian/patches/0005-Initial-attempt-at-fiona.remove-for-deleting-data-sources.patch
index 69d9013..cae6f00 100644
--- a/debian/patches/0005-Initial-attempt-at-fiona.remove-for-deleting-data-sources.patch
+++ b/debian/patches/0005-Initial-attempt-at-fiona.remove-for-deleting-data-sources.patch
@@ -11,16 +11,16 @@ Subject: [PATCH 1/6] Initial attempt at fiona.remove from deleting data
--- a/fiona/__init__.py
+++ b/fiona/__init__.py
-@@ -72,7 +72,7 @@ from six import string_types
+@@ -69,7 +69,7 @@ from six import string_types
from fiona.collection import Collection, BytesCollection, vsi_path
from fiona._drivers import driver_count, GDALEnv, supported_drivers
from fiona.odict import OrderedDict
-from fiona.ogrext import _bounds, _listlayers, FIELD_TYPES_MAP
+from fiona.ogrext import _bounds, _listlayers, FIELD_TYPES_MAP, _remove
-
- # These modules are imported by fiona.ogrext, but are also import here to
- # help tools like cx_Freeze find them automatically
-@@ -182,6 +182,33 @@ def open(
+ from fiona.ogrext import (
+ calc_gdal_version_num, get_gdal_version_num, get_gdal_release_name)
+ import warnings
+@@ -191,6 +191,33 @@ def open(
collection = open
@@ -56,7 +56,7 @@ Subject: [PATCH 1/6] Initial attempt at fiona.remove from deleting data
--- a/fiona/ogrext1.pyx
+++ b/fiona/ogrext1.pyx
-@@ -59,6 +59,10 @@ FIELD_TYPES_MAP = {
+@@ -61,6 +61,10 @@ FIELD_TYPES_MAP = {
'datetime': FionaDateTimeType
}
@@ -67,7 +67,7 @@ Subject: [PATCH 1/6] Initial attempt at fiona.remove from deleting data
# OGR Layer capability
OLC_RANDOMREAD = b"RandomRead"
OLC_SEQUENTIALWRITE = b"SequentialWrite"
-@@ -1171,6 +1175,27 @@ cdef class KeysIterator(Iterator):
+@@ -1173,6 +1177,27 @@ cdef class KeysIterator(Iterator):
return fid
diff --git a/debian/patches/0008-Disable-GDAL-2-ImportError.patch b/debian/patches/0008-Disable-GDAL-2-ImportError.patch
new file mode 100644
index 0000000..4d6aec6
--- /dev/null
+++ b/debian/patches/0008-Disable-GDAL-2-ImportError.patch
@@ -0,0 +1,20 @@
+Description: Disable ImportError for GDAL 2.x.
+ GDAL 2.x changes backported from Fiona 1.7.
+Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: not-needed
+
+--- a/fiona/__init__.py
++++ b/fiona/__init__.py
+@@ -84,12 +84,6 @@ __all__ = ['bounds', 'listlayers', 'open
+ __version__ = "1.6.4"
+ __gdal_version__ = get_gdal_release_name().decode('utf-8')
+
+-# Warn user that they use fiona 1.x with gdal 2.0
+-if get_gdal_version_num() >= calc_gdal_version_num(2, 0, 0):
+- raise ImportError(
+- "Fiona {0} is only compatible with GDAL 1.x (installed: {1})".format(
+- __version__, __gdal_version__))
+-
+ log = logging.getLogger('Fiona')
+ class NullHandler(logging.Handler):
+ def emit(self, record):
diff --git a/debian/patches/series b/debian/patches/series
index 3795660..3b6d427 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
0005-Initial-attempt-at-fiona.remove-for-deleting-data-sources.patch
0006-Remove-unknown-distribution-options.patch
0007-clean.patch
+0008-Disable-GDAL-2-ImportError.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/fiona.git
More information about the Pkg-grass-devel
mailing list