Skip to content

Commit 61df499

Browse files
committed
Merge branch 'release/v0.7.1'
2 parents 8739d18 + 6c90861 commit 61df499

File tree

102 files changed

+73437
-929
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

102 files changed

+73437
-929
lines changed

.bumpversion.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[bumpversion]
2-
current_version = 0.7.0
2+
current_version = 0.7.1
33
commit = False
44
tag = False
55
allow_dirty = False

.github/actions/deploy-docs/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ inputs:
55
description: Version number to use
66
required: true
77
alias:
8-
description: Alias to use (latest or stable)
8+
description: Alias to use (stable or develop)
99
required: true
1010
title:
1111
description: Alternative title to use

.github/workflows/tox.yaml renamed to .github/workflows/main.yaml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Run tests, build docs, publish to TestPyPI
1+
name: Tests, docs, package
22

33
on:
44
push:
@@ -25,8 +25,6 @@ jobs:
2525
runs-on: ubuntu-latest
2626
steps:
2727
- uses: actions/checkout@v3
28-
with:
29-
fetch-depth: 0
3028
- name: Setup Python 3.8
3129
uses: ./.github/actions/python
3230
with:
@@ -98,8 +96,6 @@ jobs:
9896
group: publish
9997
steps:
10098
- uses: actions/checkout@v3
101-
with:
102-
fetch-depth: 0
10399
- name: Setup Python 3.8
104100
uses: ./.github/actions/python
105101
with:
@@ -123,6 +119,6 @@ jobs:
123119
run: |
124120
set -x
125121
export BUILD_NUMBER=$GITHUB_RUN_NUMBER
126-
bump2version --no-tag --no-commit --verbose --serialize '\{major\}.\{minor\}.\{patch\}.\{release\}\{$BUILD_NUMBER\}' boguspart
122+
bump2version --no-tag --no-commit --verbose --serialize '{major}.{minor}.{patch}.{release}{$BUILD_NUMBER}' boguspart
127123
python setup.py sdist bdist_wheel
128124
twine upload -r testpypi --verbose --non-interactive dist/*

.github/workflows/publish.yaml

Lines changed: 12 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,11 @@ on:
1313
tag_name:
1414
description: The name of the tag for which a package should be published
1515
type: string
16-
required: false
16+
required: true
1717

1818
env:
19+
GITHUB_BOT_USERNAME: github-actions[bot]
20+
GITHUB_BOT_EMAIL: 41898282+github-actions[bot]@users.noreply.github.com
1921
PY_COLORS: 1
2022

2123
jobs:
@@ -24,35 +26,14 @@ jobs:
2426
concurrency:
2527
group: publish
2628
steps:
27-
- uses: actions/checkout@v3
29+
- name: Checking out last commit in release
30+
if: ${{ github.event_name != 'workflow_dispatch' }}
31+
uses: actions/checkout@v3
32+
- name: Checking out last commit for tag ${{ inputs.tag_name }}
33+
uses: actions/checkout@v3
34+
if: ${{ github.event_name == 'workflow_dispatch' }}
2835
with:
29-
fetch-depth: 0
30-
- name: Fail if manually triggered workflow does not have 'tag_name' input
31-
if: github.event_name == 'workflow_dispatch' && inputs.tag_name == ''
32-
run: |
33-
echo "Input 'tag_name' should not be empty"
34-
exit -1
35-
- name: Extract branch name from input
36-
id: get_branch_name_input
37-
if: github.event_name == 'workflow_dispatch'
38-
run: |
39-
export BRANCH_NAME=$(git log -1 --format='%D' ${{ inputs.tag_name }} | sed -e 's/.*origin\/\(.*\).*/\1/')
40-
echo "$BRANCH_NAME"
41-
echo "branch_name=${BRANCH_NAME}" >> $GITHUB_OUTPUT
42-
- name: Extract branch name from tag
43-
id: get_branch_name_tag
44-
if: github.release.tag_name != ''
45-
run: |
46-
export BRANCH_NAME=$(git log -1 --format='%D' ${{ github.release.tag_name }} | sed -e 's/.*origin\/\(.*\).*/\1/')
47-
echo "$BRANCH_NAME"
48-
echo "branch_name=${BRANCH_NAME}" >> $GITHUB_OUTPUT
49-
shell: bash
50-
- name: Fail if tag is not on 'master' branch
51-
if: ${{ steps.get_branch_name_tag.outputs.branch_name != 'master' && steps.get_branch_name_input.outputs.branch_name != 'master' }}
52-
run: |
53-
echo "Tag is on branch ${{ steps.get_branch_name.outputs.branch_name }}"
54-
echo "Should be on Master branch instead"
55-
exit -1
36+
ref: ${{ inputs.tag_name }}
5637
- name: Fail if running locally
5738
if: ${{ env.ACT }} # skip during local actions testing
5839
run: |
@@ -72,8 +53,8 @@ jobs:
7253
uses: ./.github/actions/deploy-docs
7354
with:
7455
version: ${{ env.CURRENT_VERSION }}
75-
alias: latest
76-
title: Latest
56+
alias: stable
57+
title: ${{ env.CURRENT_VERSION }}
7758
email: ${{ env.GITHUB_BOT_EMAIL }}
7859
username: ${{ env.GITHUB_BOT_USERNAME }}
7960
set-default: 'true'

