From 28df18b9057436638a669923ca6f52b294a9243b Mon Sep 17 00:00:00 2001 From: Mathieu De Coster Date: Tue, 4 Feb 2025 17:26:11 +0100 Subject: [PATCH] Lock numpy to <2.0 The locked OpenCV version we are using does not work with Numpy>=2.0 --- airo-camera-toolkit/setup.py | 2 +- airo-dataset-tools/setup.py | 2 +- airo-robots/setup.py | 2 +- airo-spatial-algebra/setup.py | 2 +- airo-typing/setup.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/airo-camera-toolkit/setup.py b/airo-camera-toolkit/setup.py index 1df084e..d59f5d2 100644 --- a/airo-camera-toolkit/setup.py +++ b/airo-camera-toolkit/setup.py @@ -10,7 +10,7 @@ author="Thomas Lips", author_email="thomas.lips@ugent.be", install_requires=[ - "numpy", + "numpy<2.0", "opencv-contrib-python==4.8.1.78", # We need opencv contrib for the aruco marker detection, but when some packages install (a different version of) opencv-python-headless, this breaks the contrib version. So we install both here to make sure they are the same version. "opencv-python-headless==4.8.1.78", # Lock to match contrib version. "matplotlib", diff --git a/airo-dataset-tools/setup.py b/airo-dataset-tools/setup.py index ce91cb2..787a45b 100644 --- a/airo-dataset-tools/setup.py +++ b/airo-dataset-tools/setup.py @@ -10,7 +10,7 @@ author_email="victorlouisdg@gmail.com", description="TODO", install_requires=[ - "numpy", + "numpy<2.0", "pydantic>2.0.0", # pydantic 2.0.0 has a lot of breaking changes "opencv-contrib-python==4.8.1.78", # See airo-camera-toolkit setup.py for explanation "opencv-python-headless==4.8.1.78", # See airo-camera-toolkit setup.py for explanation diff --git a/airo-robots/setup.py b/airo-robots/setup.py index bacd5a0..b55fb34 100644 --- a/airo-robots/setup.py +++ b/airo-robots/setup.py @@ -10,7 +10,7 @@ author="Thomas Lips", author_email="thomas.lips@ugent.be", install_requires=[ - "numpy", + "numpy<2.0", "ur-rtde>=1.5.7", # cf https://github.com/airo-ugent/airo-mono/issues/52 "click", "airo-typing", diff --git a/airo-spatial-algebra/setup.py b/airo-spatial-algebra/setup.py index cd8177b..9125008 100644 --- a/airo-spatial-algebra/setup.py +++ b/airo-spatial-algebra/setup.py @@ -9,7 +9,7 @@ description="code for working with SE3 poses,transforms,... for robotic manipulation at the Ghent University AI and Robotics Lab", author="Thomas Lips", author_email="thomas.lips@ugent.be", - install_requires=["numpy", "scipy", "spatialmath-python", "airo-typing"], + install_requires=["numpy<2.0", "scipy", "spatialmath-python", "airo-typing"], packages=setuptools.find_packages(exclude=["test"]), # include py.typed to declare type information is available, see # https://mypy.readthedocs.io/en/stable/installed_packages.html#making-pep-561-compatible-packages diff --git a/airo-typing/setup.py b/airo-typing/setup.py index bc1d87c..ecd41ca 100644 --- a/airo-typing/setup.py +++ b/airo-typing/setup.py @@ -6,7 +6,7 @@ description="python type definitions for use in the python packages at the Ghent University AI and Robotics Lab", author="Thomas Lips", author_email="thomas.lips@ugent.be", - install_requires=["numpy"], + install_requires=["numpy<2.0"], packages=setuptools.find_packages(exclude=["test"]), package_data={"airo_typing": ["py.typed"]}, )