Merge branch 'devel'

VERSION

@@ -1 +1 @@
-master-v0.7.1
+master-v0.7.2

flows/catalogs.py

@@ -454,16 +454,24 @@ def download_catalog(target=None, radius=24*u.arcmin, radius_ztf=3*u.arcsec, dis
 			target_name = row['target_name']
 			dd = row['discovery_date']
 			if dd is not None:
-				dd = Time(dd, format='iso', scale='utc')
+				dd = Time(dd, format='datetime', scale='utc')
 
 			# Coordinate of the target, which is the centre of the search cone:
 			coo_centre = SkyCoord(ra=row['ra'], dec=row['decl'], unit=u.deg, frame='icrs')
 
+			# Download combined catalog from all sources:
 			results = query_all(coo_centre, radius=radius, dist_cutoff=dist_cutoff)
 
 			# Query for a ZTF identifier for this target:
 			ztf_id = query_ztf_id(coo_centre, radius=radius_ztf, discovery_date=dd)
 
+			# Because the database is picky with datatypes, we need to change things
+			# before they are passed on to the database:
+			for row in results:
+				for key, val in row.items():
+					if isinstance(val, (np.int64, np.int32)):
+						row[key] = int(val)
+
 			# Insert the catalog into the local database:
 			try:
 				db.cursor.executemany("""INSERT INTO flows.refcat2 (