Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Always use Python 3.11 in pixi #5365

Merged
merged 11 commits into from
Mar 1, 2024
2 changes: 1 addition & 1 deletion examples/python/car/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
numpy
opencv-python<4.6 # Avoid opencv-4.6 since it rotates images incorrectly (https://github.com/opencv/opencv/issues/22088)
opencv-python>4.6 # Avoid opencv-4.6 since it rotates images incorrectly (https://github.com/opencv/opencv/issues/22088)
rerun-sdk
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ requests>=2.31,<3
rerun-sdk
scipy
#TODO(#4704): clean that up when pytorch is available for 3.12
torch>1.13.0; python_version < "3.12"
torch>1.13.0 ; python_version < "3.12"
transformers>=4.26.0
4 changes: 2 additions & 2 deletions examples/python/detect_and_track_objects/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
numpy
opencv-contrib-python<4.6 # Avoid opencv-4.6 since it rotates images incorrectly (https://github.com/opencv/opencv/issues/22088)
opencv-python<4.6 # Avoid opencv-4.6 since it rotates images incorrectly (https://github.com/opencv/opencv/issues/22088)
opencv-contrib-python>4.6 # Avoid opencv-4.6 since it rotates images incorrectly (https://github.com/opencv/opencv/issues/22088)
opencv-python>4.6 # Avoid opencv-4.6 since it rotates images incorrectly (https://github.com/opencv/opencv/issues/22088)
pillow
requests>=2.31,<3
rerun-sdk
Expand Down
4 changes: 2 additions & 2 deletions examples/python/face_tracking/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
mediapipe>=0.10.1
mediapipe>=0.10.1 ; python_version <= '3.11' # no 3.12 version yet (https://pypi.org/project/mediapipe/)
numpy
opencv-python<4.6 # Avoid opencv-4.6 since it rotates images incorrectly (https://github.com/opencv/opencv/issues/22088)
opencv-python>4.6 # Avoid opencv-4.6 since it rotates images incorrectly (https://github.com/opencv/opencv/issues/22088)
requests
rerun-sdk
tqdm
2 changes: 1 addition & 1 deletion examples/python/gesture_detection/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
mediapipe==0.10.9 # For mac also you may need to run this: export SYSTEM_VERSION_COMPAT=0
mediapipe==0.10.9 ; python_version <= '3.11' # no 3.12 version yet (https://pypi.org/project/mediapipe/) # For mac also you may need to run this: export SYSTEM_VERSION_COMPAT=0
numpy
opencv-python>4.9
requests>=2.31,<3
Expand Down
4 changes: 2 additions & 2 deletions examples/python/human_pose_tracking/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
mediapipe>=0.10.9
mediapipe>=0.10.9 ; python_version <= '3.11' # no 3.12 version yet (https://pypi.org/project/mediapipe/)
numpy
opencv-python<4.6 # Avoid opencv-4.6 since it rotates images incorrectly (https://github.com/opencv/opencv/issues/22088)
opencv-python>4.6 # Avoid opencv-4.6 since it rotates images incorrectly (https://github.com/opencv/opencv/issues/22088)
requests>=2.31,<3
rerun-sdk
4 changes: 2 additions & 2 deletions examples/python/live_depth_sensor/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
numpy
pyrealsense2-mac; sys_platform == 'darwin'
pyrealsense2; sys_platform != 'darwin'
pyrealsense2-mac; sys_platform == 'darwin' and python_version <= '3.11' # no 3.12 version yet (https://pypi.org/project/pyrealsense2-mac/)
pyrealsense2; sys_platform != 'darwin' and python_version <= '3.11' # no 3.12 version yet (https://pypi.org/project/pyrealsense2-mac/)
rerun-sdk
2 changes: 1 addition & 1 deletion examples/python/objectron/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
betterproto[compiler]
numpy
opencv-python<4.6 # Avoid opencv-4.6 since it rotates images incorrectly (https://github.com/opencv/opencv/issues/22088)
opencv-python>4.6 # Avoid opencv-4.6 since it rotates images incorrectly (https://github.com/opencv/opencv/issues/22088)
requests>=2.31,<3
rerun-sdk
scipy
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
numpy
pillow
pyopf; python_version >= '3.10' # silence error if this requirements.txt gets pulled in a <3.10 venv
pyopf ; python_version >= '3.10' # silence error if this requirements.txt gets pulled in a <3.10 venv
requests
rerun-sdk
tqdm
2 changes: 1 addition & 1 deletion examples/python/rgbd/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
numpy
opencv-python<4.6 # Avoid opencv-4.6 since it rotates images incorrectly (https://github.com/opencv/opencv/issues/22088)
opencv-python>4.6 # Avoid opencv-4.6 since it rotates images incorrectly (https://github.com/opencv/opencv/issues/22088)
requests>=2.31,<3
rerun-sdk
tqdm
4 changes: 2 additions & 2 deletions examples/python/ros_node/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
numpy
opencv-python
pycollad
pycollada
rerun-sdk
scipy
yourdf
yourdfpy
2 changes: 1 addition & 1 deletion examples/python/structure_from_motion/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
opencv-python<4.6 # Avoid opencv-4.6 since it rotates images incorrectly (https://github.com/opencv/opencv/issues/22088)
opencv-python>4.6 # Avoid opencv-4.6 since it rotates images incorrectly (https://github.com/opencv/opencv/issues/22088)
numpy
requests>=2.31,<3
rerun-sdk
Expand Down
5,736 changes: 2,378 additions & 3,358 deletions pixi.lock

Large diffs are not rendered by default.

5 changes: 4 additions & 1 deletion pixi.toml
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,9 @@ toml-fmt = "taplo fmt"
ruff-fix = "ruff --fix --config rerun_py/pyproject.toml ."

py-build = "maturin develop --manifest-path rerun_py/Cargo.toml --extras=tests"

# Run the Python tests.
# Don't call this on CI - use `nox` to run tests on all supported Python versions instead.
py-test = { cmd = "python -m pytest -vv rerun_py/tests/unit", depends_on = [
"py-build",
] }
Expand Down Expand Up @@ -163,7 +166,7 @@ numpy = ">=1.23,<2"
pip = ">=23"
pyarrow = "14.0.2"
pytest = ">=7"
python = ">=3.8,<3.12"
python = "=3.11" # We use the latest Python version here, so we get the latest mypy etc, EXCEPT 3.12 is too new for some of our examples. We run our CI tests on ALL supported versions though.
ruff = "0.2.2"
semver = ">=2.13,<2.14"
taplo = "=0.8.1"
Expand Down
Loading