summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2015-08-06 08:45:42 +0200
committerParménides GV <parmegv@sdf.org>2015-08-06 08:45:42 +0200
commitcb92f58a141f410739ae6460b7eb8aaf2daa3c65 (patch)
tree6a8406d7f9e2e9575f591685263276809591f8b8
parent45c684100ffc611509b76549fbb2b93f2d21e41b (diff)
[feat] WHEELHOUSE can be a url + --use-leap-wheels
--use-leap-wheels sets --trusted-host (remove it when we have a proper cert) and WHEELHOUSE to https://ftp.lizard.leap.se Until we get ftp.lizard cname, use lizard as the wheels server. - Related: #7339
-rwxr-xr-xclient/pkg/pip_install_requirements.sh51
-rwxr-xr-xcommon/pkg/pip_install_requirements.sh51
-rwxr-xr-xserver/pkg/pip_install_requirements.sh51
3 files changed, 99 insertions, 54 deletions
diff --git a/client/pkg/pip_install_requirements.sh b/client/pkg/pip_install_requirements.sh
index c9dc3198..d0479365 100755
--- a/client/pkg/pip_install_requirements.sh
+++ b/client/pkg/pip_install_requirements.sh
@@ -1,27 +1,17 @@
-#!/bin/sh
+#!/bin/bash
# Update pip and install LEAP base/testing requirements.
# For convenience, $insecure_packages are allowed with insecure flags enabled.
# Use at your own risk.
# See $usage for help
insecure_packages="u1db dirspec"
-
-return_wheelhouse() {
- if [ "$WHEELHOUSE" = "" ]; then
- WHEELHOUSE=$HOME/wheelhouse
- fi
-
- if [ ! -d "$WHEELHOUSE" ]; then
- mkdir $WHEELHOUSE
- fi
-
- echo "$WHEELHOUSE"
-}
+leap_wheelhouse=https://lizard.leap.se/wheels
show_help() {
- usage="Usage: $0 [--testing]\n --testing\tInstall dependencies from requirements-testing.pip\n
-\t\tOtherwise, it will install requirements.pip"
- echo $usage
+ usage="Usage: $0 [--testing] [--use-leap-wheels]\n --testing\t\tInstall dependencies from requirements-testing.pip\n
+\t\t\tOtherwise, it will install requirements.pip\n
+--use-leap-wheels\tUse wheels from leap.se"
+ echo -e $usage
exit 1
}
@@ -33,6 +23,7 @@ process_arguments() {
case "$1" in
--help) show_help;;
--testing) testing=true; shift 1;;
+ --use-leap-wheels) use_leap_wheels=true; shift 1;;
-h) show_help;;
-*) echo "unknown option: $1" >&2; exit 1;;
@@ -40,6 +31,31 @@ process_arguments() {
done
}
+return_wheelhouse() {
+ if $use_leap_wheels ; then
+ WHEELHOUSE=$leap_wheelhouse
+ elif [ "$WHEELHOUSE" = "" ]; then
+ WHEELHOUSE=$HOME/wheelhouse
+ fi
+
+ # Tested with bash and zsh
+ if [[ $WHEELHOUSE != http* && ! -d "$WHEELHOUSE" ]]; then
+ mkdir $WHEELHOUSE
+ fi
+
+ echo "$WHEELHOUSE"
+}
+
+return_install_options() {
+ wheelhouse=`return_wheelhouse`
+ install_options="-U --find-links=$wheelhouse"
+ if $use_leap_wheels ; then
+ install_options="$install_options --trusted-host lizard.leap.se"
+ fi
+
+ echo $install_options
+}
+
return_insecure_flags() {
for insecure_package in $insecure_packages; do
flags="$flags --allow-external $insecure_package --allow-unverified $insecure_package"
@@ -59,8 +75,7 @@ return_packages() {
}
process_arguments $@
-wheelhouse=`return_wheelhouse`
-install_options="-U --find-links=$wheelhouse"
+install_options=`return_install_options`
insecure_flags=`return_insecure_flags`
packages=`return_packages`
diff --git a/common/pkg/pip_install_requirements.sh b/common/pkg/pip_install_requirements.sh
index c9dc3198..d0479365 100755
--- a/common/pkg/pip_install_requirements.sh
+++ b/common/pkg/pip_install_requirements.sh
@@ -1,27 +1,17 @@
-#!/bin/sh
+#!/bin/bash
# Update pip and install LEAP base/testing requirements.
# For convenience, $insecure_packages are allowed with insecure flags enabled.
# Use at your own risk.
# See $usage for help
insecure_packages="u1db dirspec"
-
-return_wheelhouse() {
- if [ "$WHEELHOUSE" = "" ]; then
- WHEELHOUSE=$HOME/wheelhouse
- fi
-
- if [ ! -d "$WHEELHOUSE" ]; then
- mkdir $WHEELHOUSE
- fi
-
- echo "$WHEELHOUSE"
-}
+leap_wheelhouse=https://lizard.leap.se/wheels
show_help() {
- usage="Usage: $0 [--testing]\n --testing\tInstall dependencies from requirements-testing.pip\n
-\t\tOtherwise, it will install requirements.pip"
- echo $usage
+ usage="Usage: $0 [--testing] [--use-leap-wheels]\n --testing\t\tInstall dependencies from requirements-testing.pip\n
+\t\t\tOtherwise, it will install requirements.pip\n
+--use-leap-wheels\tUse wheels from leap.se"
+ echo -e $usage
exit 1
}
@@ -33,6 +23,7 @@ process_arguments() {
case "$1" in
--help) show_help;;
--testing) testing=true; shift 1;;
+ --use-leap-wheels) use_leap_wheels=true; shift 1;;
-h) show_help;;
-*) echo "unknown option: $1" >&2; exit 1;;
@@ -40,6 +31,31 @@ process_arguments() {
done
}
+return_wheelhouse() {
+ if $use_leap_wheels ; then
+ WHEELHOUSE=$leap_wheelhouse
+ elif [ "$WHEELHOUSE" = "" ]; then
+ WHEELHOUSE=$HOME/wheelhouse
+ fi
+
+ # Tested with bash and zsh
+ if [[ $WHEELHOUSE != http* && ! -d "$WHEELHOUSE" ]]; then
+ mkdir $WHEELHOUSE
+ fi
+
+ echo "$WHEELHOUSE"
+}
+
+return_install_options() {
+ wheelhouse=`return_wheelhouse`
+ install_options="-U --find-links=$wheelhouse"
+ if $use_leap_wheels ; then
+ install_options="$install_options --trusted-host lizard.leap.se"
+ fi
+
+ echo $install_options
+}
+
return_insecure_flags() {
for insecure_package in $insecure_packages; do
flags="$flags --allow-external $insecure_package --allow-unverified $insecure_package"
@@ -59,8 +75,7 @@ return_packages() {
}
process_arguments $@
-wheelhouse=`return_wheelhouse`
-install_options="-U --find-links=$wheelhouse"
+install_options=`return_install_options`
insecure_flags=`return_insecure_flags`
packages=`return_packages`
diff --git a/server/pkg/pip_install_requirements.sh b/server/pkg/pip_install_requirements.sh
index c9dc3198..d0479365 100755
--- a/server/pkg/pip_install_requirements.sh
+++ b/server/pkg/pip_install_requirements.sh
@@ -1,27 +1,17 @@
-#!/bin/sh
+#!/bin/bash
# Update pip and install LEAP base/testing requirements.
# For convenience, $insecure_packages are allowed with insecure flags enabled.
# Use at your own risk.
# See $usage for help
insecure_packages="u1db dirspec"
-
-return_wheelhouse() {
- if [ "$WHEELHOUSE" = "" ]; then
- WHEELHOUSE=$HOME/wheelhouse
- fi
-
- if [ ! -d "$WHEELHOUSE" ]; then
- mkdir $WHEELHOUSE
- fi
-
- echo "$WHEELHOUSE"
-}
+leap_wheelhouse=https://lizard.leap.se/wheels
show_help() {
- usage="Usage: $0 [--testing]\n --testing\tInstall dependencies from requirements-testing.pip\n
-\t\tOtherwise, it will install requirements.pip"
- echo $usage
+ usage="Usage: $0 [--testing] [--use-leap-wheels]\n --testing\t\tInstall dependencies from requirements-testing.pip\n
+\t\t\tOtherwise, it will install requirements.pip\n
+--use-leap-wheels\tUse wheels from leap.se"
+ echo -e $usage
exit 1
}
@@ -33,6 +23,7 @@ process_arguments() {
case "$1" in
--help) show_help;;
--testing) testing=true; shift 1;;
+ --use-leap-wheels) use_leap_wheels=true; shift 1;;
-h) show_help;;
-*) echo "unknown option: $1" >&2; exit 1;;
@@ -40,6 +31,31 @@ process_arguments() {
done
}
+return_wheelhouse() {
+ if $use_leap_wheels ; then
+ WHEELHOUSE=$leap_wheelhouse
+ elif [ "$WHEELHOUSE" = "" ]; then
+ WHEELHOUSE=$HOME/wheelhouse
+ fi
+
+ # Tested with bash and zsh
+ if [[ $WHEELHOUSE != http* && ! -d "$WHEELHOUSE" ]]; then
+ mkdir $WHEELHOUSE
+ fi
+
+ echo "$WHEELHOUSE"
+}
+
+return_install_options() {
+ wheelhouse=`return_wheelhouse`
+ install_options="-U --find-links=$wheelhouse"
+ if $use_leap_wheels ; then
+ install_options="$install_options --trusted-host lizard.leap.se"
+ fi
+
+ echo $install_options
+}
+
return_insecure_flags() {
for insecure_package in $insecure_packages; do
flags="$flags --allow-external $insecure_package --allow-unverified $insecure_package"
@@ -59,8 +75,7 @@ return_packages() {
}
process_arguments $@
-wheelhouse=`return_wheelhouse`
-install_options="-U --find-links=$wheelhouse"
+install_options=`return_install_options`
insecure_flags=`return_insecure_flags`
packages=`return_packages`