.github/workflows/run-tests-workflow.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,10 @@ jobs:
3131
with:
3232
key: tox-${{ github.ref }}-${{ runner.os }}-${{ hashFiles('tox.ini', 'requirements.txt') }}
3333
path: .tox
34+
- name: Set up memcached
35+
uses: niden/actions-memcached@v7
3436
- name: Test Base Modules
35-
run: tox
37+
run: tox -e base
3638
if: inputs.tests_to_run == 'base'
3739
- name: Test Modules that rely on PyTorch
3840
run: tox -e torch

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ celerybeat.pid
110110
.venv
111111
env/
112112
venv/
113+
venv38/
113114
ENV/
114115
env.bak/
115116
venv.bak/
@@ -139,6 +140,7 @@ pylint.html
139140
# Saved data
140141
runs/
141142
data/models/
143+
*.pkl
142144

143145
# Docs
144146
docs_build

.readthedocs.yaml

Lines changed: 0 additions & 13 deletions
This file was deleted.

CHANGELOG.md

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,37 @@
11
# Changelog
22

3+
4+
## 0.7.1 - 🆕 New methods, bug fixes and improvements for local tests 🐞🧪
5+
6+
### Added
7+
8+
- New method: Class-wise Shapley values
9+
[PR #338](https://github.com/aai-institute/pyDVL/pull/338)
10+
- New method: Data-OOB by @BastienZim
11+
[PR #426](https://github.com/aai-institute/pyDVL/pull/426),
12+
[PR $431](https://github.com/aai-institute/pyDVL/pull/431)
13+
- Added `AntitheticPermutationSampler`
14+
[PR #439](https://github.com/aai-institute/pyDVL/pull/439)
15+
- Faster semi-value computation with per-index check of stopping criteria (optional)
16+
[PR #437](https://github.com/aai-institute/pyDVL/pull/437)
17+
18+
### Changed
19+
20+
- No longer using docker within tests to start a memcached server
21+
[PR #444](https://github.com/aai-institute/pyDVL/pull/444)
22+
- Using pytest-xdist for faster local tests
23+
[PR #440](https://github.com/aai-institute/pyDVL/pull/440)
24+
- Improvements and fixes to notebooks
25+
[PR #436](https://github.com/aai-institute/pyDVL/pull/436)
26+
- Refactoring of parallel module. Old imports will stop working in v0.9.0
27+
[PR #421](https://github.com/aai-institute/pyDVL/pull/421)
28+
29+
### Fixed
30+
31+
- Fix initialization of `data_names` in `ValuationResult.zeros()`
32+
[PR #443](https://github.com/aai-institute/pyDVL/pull/443)
33+
34+
335
## 0.7.0 - 📚🆕 Documentation and IF overhaul, new methods and bug fixes 💥🐞
436

537
This is our first β release! We have worked hard to deliver improvements across
@@ -19,6 +51,13 @@ randomness.
1951
`pydvl.value.semivalues`. Introduced new type `Seed` and conversion function
2052
`ensure_seed_sequence`.
2153
[PR #396](https://github.com/aai-institute/pyDVL/pull/396)
54+
- Added `batch_size` parameter to `compute_banzhaf_semivalues`,
55+
`compute_beta_shapley_semivalues`, `compute_shapley_semivalues` and
56+
`compute_generic_semivalues`.
57+
[PR #428](https://github.com/aai-institute/pyDVL/pull/428)
58+
- Added classwise Shapley as proposed by (Schoch et al. 2021)
59+
[https://arxiv.org/abs/2211.06800]
60+
[PR #338](https://github.com/aai-institute/pyDVL/pull/338)
2261

2362
### Changed
2463

@@ -240,3 +279,4 @@ It contains:
240279
- Parallelization of computations with Ray
241280
- Documentation
242281
- Notebooks containing examples of different use cases
282+

CITATION.cff

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,6 @@ keywords:
2727
- Banzhaf index
2828
license: LGPL-3.0
2929
commit: 0e929ae121820b0014bf245da1b21032186768cb
30-
version: v0.6.1
31-
date-released: '2023-04-13'
30+
version: v0.7.0
31+
doi: 10.5281/zenodo.8311583
32+
date-released: '2023-09-02'

0 commit comments

Comments
 (0)