Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update docs for lektor/lektor#1104 (Pillow) #370

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 15 additions & 9 deletions content/docs/installation/contents.lr
Original file line number Diff line number Diff line change
Expand Up @@ -12,25 +12,22 @@ issues.

## Requirements

Although `lektor` would work without Imagemagick or FFmpeg, you would be missing on
significant parts of its capabilities. Therefore, you need to make sure you have the
Although `lektor` would work without FFmpeg, you would be missing on
some of its capabilities. Therefore, you need to make sure you have the
following software installed on your computer:

* Python 3.6+ is required. If you got an older version, look at the
* Python 3.7+ is required. If you got an older version, look at the
[Python 3 Installation & Setup Guide :ext](https://realpython.com/installing-python/).
* On Ubuntu you basically don't need anything new.
* On macOS you're done as well.
* On Windows, make sure that Python is in your `PATH`.
* ImageMagick.
* On macOS `brew install imagemagick` can get you this.
* On Ubuntu `sudo apt install imagemagick` will solve it.
* On Windows do `choco install imagemagick`, which requires [chocolatey :ext](https://chocolatey.org/),
or [download from here :ext](http://www.imagemagick.org)).
* FFmpeg (mostly for video thumbnailing).
* FFmpeg (optional, for video thumbnailing support).
* On Ubuntu you get it through `sudo apt install ffmpeg.`
* On macOS `brew install ffmpeg` will do the trick.
* On Windows you'll have to put a little [work :ext](https://www.wikihow.com/Install-FFmpeg-on-Windows) in.

! Since release 3.4.0, Lektor uses [Pillow :ext](https://pillow.readthedocs.io/) for image thumbnailing. ImageMagick is no longer required.

## Install pipx

Once you have those installed and have made sure that they are on your `PATH`, you can
Expand Down Expand Up @@ -99,3 +96,12 @@ virtualenv venv
. venv/bin/activate
pip install --editable .
```

Recent versions of Lektor (since around 3.4.0) are also installable directly from git.
You still need `npm` installed, but the frontend JS will be built automatically as part of the PEP 517 build process:

```
python -m venv venv
./venv/bin/pip install "lektor @ git+https://github.com/lektor/lektor@master"
```