From 6b25379fc0dbb85a5cda0c09d9cd89d3f7491243 Mon Sep 17 00:00:00 2001
From: "Phyks (Lucas Verney)" <phyks@phyks.me>
Date: Thu, 18 Jan 2018 11:45:32 +0100
Subject: [PATCH] Conditional requirements.txt, including all dependencies

---
 doc/0.getting_started.md | 12 +++++-------
 docker/Dockerfile        |  1 -
 requirements.txt         |  5 +++--
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/doc/0.getting_started.md b/doc/0.getting_started.md
index 60fced7..03850aa 100644
--- a/doc/0.getting_started.md
+++ b/doc/0.getting_started.md
@@ -34,18 +34,16 @@ An alternative method is available using Docker. See [2.docker.md](2.docker.md).
 
 1. Clone the repository.
 2. Install required Python modules: `pip install -r requirements.txt`.
-3. If you are running Flatisfy with Python 2, you should also `pip install
-   functools32`.
-4. Init a configuration file: `python -m flatisfy init-config > config.json`.
+3. Init a configuration file: `python -m flatisfy init-config > config.json`.
    Edit it according to your needs (see below).
-5. Build the required data files:
+4. Build the required data files:
    `python -m flatisfy build-data --config config.json`.
-6. You can now run `python -m flatisfy import --config config.json` to fetch
+5. You can now run `python -m flatisfy import --config config.json` to fetch
    available flats, filter them and import everything in a SQLite database,
    usable with the web visualization.
-7. Install JS libraries and build the webapp:
+6. Install JS libraries and build the webapp:
    `npm install && npm run build:dev` (use `build:prod` in production).
-8. Use `python -m flatisfy serve --config config.json` to serve the web app.
+7. Use `python -m flatisfy serve --config config.json` to serve the web app.
 
 _Note_: `Flatisfy` requires an up-to-date Node version. You can find
 instructions on the [NodeJS website](https://nodejs.org/en/) to install latest
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 45c6035..5dc517f 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -31,7 +31,6 @@ RUN cd /home/user \
     && git clone https://git.phyks.me/Phyks/flatisfy/ ./app \
     && cd ./app \
     && pip install -r requirements.txt \
-    && pip install functools32 \
     && npm install \
     && npm run build:prod
 
diff --git a/requirements.txt b/requirements.txt
index 8d7e43d..78fd4be 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,10 +1,11 @@
 appdirs
 arrow
-backports.csv
+backports.csv; python_version < '3.0'
 bottle
 bottle-sqlalchemy
 canister
-enum34
+enum34; python_version < '3.4'
+functools32; python_version < '3.2.3'
 future
 imagehash
 pillow