diff options
| -rwxr-xr-x | client/pkg/generate_wheels.sh | 13 | ||||
| -rwxr-xr-x | client/pkg/pip_install_requirements.sh | 71 | ||||
| -rwxr-xr-x | common/pkg/generate_wheels.sh | 13 | ||||
| -rwxr-xr-x | common/pkg/pip_install_requirements.sh | 71 | ||||
| -rwxr-xr-x | server/pkg/generate_wheels.sh | 13 | ||||
| -rwxr-xr-x | server/pkg/pip_install_requirements.sh | 71 | ||||
| -rw-r--r-- | server/requirements-testing.pip | 1 | 
7 files changed, 240 insertions, 13 deletions
| diff --git a/client/pkg/generate_wheels.sh b/client/pkg/generate_wheels.sh new file mode 100755 index 00000000..e29c327e --- /dev/null +++ b/client/pkg/generate_wheels.sh @@ -0,0 +1,13 @@ +#!/bin/sh +# Generate wheels for dependencies +# Use at your own risk. + +if [ "$WHEELHOUSE" = "" ]; then +    WHEELHOUSE=$HOME/wheelhouse +fi + +pip wheel --wheel-dir $WHEELHOUSE pip +pip wheel --wheel-dir $WHEELHOUSE --allow-external u1db --allow-unverified u1db --allow-external dirspec --allow-unverified dirspec -r pkg/requirements.pip +if [ -f pkg/requirements-testing.pip ]; then +   pip wheel --wheel-dir $WHEELHOUSE -r pkg/requirements-testing.pip +fi diff --git a/client/pkg/pip_install_requirements.sh b/client/pkg/pip_install_requirements.sh index 71adebc7..c9dc3198 100755 --- a/client/pkg/pip_install_requirements.sh +++ b/client/pkg/pip_install_requirements.sh @@ -1,6 +1,69 @@  #!/bin/sh -# Update pip and install LEAP base requirements. -# For convenience, u1db and dirspec are allowed with insecure flags enabled. +# Update pip and install LEAP base/testing requirements. +# For convenience, $insecure_packages are allowed with insecure flags enabled.  # Use at your own risk. -pip install -U pip -pip install --allow-external u1db --allow-unverified u1db --allow-external dirspec --allow-unverified dirspec -r pkg/requirements.pip +# 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" +} + +show_help() { +    usage="Usage: $0 [--testing]\n --testing\tInstall dependencies from requirements-testing.pip\n +\t\tOtherwise, it will install requirements.pip" +    echo $usage + +    exit 1 +} + +process_arguments() { +    testing=false +    while [ "$#" -gt 0 ]; do +	# From http://stackoverflow.com/a/31443098 +	case "$1" in +	    --help) show_help;; +	    --testing) testing=true; shift 1;; + +	    -h) show_help;; +	    -*) echo "unknown option: $1" >&2; exit 1;; +	esac +    done +} + +return_insecure_flags() { +    for insecure_package in $insecure_packages; do +	flags="$flags --allow-external $insecure_package --allow-unverified $insecure_package" +    done + +    echo $flags +} + +return_packages() { +    if $testing ; then +	packages="-r pkg/requirements-testing.pip" +    else +	packages="-r pkg/requirements.pip" +    fi + +    echo $packages +} + +process_arguments $@ +wheelhouse=`return_wheelhouse` +install_options="-U --find-links=$wheelhouse" +insecure_flags=`return_insecure_flags` +packages=`return_packages` + +pip install -U wheel +pip install $install_options pip +pip install $install_options $insecure_flags $packages diff --git a/common/pkg/generate_wheels.sh b/common/pkg/generate_wheels.sh new file mode 100755 index 00000000..e29c327e --- /dev/null +++ b/common/pkg/generate_wheels.sh @@ -0,0 +1,13 @@ +#!/bin/sh +# Generate wheels for dependencies +# Use at your own risk. + +if [ "$WHEELHOUSE" = "" ]; then +    WHEELHOUSE=$HOME/wheelhouse +fi + +pip wheel --wheel-dir $WHEELHOUSE pip +pip wheel --wheel-dir $WHEELHOUSE --allow-external u1db --allow-unverified u1db --allow-external dirspec --allow-unverified dirspec -r pkg/requirements.pip +if [ -f pkg/requirements-testing.pip ]; then +   pip wheel --wheel-dir $WHEELHOUSE -r pkg/requirements-testing.pip +fi diff --git a/common/pkg/pip_install_requirements.sh b/common/pkg/pip_install_requirements.sh index 71adebc7..c9dc3198 100755 --- a/common/pkg/pip_install_requirements.sh +++ b/common/pkg/pip_install_requirements.sh @@ -1,6 +1,69 @@  #!/bin/sh -# Update pip and install LEAP base requirements. -# For convenience, u1db and dirspec are allowed with insecure flags enabled. +# Update pip and install LEAP base/testing requirements. +# For convenience, $insecure_packages are allowed with insecure flags enabled.  # Use at your own risk. -pip install -U pip -pip install --allow-external u1db --allow-unverified u1db --allow-external dirspec --allow-unverified dirspec -r pkg/requirements.pip +# 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" +} + +show_help() { +    usage="Usage: $0 [--testing]\n --testing\tInstall dependencies from requirements-testing.pip\n +\t\tOtherwise, it will install requirements.pip" +    echo $usage + +    exit 1 +} + +process_arguments() { +    testing=false +    while [ "$#" -gt 0 ]; do +	# From http://stackoverflow.com/a/31443098 +	case "$1" in +	    --help) show_help;; +	    --testing) testing=true; shift 1;; + +	    -h) show_help;; +	    -*) echo "unknown option: $1" >&2; exit 1;; +	esac +    done +} + +return_insecure_flags() { +    for insecure_package in $insecure_packages; do +	flags="$flags --allow-external $insecure_package --allow-unverified $insecure_package" +    done + +    echo $flags +} + +return_packages() { +    if $testing ; then +	packages="-r pkg/requirements-testing.pip" +    else +	packages="-r pkg/requirements.pip" +    fi + +    echo $packages +} + +process_arguments $@ +wheelhouse=`return_wheelhouse` +install_options="-U --find-links=$wheelhouse" +insecure_flags=`return_insecure_flags` +packages=`return_packages` + +pip install -U wheel +pip install $install_options pip +pip install $install_options $insecure_flags $packages diff --git a/server/pkg/generate_wheels.sh b/server/pkg/generate_wheels.sh new file mode 100755 index 00000000..e29c327e --- /dev/null +++ b/server/pkg/generate_wheels.sh @@ -0,0 +1,13 @@ +#!/bin/sh +# Generate wheels for dependencies +# Use at your own risk. + +if [ "$WHEELHOUSE" = "" ]; then +    WHEELHOUSE=$HOME/wheelhouse +fi + +pip wheel --wheel-dir $WHEELHOUSE pip +pip wheel --wheel-dir $WHEELHOUSE --allow-external u1db --allow-unverified u1db --allow-external dirspec --allow-unverified dirspec -r pkg/requirements.pip +if [ -f pkg/requirements-testing.pip ]; then +   pip wheel --wheel-dir $WHEELHOUSE -r pkg/requirements-testing.pip +fi diff --git a/server/pkg/pip_install_requirements.sh b/server/pkg/pip_install_requirements.sh index 71adebc7..c9dc3198 100755 --- a/server/pkg/pip_install_requirements.sh +++ b/server/pkg/pip_install_requirements.sh @@ -1,6 +1,69 @@  #!/bin/sh -# Update pip and install LEAP base requirements. -# For convenience, u1db and dirspec are allowed with insecure flags enabled. +# Update pip and install LEAP base/testing requirements. +# For convenience, $insecure_packages are allowed with insecure flags enabled.  # Use at your own risk. -pip install -U pip -pip install --allow-external u1db --allow-unverified u1db --allow-external dirspec --allow-unverified dirspec -r pkg/requirements.pip +# 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" +} + +show_help() { +    usage="Usage: $0 [--testing]\n --testing\tInstall dependencies from requirements-testing.pip\n +\t\tOtherwise, it will install requirements.pip" +    echo $usage + +    exit 1 +} + +process_arguments() { +    testing=false +    while [ "$#" -gt 0 ]; do +	# From http://stackoverflow.com/a/31443098 +	case "$1" in +	    --help) show_help;; +	    --testing) testing=true; shift 1;; + +	    -h) show_help;; +	    -*) echo "unknown option: $1" >&2; exit 1;; +	esac +    done +} + +return_insecure_flags() { +    for insecure_package in $insecure_packages; do +	flags="$flags --allow-external $insecure_package --allow-unverified $insecure_package" +    done + +    echo $flags +} + +return_packages() { +    if $testing ; then +	packages="-r pkg/requirements-testing.pip" +    else +	packages="-r pkg/requirements.pip" +    fi + +    echo $packages +} + +process_arguments $@ +wheelhouse=`return_wheelhouse` +install_options="-U --find-links=$wheelhouse" +insecure_flags=`return_insecure_flags` +packages=`return_packages` + +pip install -U wheel +pip install $install_options pip +pip install $install_options $insecure_flags $packages diff --git a/server/requirements-testing.pip b/server/requirements-testing.pip deleted file mode 100644 index 94ab6e8e..00000000 --- a/server/requirements-testing.pip +++ /dev/null @@ -1 +0,0 @@ -pep8 | 
