Merge pull request #385 from terrier-org/reduce_warnings

removes two warnings
terrier-org · Mar 23, 2023 · e47970a · e47970a
2 parents 555f249 + 717e843
commit e47970a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/pyterrier/index.py b/pyterrier/index.py
@@ -647,7 +647,7 @@ def convertDoc(text_row, meta_column):
             if text_row is None:
                 text_row = ""
             hashmap = HashMap()
-            for column, value in meta_column[1].iteritems():
+            for column, value in meta_column[1].items():
                 if value is None:
                     value = ""
                 hashmap.put(column, value)

diff --git a/pyterrier/text.py b/pyterrier/text.py
@@ -340,7 +340,7 @@ def transform(self, topics_and_res):
             rtr = rtr.drop(columns=['docno', 'pid']).rename(columns={"olddocno" : "docno"})
 
         if self.agg == 'mean':
-            rtr = topics_and_res.groupby(['qid', 'olddocno']).mean()['score'].reset_index().rename(columns={'olddocno' : 'docno'})
+            rtr = topics_and_res.groupby(['qid', 'olddocno'])['score'].mean().reset_index().rename(columns={'olddocno' : 'docno'})
             from .model import query_columns
             #add query columns back
             rtr = rtr.merge(topics_and_res[query_columns(topics_and_res)].drop_duplicates(), on='qid')