Merge branch 'develop'

Author: mdbenito

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.3.0
+current_version = 0.3.1.dev0
 commit = False
 tag = False
 allow_dirty = False

.github/workflows/publish.yaml

@@ -4,6 +4,12 @@ on:
   push:
     tags:
     - "v*"
+  workflow_dispatch:
+    inputs:
+      reason:
+        description: Why did you trigger the pipeline?
+        required: False
+        default: Check if it runs again due to external changes
 
 env:
   PY_COLORS: 1
@@ -17,8 +23,18 @@ jobs:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0
-      - name: Fail if not on 'master' branch
-        if: github.ref != 'refs/heads/master'
+      - name: Fail if manually triggered workflow is not on 'master' branch
+        if: github.event_name == 'workflow_dispatch' && github.ref_name != 'master'
+        run: exit -1
+      - name: Extract branch name from tag
+        id: get_branch_name
+        if: github.ref_type == 'tag'
+        run: |
+          export BRANCH_NAME=$(git log -1 --format='%D' $GITHUB_REF | | sed -e 's/.*origin\/\(.*\),.*/\1/')
+          echo ::set-output name=branch_name::${BRANCH_NAME}
+        shell: bash
+      - name: Fail if tag is not on 'master' branch
+        if: github.ref_type == 'tag' && steps.get_branch_name.outputs.branch_name != 'master'
         run: exit -1
       - name: Set up Python 3.8
         uses: actions/setup-python@v4

notebooks/shapley_basic_spotify.ipynb

@@ -93,13 +93,13 @@
    "metadata": {},
    "outputs": [],
    "source": [
+    "from pydvl.reporting.plots import plot_shapley\n",
     "from pydvl.utils import (\n",
     "    available_cpus,\n",
     "    load_spotify_dataset,\n",
     "    Dataset,\n",
     "    GroupedDataset,\n",
     "    Utility,\n",
-    "    plot_shapley,\n",
     ")\n",
     "from pydvl.value.shapley import compute_shapley_values"
    ]

notebooks/shapley_knn_flowers.ipynb

@@ -366,7 +366,7 @@
     "    legend_title=\"shapley values\",\n",
     "    suptitle=\"Distribution of Shapley values\",\n",
     "    colorbar_limits=(-0.025, 0.027),\n",
-    ")"
+    ")\n"
    ]
   }
  ],

setup.py

@@ -12,7 +12,7 @@
     package_dir={"": "src"},
     packages=find_packages(where="src"),
     include_package_data=True,
-    version="0.3.0",
+    version="0.3.1.dev0",
     description="The Python Data Valuation Library",
     install_requires=[
         line

src/pydvl/__init__.py

@@ -1 +1 @@
-__version__ = "0.3.0"
+__version__ = "0.3.1.dev0"