Fix freezegun version
This commit is contained in:
parent
08a76a8de4
commit
45bf31c9da
|
@ -21,22 +21,22 @@ function help () {
|
||||||
|
|
||||||
function print_help () {
|
function print_help () {
|
||||||
cat <<- EOF
|
cat <<- EOF
|
||||||
|
|
||||||
${bold}NAME${normal}
|
${bold}NAME${normal}
|
||||||
${bold}orchestra-admin${normal} - Orchetsra administration script
|
${bold}orchestra-admin${normal} - Orchetsra administration script
|
||||||
|
|
||||||
${bold}OPTIONS${normal}
|
${bold}OPTIONS${normal}
|
||||||
${bold}install_requirements${normal}
|
${bold}install_requirements${normal}
|
||||||
Installs Orchestra requirements using apt-get and pip
|
Installs Orchestra requirements using apt-get and pip
|
||||||
|
|
||||||
${bold}startproject${normal}
|
${bold}startproject${normal}
|
||||||
Creates a new Django-orchestra instance
|
Creates a new Django-orchestra instance
|
||||||
|
|
||||||
${bold}help${normal}
|
${bold}help${normal}
|
||||||
Displays this help text or related help page as argument
|
Displays this help text or related help page as argument
|
||||||
for example:
|
for example:
|
||||||
${bold}orchestra-admin help startproject${normal}
|
${bold}orchestra-admin help startproject${normal}
|
||||||
|
|
||||||
EOF
|
EOF
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -73,17 +73,17 @@ export -f get_orchestra_dir
|
||||||
|
|
||||||
function print_install_requirements_help () {
|
function print_install_requirements_help () {
|
||||||
cat <<- EOF
|
cat <<- EOF
|
||||||
|
|
||||||
${bold}NAME${normal}
|
${bold}NAME${normal}
|
||||||
${bold}orchetsra-admin install_requirements${normal} - Installs all Orchestra requirements using apt-get and pip
|
${bold}orchetsra-admin install_requirements${normal} - Installs all Orchestra requirements using apt-get and pip
|
||||||
|
|
||||||
${bold}OPTIONS${normal}
|
${bold}OPTIONS${normal}
|
||||||
${bold}-t, --testing${normal}
|
${bold}-t, --testing${normal}
|
||||||
Install Orchestra normal requirements plus those needed for running functional tests
|
Install Orchestra normal requirements plus those needed for running functional tests
|
||||||
|
|
||||||
${bold}-h, --help${normal}
|
${bold}-h, --help${normal}
|
||||||
Displays this help text
|
Displays this help text
|
||||||
|
|
||||||
EOF
|
EOF
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -92,7 +92,7 @@ function install_requirements () {
|
||||||
opts=$(getopt -o h,t -l help,testing -- "$@") || exit 1
|
opts=$(getopt -o h,t -l help,testing -- "$@") || exit 1
|
||||||
set -- $opts
|
set -- $opts
|
||||||
testing=false
|
testing=false
|
||||||
|
|
||||||
while [ $# -gt 0 ]; do
|
while [ $# -gt 0 ]; do
|
||||||
case $1 in
|
case $1 in
|
||||||
-h|--help) print_deploy_help; exit 0 ;;
|
-h|--help) print_deploy_help; exit 0 ;;
|
||||||
|
@ -105,17 +105,17 @@ function install_requirements () {
|
||||||
done
|
done
|
||||||
unset OPTIND
|
unset OPTIND
|
||||||
unset opt
|
unset opt
|
||||||
|
|
||||||
check_root || true
|
check_root || true
|
||||||
ORCHESTRA_PATH=$(get_orchestra_dir) || true
|
ORCHESTRA_PATH=$(get_orchestra_dir) || true
|
||||||
|
|
||||||
# Make sure locales are in place before installing postgres
|
# Make sure locales are in place before installing postgres
|
||||||
if [[ $({ perl --help > /dev/null; } 2>&1|grep 'locale failed') ]]; then
|
if [[ $({ perl --help > /dev/null; } 2>&1|grep 'locale failed') ]]; then
|
||||||
run sed -i "s/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/" /etc/locale.gen
|
run sed -i "s/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/" /etc/locale.gen
|
||||||
run locale-gen
|
run locale-gen
|
||||||
update-locale LANG=en_US.UTF-8
|
update-locale LANG=en_US.UTF-8
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# lxml: libxml2-dev, libxslt1-dev, zlib1g-dev
|
# lxml: libxml2-dev, libxslt1-dev, zlib1g-dev
|
||||||
APT="bind9utils \
|
APT="bind9utils \
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
|
@ -136,10 +136,10 @@ function install_requirements () {
|
||||||
iceweasel \
|
iceweasel \
|
||||||
dnsutils"
|
dnsutils"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
run apt-get update
|
run apt-get update
|
||||||
run apt-get install -y $APT
|
run apt-get install -y $APT
|
||||||
|
|
||||||
# Install ca certificates before executing pip install
|
# Install ca certificates before executing pip install
|
||||||
if [[ ! -e /usr/local/share/ca-certificates/cacert.org ]]; then
|
if [[ ! -e /usr/local/share/ca-certificates/cacert.org ]]; then
|
||||||
mkdir -p /usr/local/share/ca-certificates/cacert.org
|
mkdir -p /usr/local/share/ca-certificates/cacert.org
|
||||||
|
@ -148,7 +148,7 @@ function install_requirements () {
|
||||||
http://www.cacert.org/certs/class3.crt
|
http://www.cacert.org/certs/class3.crt
|
||||||
update-ca-certificates
|
update-ca-certificates
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# cracklib and lxml are excluded on the requirements.txt because they need unconvinient system dependencies
|
# cracklib and lxml are excluded on the requirements.txt because they need unconvinient system dependencies
|
||||||
PIP="$(wget http://git.io/orchestra-requirements.txt -O - | tr '\n' ' ') \
|
PIP="$(wget http://git.io/orchestra-requirements.txt -O - | tr '\n' ' ') \
|
||||||
cracklib \
|
cracklib \
|
||||||
|
@ -157,7 +157,7 @@ function install_requirements () {
|
||||||
PIP="${PIP} \
|
PIP="${PIP} \
|
||||||
selenium \
|
selenium \
|
||||||
xvfbwrapper \
|
xvfbwrapper \
|
||||||
freezegun \
|
freezegun==0.3.14 \
|
||||||
coverage \
|
coverage \
|
||||||
flake8 \
|
flake8 \
|
||||||
django-debug-toolbar==1.3.0 \
|
django-debug-toolbar==1.3.0 \
|
||||||
|
@ -166,9 +166,9 @@ function install_requirements () {
|
||||||
pyinotify \
|
pyinotify \
|
||||||
PyMySQL"
|
PyMySQL"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
run pip3 install $PIP
|
run pip3 install $PIP
|
||||||
|
|
||||||
# Install a more recent version of wkhtmltopdf (0.12.2) (PDF page number support)
|
# Install a more recent version of wkhtmltopdf (0.12.2) (PDF page number support)
|
||||||
wkhtmltox_version=$(dpkg --list | grep wkhtmltox | awk {'print $3'})
|
wkhtmltox_version=$(dpkg --list | grep wkhtmltox | awk {'print $3'})
|
||||||
minor=$(echo -e "$wkhtmltox_version\n0.12.2.1" | sort -V | head -n 1)
|
minor=$(echo -e "$wkhtmltox_version\n0.12.2.1" | sort -V | head -n 1)
|
||||||
|
@ -183,30 +183,30 @@ export -f install_requirements
|
||||||
|
|
||||||
print_startproject_help () {
|
print_startproject_help () {
|
||||||
cat <<- EOF
|
cat <<- EOF
|
||||||
|
|
||||||
${bold}NAME${normal}
|
${bold}NAME${normal}
|
||||||
${bold}orchestra-admin startproject${normal} - Create a new Django-Orchestra instance
|
${bold}orchestra-admin startproject${normal} - Create a new Django-Orchestra instance
|
||||||
|
|
||||||
${bold}SYNOPSIS${normal}
|
${bold}SYNOPSIS${normal}
|
||||||
Options: [ -h ]
|
Options: [ -h ]
|
||||||
|
|
||||||
${bold}OPTIONS${normal}
|
${bold}OPTIONS${normal}
|
||||||
${bold}-h, --help${normal}
|
${bold}-h, --help${normal}
|
||||||
This help message
|
This help message
|
||||||
|
|
||||||
${bold}EXAMPLES${normal}
|
${bold}EXAMPLES${normal}
|
||||||
orchestra-admin startproject controlpanel
|
orchestra-admin startproject controlpanel
|
||||||
|
|
||||||
EOF
|
EOF
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function startproject () {
|
function startproject () {
|
||||||
local PROJECT_NAME="$2"; shift
|
local PROJECT_NAME="$2"; shift
|
||||||
|
|
||||||
opts=$(getopt -o h -l help -- "$@") || exit 1
|
opts=$(getopt -o h -l help -- "$@") || exit 1
|
||||||
set -- $opts
|
set -- $opts
|
||||||
|
|
||||||
set -- $opts
|
set -- $opts
|
||||||
while [ $# -gt 0 ]; do
|
while [ $# -gt 0 ]; do
|
||||||
case $1 in
|
case $1 in
|
||||||
|
@ -217,10 +217,10 @@ function startproject () {
|
||||||
esac
|
esac
|
||||||
shift
|
shift
|
||||||
done
|
done
|
||||||
|
|
||||||
unset OPTIND
|
unset OPTIND
|
||||||
unset opt
|
unset opt
|
||||||
|
|
||||||
[ $(whoami) == 'root' ] && { echo -e "\nYou don't want to run this as root\n" >&2; exit 1; }
|
[ $(whoami) == 'root' ] && { echo -e "\nYou don't want to run this as root\n" >&2; exit 1; }
|
||||||
ORCHESTRA_PATH=$(get_orchestra_dir) || { echo "Error getting orchestra dir"; exit 1; }
|
ORCHESTRA_PATH=$(get_orchestra_dir) || { echo "Error getting orchestra dir"; exit 1; }
|
||||||
if [[ ! -e $PROJECT_NAME/manage.py ]]; then
|
if [[ ! -e $PROJECT_NAME/manage.py ]]; then
|
||||||
|
|
|
@ -21,17 +21,17 @@ django-localflavor
|
||||||
amqp
|
amqp
|
||||||
anyjson
|
anyjson
|
||||||
pytz
|
pytz
|
||||||
cracklib
|
cracklib
|
||||||
lxml==3.3.5
|
lxml==3.3.5
|
||||||
selenium
|
selenium
|
||||||
xvfbwrapper
|
xvfbwrapper
|
||||||
freezegun
|
freezegun==0.3.14
|
||||||
coverage
|
coverage
|
||||||
flake8
|
flake8
|
||||||
django-debug-toolbar==1.3.0
|
django-debug-toolbar==1.3.0
|
||||||
django-nose==1.4.4
|
django-nose==1.4.4
|
||||||
sqlparse
|
sqlparse
|
||||||
pyinotify
|
pyinotify
|
||||||
PyMySQL
|
PyMySQL
|
||||||
dj_database_url==0.5.0
|
dj_database_url==0.5.0
|
||||||
psycopg2-binary
|
psycopg2-binary
|
||||||
|
|
Loading…
Reference in a new issue