From 9e89ad86fa08ec4a007d4a34339f9f93b7701254 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Tue, 24 Oct 2017 15:03:41 +0200 Subject: Update install script for stretch --- install/ishtar-install | 50 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) (limited to 'install') diff --git a/install/ishtar-install b/install/ishtar-install index 36b937388..dbf5defd7 100755 --- a/install/ishtar-install +++ b/install/ishtar-install @@ -128,6 +128,9 @@ do_install() { fi dist_version="$(cat /etc/debian_version | sed 's/\/.*//' | sed 's/\..*//')" case "$dist_version" in + 9) + dist_version="stretch" + ;; 8) dist_version="jessie" ;; @@ -282,7 +285,7 @@ EOF # Run setup for each distro accordingly case "$lsb_dist" in ubuntu|debian) - if [ "$dist_version" != "jessie" ] && [ "$dist_version" != "wheezy" ]; then + if [ "$dist_version" != "stretch" ] && [ "$dist_version" != "jessie" ] && [ "$dist_version" != "wheezy" ]; then echo "" cecho r " Sorry this script cannot manage your version of Debian/Ubuntu." echo "" @@ -390,6 +393,51 @@ EOF echo ""; ( set -x; $sh_c 'pip install django-ajax-selects==1.4.3' ) + fi + + if [ "$dist_version" == "stretch" ]; then + if [ "$backports_activated" != 'true' ]; then + echo "" + cecho r " In order to install Ishtar you have to activate Debian backports." + echo " To do that:" + echo "" + echo " echo 'deb http://ftp.debian.org/debian stretch-backports main contrib' >> /etc/apt/sources.list" + echo "" + cecho p " Run again Ishtar installation script after that." + exit 1 + fi + + if [ "$default_db" == '127.0.0.1' ]; then + echo "-------------------------------------------------------------------------------"; + cecho y "Installing postgresql" + echo "" + POSTGIS=postgresql-9.6-postgis-2.3 + ( set -x; $sh_c 'sleep 3; apt-get install -y -q postgresql '$POSTGIS ) + fi + echo "-------------------------------------------------------------------------------"; + cecho y "Installing Ishtar dependencies" + echo ""; + ( set -x; $sh_c 'sleep 3; apt-get install -t stretch-backports -y -q python-django' ) + ( set -x; $sh_c 'sleep 3; apt-get install -y -q \ + python-django-registration \ + python-bs4 python-django-formtools \ + python-tidylib python-lxml python-imaging python-html5lib \ + python-psycopg2 python-gdal gettext python-unicodecsv memcached \ + python-django-extra-views python-memcache python-dbf python-markdown \ + python-reportlab django-ajax-selects python-django-extensions' ) + echo "-------------------------------------------------------------------------------"; + cecho y "Installing django-simple-history" + echo ""; + ( set -x; $sh_c 'pip install git+https://github.com/treyhunner/django-simple-history.git@1.8.2#egg=django-simple-history' ) + echo "-------------------------------------------------------------------------------"; + cecho y "Installing python-secretary" + echo ""; + ( set -x; $sh_c 'pip install secretary==0.2.14' ) + + cecho y "Installing python-pisa (not available anymore as a debian package)" + echo ""; + ( set -x; $sh_c 'pip install pisa==3.0.33' ) + fi ;; -- cgit v1.2.3 From e0cc865516f69dcea9649e571d2f3a71963bfbb4 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Tue, 24 Oct 2017 16:32:58 +0200 Subject: Install script: fix error when backports are not available --- install/ishtar-install | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'install') diff --git a/install/ishtar-install b/install/ishtar-install index dbf5defd7..2a9d6fc5b 100755 --- a/install/ishtar-install +++ b/install/ishtar-install @@ -118,14 +118,6 @@ do_install() { ;; debian) - MAINBACKS=`cat /etc/apt/sources.list | grep jessie-backports |grep -v "^#"` - ALLBACKS='' - if [ "$(ls -A /etc/apt/sources.list.d/)" ]; then - ALLBACKS=`cat /etc/apt/sources.list.d/* | grep jessie-backports |grep -v "^#"` - fi - if [ "$ALLBACKS" != '' ] || [ "$MAINBACKS" != '' ]; then - backports_activated='true'; - fi dist_version="$(cat /etc/debian_version | sed 's/\/.*//' | sed 's/\..*//')" case "$dist_version" in 9) @@ -138,6 +130,16 @@ do_install() { dist_version="wheezy" ;; esac + set +e + MAINBACKS=`cat /etc/apt/sources.list | grep $dist_version'-backports' |grep -v "^#"` + ALLBACKS='' + if [ "$(ls -A /etc/apt/sources.list.d/)" ]; then + ALLBACKS=`cat /etc/apt/sources.list.d/* | grep $dist_version'-backports' |grep -v "^#"` + fi + set -e + if [ "$ALLBACKS" != '' ] || [ "$MAINBACKS" != '' ]; then + backports_activated='true'; + fi ;; oracleserver) -- cgit v1.2.3 From ba62f4d18b2a2f77db5994a334cb32179160f1a5 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Wed, 25 Oct 2017 17:42:53 +0200 Subject: Installation script: install WeasyPrint --- example_project/.coveragerc | 1 + install/ishtar-install | 16 +++++++++------- version.py | 4 ++-- 3 files changed, 12 insertions(+), 9 deletions(-) (limited to 'install') diff --git a/example_project/.coveragerc b/example_project/.coveragerc index 43462778f..ff9237bdd 100644 --- a/example_project/.coveragerc +++ b/example_project/.coveragerc @@ -6,4 +6,5 @@ exclude_lines = [run] omit = */migrations/* + */old_migrations/* diff --git a/install/ishtar-install b/install/ishtar-install index 2a9d6fc5b..a34b1984c 100755 --- a/install/ishtar-install +++ b/install/ishtar-install @@ -377,9 +377,9 @@ EOF cecho y "Installing Ishtar dependencies" echo ""; ( set -x; $sh_c 'sleep 3; apt-get install -t jessie-backports -y -q python python-django\ - python-django-registration' ) + python-django-registration python-cffi' ) ( set -x; $sh_c 'sleep 3; apt-get install -y -q \ - python-pisa python-bs4 python-django-formtools\ + python-bs4 python-django-formtools libpangocairo-1.0-0 \ python-tidylib python-lxml python-imaging python-html5lib \ python-psycopg2 python-gdal gettext python-unicodecsv memcached \ python-django-extra-views python-memcache python-dbf python-markdown' ) @@ -394,6 +394,9 @@ EOF cecho y "Installing python-ajax-select (available version in Debian is not compatible with backported Django)" echo ""; ( set -x; $sh_c 'pip install django-ajax-selects==1.4.3' ) + cecho y "Installing weasyprint" + echo ""; + ( set -x; $sh_c 'pip install WeasyPrint==0.41' ) fi @@ -421,8 +424,8 @@ EOF echo ""; ( set -x; $sh_c 'sleep 3; apt-get install -t stretch-backports -y -q python-django' ) ( set -x; $sh_c 'sleep 3; apt-get install -y -q \ - python-django-registration \ - python-bs4 python-django-formtools \ + python-django-registration libpangocairo-1.0-0 \ + python-bs4 python-django-formtools python-cffi \ python-tidylib python-lxml python-imaging python-html5lib \ python-psycopg2 python-gdal gettext python-unicodecsv memcached \ python-django-extra-views python-memcache python-dbf python-markdown \ @@ -435,10 +438,9 @@ EOF cecho y "Installing python-secretary" echo ""; ( set -x; $sh_c 'pip install secretary==0.2.14' ) - - cecho y "Installing python-pisa (not available anymore as a debian package)" + cecho y "Installing weasyprint" echo ""; - ( set -x; $sh_c 'pip install pisa==3.0.33' ) + ( set -x; $sh_c 'pip install WeasyPrint==0.41' ) fi ;; diff --git a/version.py b/version.py index 42b630409..38f3d146e 100644 --- a/version.py +++ b/version.py @@ -1,5 +1,5 @@ -# 1.99.10 -VERSION = (1, 99, 10) +# 1.99.11 +VERSION = (1, 99, 11) def get_version(): -- cgit v1.2.3