refactor requirements and make htmlmin optional

.travis.yml

@@ -7,7 +7,7 @@ python:
 
 install:
     - pip install --upgrade setuptools
-    - pip install -r src/requirements_dev.txt
+    - pip install -r src/requirements.txt -r src/requirements/dev.txt
 
 before_script:
     - cd src

src/c3nav/settings.py

@@ -125,10 +125,18 @@ MIDDLEWARE_CLASSES = [
     'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
-    'htmlmin.middleware.HtmlMinifyMiddleware',
-    'htmlmin.middleware.MarkRequestMiddleware',
 ]
 
+try:
+    import htmlmin  # noqa
+except ImportError:
+    pass
+else:
+    MIDDLEWARE_CLASSES += [
+        'htmlmin.middleware.HtmlMinifyMiddleware',
+        'htmlmin.middleware.MarkRequestMiddleware',
+    ]
+
 # Security settings
 X_FRAME_OPTIONS = 'DENY'
 

src/requirements.txt

@@ -1,7 +1 @@
-Django>=1.9,<1.10
+-r requirements/production.txt
-django-bootstrap3>=6.2,<6.3
-django-compressor==2.0
-csscompressor
-djangorestframework>=3.4,<3.5
-django-filter>=0.14,<0.15
-django-htmlmin>=0.9,<0.10

src/requirements/dev.txt

@@ -0,0 +1,2 @@
+flake8
+isort

src/requirements/htmlmin.txt

@@ -0,0 +1 @@
+django-htmlmin>=0.9,<0.10

src/requirements/mysql.txt

@@ -0,0 +1,2 @@
+requirements.txt
+mysqlclient

src/requirements/postgres.txt

@@ -0,0 +1,2 @@
+requirements.txt
+psycopg2

src/requirements/production-extra.txt

@@ -0,0 +1 @@
+django-htmlmin>=0.9,<0.10

src/requirements/production.txt

@@ -0,0 +1,6 @@
+Django>=1.9,<1.10
+django-bootstrap3>=6.2,<6.3
+django-compressor==2.0
+csscompressor
+djangorestframework>=3.4,<3.5
+django-filter>=0.14,<0.15

src/requirements_dev.txt

@@ -1,3 +0,0 @@
--r requirements.txt
-flake8
-isort

src/requirements_mysql.txt

@@ -1,2 +0,0 @@
--r requirements.txt
-mysqlclient

src/requirements_postgres.txt

@@ -1,2 +0,0 @@
--r requirements.txt
-psycopg2