Skip to content
Snippets Groups Projects
Commit 4ca7ab1a authored by Guilhem Saurel's avatar Guilhem Saurel
Browse files

ACHCTLUALLY… buster is py3 by default.

parent 56db3bba
No related branches found
No related tags found
No related merge requests found
Pipeline #19636 skipped
......@@ -14,7 +14,7 @@ RUN --mount=type=cache,sharing=locked,target=/var/cache/apt --mount=type=cache,s
git \
make \
pax \
python \
python3 \
tar \
&& git config --global user.email = "guilhem.saurel@laas.fr" \
&& git config --global user.name = "Buildfarm" \
......@@ -30,8 +30,8 @@ ENV ROBOTPKG_BASE=/opt/openrobots \
GIT_SUBMODULE_STRATEGY=recursive \
CTEST_OUTPUT_ON_FAILURE=1 \
CTEST_PARALLEL_LEVEL=4 \
PYTHON=python2 \
PY=2.7
PYTHON=python3 \
PY=3.7
ENV CMAKE_PREFIX_PATH=$ROBOTPKG_BASE:$CMAKE_PREFIX_PATH \
LD_LIBRARY_PATH=$ROBOTPKG_BASE/lib:$ROBOTPKG_BASE/lib/plugin:$ROBOTPKG_BASE/lib/dynamic-graph-plugins:$LD_LIBRARY_PATH \
......
......@@ -16,7 +16,6 @@ ENV ROS_ETC_DIR=${ROS_PREFIX}/etc/ros \
ROS_ROOT=${ROS_PREFIX}/share/ros \
ROS_VERSION=1 \
PATH=${ROS_PREFIX}/bin:${PATH} \
PYTHONPATH=${ROS_PREFIX}/lib/python${PY}/dist-packages \
CMAKE_PREFIX_PATH=${ROS_PREFIX} \
LD_LIBRARY_PATH=${ROS_PREFIX}/lib:${ROS_PREFIX}/lib/x86_64-linux-gnu \
PKG_CONFIG_PATH=${ROS_PREFIX}/lib/pkgconfig:${ROS_PREFIX}/lib/x86_64-linux-gnu/pkgconfig
......@@ -38,21 +38,20 @@ llvm
m4
pkg-config
psmisc
python2.7-dev
python3-dev
python3-crypto
python3-defusedxml
python3-empy
python3-gnupg
python3-matplotlib
python-crypto
python-defusedxml
python-empy
python-gnupg
python-matplotlib
python-netifaces
python-nose
python-numpy
python-paramiko
python-pil
python-pyparsing
python-setuptools
python-yaml
python3-netifaces
python3-nose
python3-numpy
python3-paramiko
python3-pil
python3-pyparsing
python3-setuptools
python3-yaml
qt5-qmake
qtbase5-dev
qtbase5-private-dev
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment