diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-10-25 17:42:53 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-10-25 17:44:02 +0200 |
| commit | ab9778f5fed9d52430ed8cdce0fd7d030358b3d8 (patch) | |
| tree | a660442bf4fa1a0e5853d78dcdc0a072b0a69578 | |
| parent | 4359bbe951efa203f6c65e85315b0037667800f3 (diff) | |
| download | Ishtar-ab9778f5fed9d52430ed8cdce0fd7d030358b3d8.tar.bz2 Ishtar-ab9778f5fed9d52430ed8cdce0fd7d030358b3d8.zip | |
Installation script: install WeasyPrint
| -rw-r--r-- | example_project/.coveragerc | 1 | ||||
| -rwxr-xr-x | install/ishtar-install | 16 | ||||
| -rw-r--r-- | version.py | 4 |
3 files changed, 12 insertions, 9 deletions
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(): |