Skip to content

Commit

Permalink
New versions of Python and Python dependencies.
Browse files Browse the repository at this point in the history
  • Loading branch information
jackjansen committed Jan 15, 2025
1 parent 8a891ad commit 65268b4
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
3 changes: 2 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,9 @@ if(CWIPC_WITH_PYTHON)
# The upper limit on the Python version is caused by opencv and open3d,
# which can lag behind some times. As soon as those packages are available
# for a new release of Python we can update this version.
# See cwipc_util/python/pyproject.toml for the current versions of those packages.
#
find_package(Python3 3.9...<3.12 REQUIRED COMPONENTS Interpreter)
find_package(Python3 3.11...<3.12 REQUIRED COMPONENTS Interpreter)

#
# Now we can setup the venv.
Expand Down
2 changes: 1 addition & 1 deletion cwipc_util
10 changes: 5 additions & 5 deletions scripts/install-3rdparty-osx1015.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@ set -x
brew install pkg-config || brew upgrade pkg-config
brew install cmake || brew upgrade cmake
brew install pcl || brew upgrade pcl
brew install python@3.11 || brew upgrade python@3.11
brew link python@3.11
brew install python@3.12 || brew upgrade python@3.12
brew link python@3.12
brew install pkg-config || brew upgrade pkg-config
brew install homebrew/core/glfw3 || brew upgrade homebrew/core/glfw3
brew install librealsense || brew upgrade librealsense
brew install jpeg-turbo || brew upgrade jpeg-turbo
brew link --force jpeg-turbo

# Install Python delendencies
python3.11 -m pip install --upgrade pip setuptools build wheel
python3.12 -m pip install --upgrade pip setuptools build wheel

# Install Python dependencies for Depolyment scripts (unsure they are still needed)
python3.11 -m pip install requests requests_toolbelt mechanize pillow numpy open3d
# Install Python dependencies for Deployment scripts (unsure they are still needed)
python3.12 -m pip install requests requests_toolbelt mechanize pillow numpy open3d
5 changes: 2 additions & 3 deletions scripts/install-3rdparty-ubuntu2404.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,9 @@ sudo tee /etc/apt/sources.list.d/librealsense.list
#
sudo apt-get -y update
sudo apt-get -y upgrade
# We need Python 3.11, for now
sudo apt-add-repository -y ppa:deadsnakes/ppa
sudo apt-get install -y python3.11 python3.11-dev python3.11-venv
# Install packages we need
sudo apt-get install -y git python3-pip
sudo apt-get install -y git python3-venv
sudo apt-get install -y tzdata
sudo apt-get install -y software-properties-common
sudo apt-get install -y git cmake
Expand Down

0 comments on commit 65268b4

Please sign in to comment.