Skip to content

Commit d493eee

Browse files
committed
Add ASV benchmarks for Contacts Analysis
2 parents fb61c65 + 6a1befe commit d493eee

File tree

11 files changed

+76
-106
lines changed

11 files changed

+76
-106
lines changed

.github/workflows/deploy.yaml

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,12 @@ jobs:
4545
run:
4646
working-directory: ./package
4747
steps:
48-
- uses: actions/checkout@v4
48+
- uses: actions/checkout@v6
4949
with:
5050
fetch-depth: 0
5151

5252
- name: Build wheels
53-
uses: pypa/cibuildwheel@v3.2.0
53+
uses: pypa/cibuildwheel@v3.4.0
5454
with:
5555
package-dir: package
5656
env:
@@ -62,7 +62,7 @@ jobs:
6262
if: |
6363
(github.event_name == 'push' && startsWith(github.ref, 'refs/tags/package')) ||
6464
(github.event_name == 'release' && github.event.action == 'published')
65-
uses: actions/upload-artifact@v4
65+
uses: actions/upload-artifact@v7
6666
with:
6767
name: wheel-${{ matrix.buildplat[0] }}-${{ matrix.python }}
6868
path: wheelhouse/*.whl
@@ -77,7 +77,7 @@ jobs:
7777
run:
7878
working-directory: ./package
7979
steps:
80-
- uses: actions/checkout@v4
80+
- uses: actions/checkout@v6
8181
with:
8282
fetch-depth: 0
8383

@@ -88,7 +88,7 @@ jobs:
8888
if: |
8989
(github.event_name == 'push' && startsWith(github.ref, 'refs/tags/package')) ||
9090
(github.event_name == 'release' && github.event.action == 'published')
91-
uses: actions/upload-artifact@v4
91+
uses: actions/upload-artifact@v7
9292
with:
9393
name: sdist
9494
path: package/dist/*.tar.gz
@@ -103,7 +103,7 @@ jobs:
103103
run:
104104
working-directory: ./testsuite
105105
steps:
106-
- uses: actions/checkout@v4
106+
- uses: actions/checkout@v6
107107
with:
108108
fetch-depth: 0
109109

@@ -114,7 +114,7 @@ jobs:
114114
if: |
115115
(github.event_name == 'push' && startsWith(github.ref, 'refs/tags/package')) ||
116116
(github.event_name == 'release' && github.event.action == 'published')
117-
uses: actions/upload-artifact@v4
117+
uses: actions/upload-artifact@v7
118118
with:
119119
name: sdist_tests
120120
path: testsuite/dist/*.tar.gz
@@ -133,7 +133,7 @@ jobs:
133133
runs-on: ubuntu-latest
134134
needs: [build_wheels, build_sdist, build_sdist_tests]
135135
steps:
136-
- uses: actions/download-artifact@v4
136+
- uses: actions/download-artifact@v8
137137
with:
138138
path: dist
139139
merge-multiple: true
@@ -162,7 +162,7 @@ jobs:
162162
runs-on: ubuntu-latest
163163
needs: [build_wheels, build_sdist, build_sdist_tests]
164164
steps:
165-
- uses: actions/download-artifact@v4
165+
- uses: actions/download-artifact@v8
166166
with:
167167
path: dist
168168
merge-multiple: true
@@ -192,7 +192,7 @@ jobs:
192192
runs-on: ubuntu-latest
193193
needs: [build_wheels, build_sdist, build_sdist_tests]
194194
steps:
195-
- uses: actions/download-artifact@v4
195+
- uses: actions/download-artifact@v8
196196
with:
197197
path: dist
198198
merge-multiple: true
@@ -218,7 +218,7 @@ jobs:
218218
runs-on: ubuntu-latest
219219
needs: [build_wheels, build_sdist, build_sdist_tests]
220220
steps:
221-
- uses: actions/download-artifact@v4
221+
- uses: actions/download-artifact@v8
222222
with:
223223
path: dist
224224
merge-multiple: true
@@ -257,7 +257,7 @@ jobs:
257257
MPLBACKEND: agg
258258

259259
steps:
260-
- uses: actions/checkout@v4
260+
- uses: actions/checkout@v6
261261

262262
- name: setup_micromamba
263263
uses: mamba-org/setup-micromamba@v2
@@ -267,11 +267,9 @@ jobs:
267267
python=${{ matrix.python-version }}
268268
packaging
269269
pip
270-
# jaime's shim to avoid pulling down the cudatoolkit
271270
# bioconda for clustalw things
272271
condarc: |
273272
channels:
274-
- jaimergp/label/unsupported-cudatoolkit-shim
275273
- conda-forge
276274
- bioconda
277275

.github/workflows/gh-ci-cron.yaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,14 @@ jobs:
3333
timeout-minutes: 60
3434

3535
steps:
36-
- uses: actions/checkout@v4
36+
- uses: actions/checkout@v6
3737

3838
- name: setup_os
3939
uses: ./.github/actions/setup-os
4040
with:
4141
os-type: "ubuntu"
4242

43-
- uses: actions/setup-python@v5
43+
- uses: actions/setup-python@v6
4444

4545
# minimally install nightly wheels & core deps
4646
- name: nightly_wheels
@@ -91,7 +91,7 @@ jobs:
9191
timeout-minutes: 60
9292

9393
steps:
94-
- uses: actions/checkout@v4
94+
- uses: actions/checkout@v6
9595

9696
- name: setup_os
9797
uses: ./.github/actions/setup-os
@@ -143,7 +143,7 @@ jobs:
143143
os: [ubuntu-22.04, macos-14]
144144

145145
steps:
146-
- uses: actions/checkout@v4
146+
- uses: actions/checkout@v6
147147

148148
- name: setup_os
149149
uses: ./.github/actions/setup-os
@@ -190,14 +190,14 @@ jobs:
190190
matrix:
191191
python-version: ["3.11", "3.12", "3.13", "3.14"]
192192
steps:
193-
- uses: actions/checkout@v4
193+
- uses: actions/checkout@v6
194194

195195
- name: setup_os
196196
uses: ./.github/actions/setup-os
197197
with:
198198
os-type: "ubuntu"
199199

200-
- uses: actions/setup-python@v5
200+
- uses: actions/setup-python@v6
201201
with:
202202
python-version: ${{ matrix.python-version }}
203203

@@ -234,7 +234,7 @@ jobs:
234234
os: [ubuntu-latest, macos-13]
235235
python-version: ["3.10", "3.11", "3.12", "3.13"]
236236
steps:
237-
- uses: actions/checkout@v4
237+
- uses: actions/checkout@v6
238238

239239
- name: setup_os
240240
uses: ./.github/actions/setup-os
@@ -280,15 +280,15 @@ jobs:
280280
wheels: ['true', 'false']
281281
steps:
282282
# Checkout to have access to local actions (i.e. setup-os)
283-
- uses: actions/checkout@v4
283+
- uses: actions/checkout@v6
284284

285285
# We need this here in order to make sure we assign the correct compiler (i.e. clang for macos)
286286
- name: setup_os
287287
uses: ./.github/actions/setup-os
288288
with:
289289
os-type: ${{ matrix.os }}
290290

291-
- uses: actions/setup-python@v5
291+
- uses: actions/setup-python@v6
292292
with:
293293
python-version: ${{ matrix.python-version }}
294294

.github/workflows/gh-ci.yaml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ jobs:
7373
MPLBACKEND: agg
7474

7575
steps:
76-
- uses: actions/checkout@v4
76+
- uses: actions/checkout@v6
7777

7878
- name: setup_os
7979
uses: ./.github/actions/setup-os
@@ -87,10 +87,8 @@ jobs:
8787
create-args: >-
8888
python=${{ matrix.python-version }}
8989
pip
90-
# using jaime's shim to avoid pulling down the cudatoolkit
9190
condarc: |
9291
channels:
93-
- jaimergp/label/unsupported-cudatoolkit-shim
9492
- conda-forge
9593
- bioconda
9694
@@ -158,7 +156,7 @@ jobs:
158156
MPLBACKEND: agg
159157

160158
steps:
161-
- uses: actions/checkout@v4
159+
- uses: actions/checkout@v6
162160

163161
- name: setup_micromamba
164162
uses: mamba-org/setup-micromamba@v2
@@ -167,7 +165,6 @@ jobs:
167165
create-args: >-
168166
python=3.11
169167
pip
170-
# using jaime's shim to avoid pulling down the cudatoolkit
171168
condarc: |
172169
channels:
173170
- conda-forge
@@ -256,9 +253,9 @@ jobs:
256253
timeout-minutes: 30
257254

258255
steps:
259-
- uses: actions/checkout@v4
256+
- uses: actions/checkout@v6
260257

261-
- uses: actions/setup-python@v5
258+
- uses: actions/setup-python@v6
262259
with:
263260
python-version: 3.11
264261

.github/workflows/greetings.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
permissions:
1515
pull-requests: write
1616
steps:
17-
- uses: actions/first-interaction@v1
17+
- uses: actions/first-interaction@v3
1818
with:
1919
repo-token: ${{ secrets.GITHUB_TOKEN }}
2020
pr-message: 'Hello there first time contributor! Welcome to the MDAnalysis community! We ask that all contributors abide by our [Code of Conduct](https://www.mdanalysis.org/pages/conduct/) and that first time contributors introduce themselves on [GitHub Discussions](https://github.com/MDAnalysis/mdanalysis/discussions) so we can get to know you. You can learn more about [participating here](https://www.mdanalysis.org/#participating). Please also add yourself to `package/AUTHORS` as part of this PR.'

.github/workflows/labels.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-latest
1111
timeout-minutes: 10
1212
steps:
13-
- uses: actions/labeler@v5
13+
- uses: actions/labeler@v6
1414
with:
1515
repo-token: "${{ secrets.GITHUB_TOKEN }}"
1616
configuration-path: ".github/pr_path_labeler.yml"

.github/workflows/linters.yaml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
name: "linters"
22
on:
3+
workflow_dispatch:
34
pull_request:
45
branches:
56
- develop
@@ -25,11 +26,11 @@ jobs:
2526
shell: bash
2627

2728
steps:
28-
- uses: actions/checkout@v4
29+
- uses: actions/checkout@v6
2930
with:
3031
fetch-depth: 0
3132

32-
- uses: actions/setup-python@v5
33+
- uses: actions/setup-python@v6
3334
with:
3435
python-version: "3.11"
3536

@@ -51,9 +52,9 @@ jobs:
5152
runs-on: ubuntu-latest
5253
timeout-minutes: 10
5354
steps:
54-
- uses: actions/checkout@v4
55+
- uses: actions/checkout@v6
5556

56-
- uses: actions/setup-python@v5
57+
- uses: actions/setup-python@v6
5758
with:
5859
python-version: "3.11"
5960

@@ -73,7 +74,7 @@ jobs:
7374
runs-on: ubuntu-latest
7475
timeout-minutes: 10
7576
steps:
76-
- uses: actions/checkout@v4
77+
- uses: actions/checkout@v6
7778

7879
- name: setup_micromamba
7980
uses: mamba-org/setup-micromamba@v2

azure-pipelines.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ jobs:
131131
displayName: 'Check installed packages'
132132
- powershell: |
133133
cd testsuite
134-
pytest MDAnalysisTests --disable-pytest-warnings -n logical --timeout=200 -rsx --cov=MDAnalysis
134+
pytest MDAnalysisTests --disable-pytest-warnings -n logical --timeout=200 -rsx --cov=MDAnalysis --durations=50
135135
displayName: 'Run MDAnalysis Test Suite'
136136
- script: |
137137
curl -s https://codecov.io/bash | bash

package/AUTHORS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,7 @@ Chronological list of authors
276276
- Kunj Sinha
277277
- Ayush Agarwal
278278
- Amarendra Mohan
279+
- Parth Uppal
279280

280281
External code
281282
-------------

package/CHANGELOG

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ Fixes
4242
DSSP by porting upstream PyDSSP 0.9.1 fix (Issue #4913)
4343

4444
Enhancements
45+
* Reduces duplication of code in _apply() function (Issue #5247, PR #5294)
4546
* Added new top-level `MDAnalysis.fetch` module (PR #4943)
4647
* Added new function `MDAnalysis.fetch.from_PDB` to download structure files from wwPDB
4748
using `pooch` as optional dependency (Issue #4907, PR #4943)

0 commit comments

Comments
 (0)