diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-06-28 11:33:25 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-06-28 11:33:25 +0200 |
| commit | 29de57500be1faa75643699e999b0155b2468788 (patch) | |
| tree | 24ffcc8407a9405a58ee7720f2c4cf8a51f52a34 | |
| parent | 419d4e1fdb1220de4db2149f0fb6084538fbbb96 (diff) | |
| download | Ishtar-29de57500be1faa75643699e999b0155b2468788.tar.bz2 Ishtar-29de57500be1faa75643699e999b0155b2468788.zip | |
Add new dependency: pandoc (refs #4178)
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rwxr-xr-x | install/ishtar-install | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f1e7efeeb..a581f81fc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,6 @@ before_script: - apt-get update - - apt-get install -q -y git python-pip libpq-dev python-dev libjpeg-dev zlib1g-dev libxml2-dev libxslt1-dev libgeos-dev python-cairocffi tidy libtidy-dev binutils libproj-dev gdal-bin libpangocairo-1.0-0 + - apt-get install -q -y git python-pip libpq-dev python-dev libjpeg-dev zlib1g-dev libxml2-dev libxslt1-dev libgeos-dev python-cairocffi tidy libtidy-dev binutils libproj-dev gdal-bin libpangocairo-1.0-0 pandoc - pip install -r requirements.txt - cp Makefile.example Makefile - cp example_project/local_settings.py.gitlab-ci example_project/local_settings.py diff --git a/install/ishtar-install b/install/ishtar-install index aaf61893b..d43fc708a 100755 --- a/install/ishtar-install +++ b/install/ishtar-install @@ -349,7 +349,7 @@ EOF ( set -x; $sh_c 'sleep 3; apt-get install -t jessie-backports -y -q python python-django\ python-django-registration python-cffi' ) ( set -x; $sh_c 'sleep 3; apt-get install -y -q \ - python-bs4 libpangocairo-1.0-0 \ + python-bs4 libpangocairo-1.0-0 pandoc \ 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-unidecode' ) @@ -413,7 +413,7 @@ EOF ( 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 libpangocairo-1.0-0 python-requests \ - python-bs4 python-cffi python-django-compressor \ + python-bs4 python-cffi python-django-compressor pandoc \ 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 \ |