Skip to content

Commit 3189328

Browse files
committed
Merge branch 'python-3.14' of github.com:MDAnalysis/mdanalysis into python-3.14
2 parents 29b2cc6 + 7ce6ecc commit 3189328

File tree

3 files changed

+17
-7
lines changed

3 files changed

+17
-7
lines changed

.github/workflows/deploy.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ on:
44
pull_request:
55
branches:
66
- "package-*"
7-
- "develop"
87
push:
98
branches:
109
- "package-*"

.github/workflows/gh-ci.yaml

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,23 +31,33 @@ jobs:
3131
python-version: ["3.11", "3.12", "3.13"]
3232
full-deps: [true, ]
3333
codecov: [true, ]
34+
cython: ["cython<3.1", ]
3435
include:
35-
- name: python_314
36+
- name: python_314_nocov
3637
os: ubuntu-latest
3738
python-version: "3.14"
3839
full-deps: false
39-
codecov: true
40+
codecov: false
41+
cython: "cython"
42+
- name: python_311_nocov
43+
os: ubuntu-latest
44+
python-version: "3.11"
45+
full-deps: false
46+
codecov: false
47+
cython: "cython"
4048
- name: macOS_14_arm64_py313
4149
os: macOS-14
4250
python-version: "3.13"
4351
full-deps: false
4452
codecov: true
53+
cython: "cython<3.1"
4554
- name: numpy_min
4655
os: ubuntu-latest
4756
python-version: "3.11"
4857
full-deps: false
4958
codecov: true
5059
numpy: numpy=1.26.0
60+
cython: "cython<3.1"
5161
- name: asv_check
5262
os: ubuntu-latest
5363
python-version: "3.11"
@@ -88,7 +98,7 @@ jobs:
8898
# disable GSD because it occasionally introduce hanging in testing #4209
8999
gsd: ''
90100
# pin cython
91-
cython: 'cython<3.1'
101+
cython: ${{ matrix.cython }}
92102
# in most cases will just default to empty, i.e. pick up max version from other deps
93103
numpy: ${{ matrix.numpy }}
94104
extra-pip-deps: ${{ matrix.extra-pip-deps }}

azure-pipelines.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@ jobs:
3535
PYTHON_VERSION: '3.13'
3636
PYTHON_ARCH: 'x64'
3737
BUILD_TYPE: 'wheel'
38-
NUMPY_MIN: '1.26.0'
38+
NUMPY_MIN: '2.1.0'
3939
imageName: 'windows-2019'
4040
Win-Python311-64bit-full-wheel:
4141
PYTHON_VERSION: '3.11'
4242
PYTHON_ARCH: 'x64'
4343
BUILD_TYPE: 'wheel'
44-
NUMPY_MIN: '1.23.2'
44+
NUMPY_MIN: '1.26.0'
4545
imageName: 'windows-2019'
4646
Linux-Python313-64bit-full-wheel:
4747
PYTHON_VERSION: '3.13'
@@ -100,6 +100,8 @@ jobs:
100100
python -m pip install numpy==$(NUMPY_MIN)
101101
displayName: 'pin to older NumPy (wheel test)'
102102
condition: and(succeeded(), ne(variables['NUMPY_MIN'], ''))
103+
# Disabled PyTNG checking, see issue #5123
104+
# TODO: add pytng>=0.2.3 back once resolved
103105
- script: >-
104106
python -m pip install -vvv
105107
biopython
@@ -110,7 +112,6 @@ jobs:
110112
mmtf-python
111113
networkx
112114
parmed
113-
pytng>=0.2.3
114115
rdkit>=2024.03.4
115116
tidynamics>=1.0.0
116117
imdclient>=0.2.2

0 commit comments

Comments
 (0)