Merge upstream-unacknowledged PR

 * taraslayshchuk#71
 * from fork https://github.com/gboddin/es2csv/tree/es-7.0
 * thanks gboddin!

Author: rc9000

es2csv.py

@@ -112,7 +112,7 @@ def next_scroll(scroll_id):
             search_args['q'] = query
 
         if '_all' not in self.opts.fields:
-            search_args['_source_include'] = ','.join(self.opts.fields)
+            search_args['_source_includes'] = self.opts.fields
             self.csv_headers.extend([unicode(field, "utf-8") for field in self.opts.fields if '*' not in field])
 
         if self.opts.debug_mode:
@@ -124,7 +124,7 @@ def next_scroll(scroll_id):
             print('Sorting by: {}.'.format(', '.join(self.opts.sort)))
 
         res = self.es_conn.search(**search_args)
-        self.num_results = res['hits']['total']
+        self.num_results = res['hits']['total']['value']
 
         print('Found {} results.'.format(self.num_results))
         if self.opts.debug_mode:
@@ -237,3 +237,4 @@ def clean_scroll_ids(self):
             self.es_conn.clear_scroll(body=','.join(self.scroll_ids))
         except:
             pass
+

requirements.txt

@@ -1,3 +1,3 @@
-elasticsearch>=5.5.2,<5.6.0
+elasticsearch>= 7.0.1
 progressbar2>=3.36.0,<3.37.0
 backports.csv>=1.0.5,<1.1.0