Merge branch 'release/3.2.5'

CHANGES.rst

@@ -2,6 +2,12 @@
 Changes
 -------
 
+3.2.5
+~~~~~
+
+- fixing another edge case in the csv metadata adapter
+
+
 3.2.4
 ~~~~~
 

clld/__init__.py

@@ -5,7 +5,7 @@
 from clld import interfaces
 
 
-__version__ = "3.2.4"
+__version__ = "3.2.5"
 
 
 class Resource(namedtuple('Resource', 'name model interface with_index with_rdfdump')):

clld/web/adapters/csv.py

@@ -96,12 +96,15 @@ def csvm_doc(cls, url, req, cols):
             spec = {
                 'name': name,
                 'datatype': {'@id': 'http://www.w3.org/2001/XMLSchema#string'}}
-            if col is not None and not isinstance(col, Column):
-                try:
-                    col = col.property.columns[0]
-                except AttributeError:  # pragma: no cover
-                    col = None
-                    raise
+            if isinstance(col, property):
+                col = None  # pragma: no cover
+            else:
+                if col is not None and not isinstance(col, Column):
+                    try:
+                        col = col.property.columns[0]
+                    except AttributeError:  # pragma: no cover
+                        col = None
+                        raise
             if col is not None:
                 if len(col.foreign_keys) == 1:
                     fk = list(col.foreign_keys)[0]

docs/conf.py

@@ -51,10 +51,10 @@
 # built documents.
 #
 # The full version, including alpha/beta/rc tags.
-release = '3.2.4'
+release = '3.2.5'
 
 # The short X.Y version.
-version = '3.2.4'
+version = '3.2.5'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

setup.py

@@ -73,7 +73,7 @@
 
 setup(
     name='clld',
-    version='3.2.4',
+    version='3.2.5',
     description=(
         'Python library supporting the development of cross-linguistic databases'),
     long_description=README,