From e520a2816a94d71ca1e855f350ba5abd44d5b251 Mon Sep 17 00:00:00 2001 From: Matt Westcott Date: Tue, 24 Mar 2015 13:17:44 +0000 Subject: [PATCH 1/2] reinstate Pillow and django-libsass as setup.py requirements as per https://github.com/torchbox/wagtail/pull/985#issuecomment-84048363 --- setup.py | 2 ++ wagtail/project_template/requirements.txt | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 0ecc19863c..d2641fc91b 100644 --- a/setup.py +++ b/setup.py @@ -30,9 +30,11 @@ PY3 = sys.version_info[0] == 3 install_requires = [ "Django>=1.7.1,<1.8", "django-compressor>=1.4", + "django-libsass>=0.2", "django-modelcluster>=0.5", "django-taggit==0.12.3", "django-treebeard==3.0", + "Pillow>=2.6.1", "beautifulsoup4>=4.3.2", "html5lib==0.999", "Unidecode>=0.04.14", diff --git a/wagtail/project_template/requirements.txt b/wagtail/project_template/requirements.txt index b5dfbfea62..b92cd52df4 100644 --- a/wagtail/project_template/requirements.txt +++ b/wagtail/project_template/requirements.txt @@ -1,8 +1,6 @@ # Minimal requirements Django>=1.7.1,<1.8 wagtail==0.8.6 -django-libsass>=0.2 -Pillow>=2.6.1 # Recommended components (require additional setup): # psycopg2==2.5.2 From 40d514964d9baee6310ed1255158218cffc096b0 Mon Sep 17 00:00:00 2001 From: Matt Westcott Date: Tue, 24 Mar 2015 13:56:16 +0000 Subject: [PATCH 2/2] Update docs to reflect the fact that django-libsass / Pillow are not being installed separately --- docs/getting_started/installation.rst | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/docs/getting_started/installation.rst b/docs/getting_started/installation.rst index 579b70bc7f..fac423fa2f 100644 --- a/docs/getting_started/installation.rst +++ b/docs/getting_started/installation.rst @@ -16,26 +16,9 @@ Whether you just want to try out the demo site, or you're ready to dive in and c Dependencies ============ -Barebones ---------- +Wagtail is based on the Django web framework and various other Python libraries. For the full list of absolutely required libraries, see `setup.py `__. -The basic Wagtail installation is pure Python. No build tools are required on the host machine. -For the full list of absolutely required libraries, see `setup.py `__. - -If you are installing Wagtail differently (e.g. from the Git repository), you must run ``python setup.py install`` from the repository root. The above command will install all Wagtail dependencies. - -Administration UI ------------------ - -.. warning:: - - The administrative interface requires django-libsass and Pillow. The project template bundled with Wagtail includes them (see :doc:`creating_your_project`). You must add the above libraries if you are adding Wagtail to an existing project, unless you will be using it - in a purely framework fashion without visiting wagtailadmin or hooking it up to the urlconf. - - * django-libsass>=0.2 - * Pillow>=2.6.1 - -Both django-libsass and Pillow have native-code components that require further attention: +Most of Wagtail's dependencies are pure Python and will install automatically using ``pip``, but there are a few native-code components that require further attention: * libsass-python (for compiling SASS stylesheets) - requires a C++ compiler and the Python development headers. * Pillow (for image processing) - additionally requires libjpeg and zlib. @@ -78,6 +61,8 @@ The quickest way to install Wagtail is using pip. To get the latest stable versi pip install wagtail +If you are installing Wagtail differently (e.g. from the Git repository), you must run ``python setup.py install`` from the repository root. The above command will install all Wagtail dependencies. + To check that Wagtail can be seen by Python, type ``python`` in your shell then try to import ``wagtail`` from the prompt: .. code-block:: python