Skip to content

Commit 319b667

Browse files
yuxuanzhuangMattTDaviesIAlibayorbeckst
authored
Remove GSD from optional test dependencies (#4707)
* Fixed high dimensional GroupBase indexing. * fixed pep8 issues * Removed sanitisation * Fix #4687 -- rdkit values in azure CI (#4688) * Investigate rdkit issue * Update azure-pipelines.yml * fix numpy 2.0 import block * fix imports * mark analysis.pca.PCA as not parallelizable (#4684) - fix #4680 - PCA explicitly marked as not parallelizable (at least not with simple split-apply-combine) - add tests - update CHANGELOG * disable gsd * disable gsd in azure * reduce timeout and set logical * fix azure * restore timeout to 200 --------- Co-authored-by: Matthew Davies <128810112+MattTDavies@users.noreply.github.com> Co-authored-by: Irfan Alibay <IAlibay@users.noreply.github.com> Co-authored-by: Oliver Beckstein <orbeckst@gmail.com>
1 parent b3208b3 commit 319b667

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

.github/workflows/gh-ci.yaml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,8 @@ jobs:
8585
with:
8686
micromamba: true
8787
full-deps: ${{ matrix.full-deps }}
88+
# disable GSD because it occasionally introduce hanging in testing #4209
89+
gsd: ''
8890
# in most cases will just default to empty, i.e. pick up max version from other deps
8991
numpy: ${{ matrix.numpy }}
9092
extra-pip-deps: ${{ matrix.extra-pip-deps }}
@@ -113,7 +115,7 @@ jobs:
113115
PYTEST_FLAGS="${PYTEST_FLAGS} --cov-config=.coveragerc --cov=MDAnalysis --cov-report=xml"
114116
fi
115117
echo $PYTEST_FLAGS
116-
pytest -n auto --timeout=200 testsuite/MDAnalysisTests $PYTEST_FLAGS
118+
pytest -n logical --timeout=200 testsuite/MDAnalysisTests $PYTEST_FLAGS
117119
118120
- name: run_asv
119121
if: contains(matrix.name, 'asv_check')
@@ -161,6 +163,7 @@ jobs:
161163
with:
162164
micromamba: true
163165
full-deps: true
166+
gsd: ''
164167
extra-pip-deps: "docutils sphinx-sitemap sphinxcontrib-bibtex pybtex pybtex-docutils"
165168
extra-conda-deps: "mdanalysis-sphinx-theme>=1.3.0"
166169

@@ -281,4 +284,4 @@ jobs:
281284

282285
- name: run tests
283286
working-directory: ./dist
284-
run: python -m pytest --timeout=200 -n auto --pyargs MDAnalysisTests
287+
run: python -m pytest --timeout=200 -n logical --pyargs MDAnalysisTests

azure-pipelines.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@ jobs:
105105
biopython
106106
"chemfiles>=0.10,<0.10.4"
107107
duecredit
108-
"gsd>3.0.0"
109108
joblib
110109
GridDataFormats
111110
mmtf-python
@@ -114,6 +113,8 @@ jobs:
114113
pytng>=0.2.3
115114
rdkit>=2020.03.1
116115
tidynamics>=1.0.0
116+
# remove from azure to avoid test hanging #4707
117+
# "gsd>3.0.0"
117118
displayName: 'Install additional dependencies for 64-bit tests'
118119
condition: and(succeeded(), eq(variables['PYTHON_ARCH'], 'x64'))
119120
- script: >-
@@ -128,7 +129,7 @@ jobs:
128129
displayName: 'Check installed packages'
129130
- powershell: |
130131
cd testsuite
131-
pytest MDAnalysisTests --disable-pytest-warnings -n auto --timeout=200 -rsx --cov=MDAnalysis
132+
pytest MDAnalysisTests --disable-pytest-warnings -n logical --timeout=200 -rsx --cov=MDAnalysis
132133
displayName: 'Run MDAnalysis Test Suite'
133134
- script: |
134135
curl -s https://codecov.io/bash | bash

0 commit comments

Comments
 (0)