From 175ac56edba92995cb965b8d4ff54c1128284aa4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Jan=C3=9Fen?= Date: Sun, 4 Jan 2026 06:12:57 +0100 Subject: [PATCH 1/4] Remove upper bound for numpy and pillow --- .github/nglview-gha.yml | 3 +-- devtools/circleci/install_miniconda.sh | 4 ++-- devtools/conda-recipe/meta.yaml | 2 +- devtools/outdated/nglview-jupyterlab.sh | 2 +- environment.yml | 4 ++-- pip-requirements-test.txt | 2 +- setup.py | 2 +- 7 files changed, 9 insertions(+), 10 deletions(-) diff --git a/.github/nglview-gha.yml b/.github/nglview-gha.yml index 21d72161..3454117f 100644 --- a/.github/nglview-gha.yml +++ b/.github/nglview-gha.yml @@ -21,9 +21,8 @@ dependencies: - matplotlib - moviepy - imageio - - pillow<11.2.1 + - pillow - numpy - - numpy<2.3.0 - rdkit - mdanalysis - mdtraj diff --git a/devtools/circleci/install_miniconda.sh b/devtools/circleci/install_miniconda.sh index daeb0df9..d9a1b2be 100644 --- a/devtools/circleci/install_miniconda.sh +++ b/devtools/circleci/install_miniconda.sh @@ -10,9 +10,9 @@ yum install -y \ # export PATH=/root/miniconda3/bin:$PATH export PATH=/opt/conda/bin/:$PATH conda update --yes --all -conda install --yes conda-build anaconda-client numpy<2.3 matplotlib +conda install --yes conda-build anaconda-client numpy matplotlib conda info -conda install --yes jupyter notebook nose numpy<2.3 coverage cython netcdf4 +conda install --yes jupyter notebook nose numpy coverage cython netcdf4 # pytraj pip install pytraj # mdanalysis diff --git a/devtools/conda-recipe/meta.yaml b/devtools/conda-recipe/meta.yaml index 70524b01..18bc1794 100644 --- a/devtools/conda-recipe/meta.yaml +++ b/devtools/conda-recipe/meta.yaml @@ -12,7 +12,7 @@ requirements: - traitlets run: - python - - numpy<2.3 + - numpy - ipywidgets - notebook >4.1 - jupyter diff --git a/devtools/outdated/nglview-jupyterlab.sh b/devtools/outdated/nglview-jupyterlab.sh index 95e854ad..cb13b39c 100644 --- a/devtools/outdated/nglview-jupyterlab.sh +++ b/devtools/outdated/nglview-jupyterlab.sh @@ -12,7 +12,7 @@ ipywidgets_version=7.1.2 echo "nglview root folder: $nglview_src" echo "Creating env $env" -conda create -n $env python=${python_version} numpy<2.3 nomkl -y +conda create -n $env python=${python_version} numpy nomkl -y source activate $env conda install setuptools -c conda-forge --force -y conda install notebook==${notebook_version} -c conda-forge -y diff --git a/environment.yml b/environment.yml index a1a0dce3..a5c54e41 100644 --- a/environment.yml +++ b/environment.yml @@ -18,7 +18,7 @@ dependencies: - coveralls # Scientific - - numpy<2.3 + - numpy - pandas - ase - parmed @@ -33,4 +33,4 @@ dependencies: - matplotlib - moviepy - imageio - - pillow<11.2.1 + - pillow diff --git a/pip-requirements-test.txt b/pip-requirements-test.txt index f3553d58..442f68b2 100644 --- a/pip-requirements-test.txt +++ b/pip-requirements-test.txt @@ -19,4 +19,4 @@ simpletraj matplotlib moviepy==0.2.2.11 imageio -pillow<11.2.1 +pillow diff --git a/setup.py b/setup.py index 43537d97..0e9d0fed 100644 --- a/setup.py +++ b/setup.py @@ -71,7 +71,7 @@ def pre_dist(): 'notebook>=7', 'jupyterlab>=3', 'jupyterlab_widgets', - 'numpy<2.3', + 'numpy', ], 'extras_require': { "simpletraj": ["simpletraj"], From 8405c617b586bb98d4558b00f3ca8f33fda1d551 Mon Sep 17 00:00:00 2001 From: Jan Janssen Date: Fri, 30 Jan 2026 13:03:24 +0100 Subject: [PATCH 2/4] Update pip-requirements-test.txt --- pip-requirements-test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip-requirements-test.txt b/pip-requirements-test.txt index 442f68b2..1145e79b 100644 --- a/pip-requirements-test.txt +++ b/pip-requirements-test.txt @@ -17,6 +17,6 @@ simpletraj # movie making matplotlib -moviepy==0.2.2.11 +moviepy==2.2.1 imageio pillow From 89bc40bb22f9e3158c993e39278c95b34358ca3b Mon Sep 17 00:00:00 2001 From: Jan Janssen Date: Sun, 1 Feb 2026 19:51:50 +0100 Subject: [PATCH 3/4] Update test_movie_maker.py --- tests/test_movie_maker.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_movie_maker.py b/tests/test_movie_maker.py index abef2092..66eeb75c 100644 --- a/tests/test_movie_maker.py +++ b/tests/test_movie_maker.py @@ -6,7 +6,7 @@ import PIL.Image -@patch('moviepy.editor.ImageSequenceClip') +@patch('moviepy.video.io.ImageSequenceClip') @patch('PIL.Image') def test_movie_maker(mock_image, ImageSequenceClip): from nglview.contrib.movie import MovieMaker From 6e1813c045ba5d152b1df71f7a02a6dc5e5bc00f Mon Sep 17 00:00:00 2001 From: Jan Janssen Date: Sun, 1 Feb 2026 19:54:43 +0100 Subject: [PATCH 4/4] Update movie.py --- nglview/contrib/movie.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nglview/contrib/movie.py b/nglview/contrib/movie.py index 08eda3ab..6885f13b 100644 --- a/nglview/contrib/movie.py +++ b/nglview/contrib/movie.py @@ -1,10 +1,10 @@ from typing import List try: - import moviepy.editor as mpy + import moviepy.video.io as mpy except ImportError: print("You have to install moviepy, imageio and ffmeg") - print("pip install moviepy==0.2.2.11") - print("pip install imageio==1.6") + print("pip install moviepy==2.2.1") + print("pip install imageio==2.5") import os import threading