Skip to content

Commit c5f167f

Browse files
Make installing setuptools configurable (#754)
As ROS doesn't like newer setuptools
2 parents 508643a + ecff776 commit c5f167f

File tree

2 files changed

+18
-7
lines changed

2 files changed

+18
-7
lines changed

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.27.3
1+
1.28.0

setup/tue-env.bash

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,10 @@ function tue-env
7878
# Make sure the correct directories are there
7979
mkdir -p "$TUE_DIR"/user/envs
8080

81-
local create_venv targets_url tue_env tue_env_dir venv_include_system_site
81+
local create_venv targets_url tue_env tue_env_dir venv_include_system_site venv_setuptools
8282
create_venv="true"
8383
venv_include_system_site="true"
84+
venv_setuptools="false"
8485

8586
if [[ ${cmd} == "init" ]]
8687
then
@@ -97,6 +98,8 @@ function tue-env
9798
create_venv="${i#*=}" ;;
9899
--virtualenv-include-system-site-packages=* )
99100
venv_include_system_site="${i#*=}" ;;
101+
--virtualenv-install-setuptools=* )
102+
venv_setuptools="${i#*=}" ;;
100103
--help | -h )
101104
show_help="true"
102105
break
@@ -125,7 +128,7 @@ function tue-env
125128

126129
if [[ "${show_help}" == "true" ]]
127130
then
128-
echo "Usage: tue-env init NAME [DIRECTORY] [--help|-h] [--targets-url=TARGETS GIT URL] [--create-virtualenv=false|TRUE] [--virtualenv-include-system-site-packages=false|TRUE]"
131+
echo "Usage: tue-env init NAME [DIRECTORY] [--help|-h] [--targets-url=TARGETS_GIT_URL] [--create-virtualenv=false|TRUE] [--virtualenv-include-system-site-packages=false|TRUE] [--virtualenv-install-setuptools=FALSE|true]"
129132
return 1
130133
fi
131134

@@ -157,7 +160,7 @@ function tue-env
157160

158161
if [[ "${create_venv}" == "true" ]]
159162
then
160-
tue-env init-venv "${tue_env}" --include-system-site-packages="${venv_include_system_site}"
163+
tue-env init-venv "${tue_env}" --include-system-site-packages="${venv_include_system_site}" --install-setuptools="${venv_setuptools}"
161164
fi
162165

163166
elif [[ ${cmd} == "remove" || ${cmd} == "rm" ]]
@@ -490,8 +493,9 @@ Environment directory '${tue_env_dir}' didn't exist (anymore)"""
490493

491494
elif [[ ${cmd} == "init-venv" ]]
492495
then
493-
local include_system_site tue_env
496+
local include_system_site install_setuptools tue_env
494497
include_system_site="true"
498+
install_setuptools="false"
495499
for i in "$@"
496500
do
497501
case $i in
@@ -501,6 +505,8 @@ Environment directory '${tue_env_dir}' didn't exist (anymore)"""
501505
;;
502506
--include-system-site-packages=* )
503507
include_system_site="${i#*=}" ;;
508+
--install-setuptools=* )
509+
install_setuptools="${i#*=}" ;;
504510
--* )
505511
echo "[tue-env] Unknown option $i"
506512
show_help="true"
@@ -522,7 +528,7 @@ Environment directory '${tue_env_dir}' didn't exist (anymore)"""
522528

523529
if [[ ${show_help} == "true" ]]
524530
then
525-
echo "Usage: tue-env init-venv [ENVIRONMENT] [--include-system-site-packages=false|true]"
531+
echo "Usage: tue-env init-venv [ENVIRONMENT] [--include-system-site-packages=false|TRUE] [--install-setuptools=FALSE|true]"
526532
return 1
527533
fi
528534

@@ -555,7 +561,12 @@ Environment directory '${tue_env_dir}' didn't exist (anymore)"""
555561
then
556562
system_site_args="--system-site-packages"
557563
fi
558-
/usr/bin/python3 -m virtualenv "${venv_dir}" ${system_site_args:+${system_site_args} }--symlinks -q 2>/dev/null
564+
local setuptools_args
565+
if [[ "${install_setuptools}" != "true" ]]
566+
then
567+
setuptools_args="--no-setuptools"
568+
fi
569+
/usr/bin/python3 -m virtualenv "${venv_dir}" ${system_site_args:+${system_site_args} }${setuptools_args:+${setuptools_args} }--symlinks -q 2>/dev/null
559570
echo "[tue-env](init-venv) Initialized virtualenv of environment '${tue_env}'"
560571

561572
if [ "${tue_env}" == "${TUE_ENV}" ]

0 commit comments

Comments
 (0)