Merge pull request #913 from effigies/fix/pivot_syntax

FIX: Use kwargs for DataFrame.pivot()

Author: effigies

.github/workflows/pre-release.yml

@@ -19,6 +19,10 @@ defaults:
   run:
     shell: bash
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   pre-release:
     # Check pre-releases of dependencies on stable Python

.github/workflows/stable.yml

@@ -19,6 +19,10 @@ defaults:
   run:
     shell: bash
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   stable:
     # Check each OS, all supported Python, minimum versions and latest releases

bids/layout/layout.py

@@ -522,7 +522,7 @@ def to_df(self, metadata=False, **filters):
 
         tags = [[t.file_path, t.entity_name, t.value] for t in tags]
         data = pd.DataFrame(tags, columns=['path', 'entity', 'value'])
-        data = data.pivot('path', 'entity', 'value')
+        data = data.pivot(index='path', columns='entity', values='value')
 
         # Add in orphaned files with no Tags. Maybe make this an argument?
         orphans = list(set(file_paths) - set(data.index))

bids/modeling/statsmodels.py

@@ -615,7 +615,7 @@ def __init__(self, node, entities={}, collections=None, inputs=None,
             dummy_df = pd.get_dummies(df['contrast'])
             dummies_needed = set(var_names).intersection(dummy_df)
             if dummies_needed:
-                df = pd.concat([df, dummy_df[dummies_needed]], axis=1)
+                df = pd.concat([df, dummy_df[list(dummies_needed)]], axis=1)
 
         # If a single incoming contrast, keep track of name
         if 'contrast' in df.columns and df['contrast'].nunique() == 1:
@@ -803,4 +803,4 @@ def X(self):
         return self.model_spec.X
 
     def __repr__(self):
-        return f"<{self.__class__.__name__}(level={self.node.name}, entities={self.entities})>"
+        return f"<{self.__class__.__name__}(level={self.node.name}, entities={self.entities})>"