From c6c8dbeab4f2fce7743090a11a20db26d3cfa1a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laura=20Kl=C3=BCnder?= Date: Mon, 12 Sep 2016 10:55:01 +0200 Subject: [PATCH] refactor requirements and make htmlmin optional --- .travis.yml | 2 +- src/c3nav/settings.py | 12 ++++++++++-- src/requirements.txt | 8 +------- src/requirements/dev.txt | 2 ++ src/requirements/htmlmin.txt | 1 + src/requirements/mysql.txt | 2 ++ src/requirements/postgres.txt | 2 ++ src/requirements/production-extra.txt | 1 + src/requirements/production.txt | 6 ++++++ src/requirements_dev.txt | 3 --- src/requirements_mysql.txt | 2 -- src/requirements_postgres.txt | 2 -- 12 files changed, 26 insertions(+), 17 deletions(-) create mode 100644 src/requirements/dev.txt create mode 100644 src/requirements/htmlmin.txt create mode 100644 src/requirements/mysql.txt create mode 100644 src/requirements/postgres.txt create mode 100644 src/requirements/production-extra.txt create mode 100644 src/requirements/production.txt delete mode 100644 src/requirements_dev.txt delete mode 100644 src/requirements_mysql.txt delete mode 100644 src/requirements_postgres.txt diff --git a/.travis.yml b/.travis.yml index 8e824aa6..4ca944f0 100644 --- a/.travis.yml +++ b/.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 diff --git a/src/c3nav/settings.py b/src/c3nav/settings.py index 9367946f..e9dab0e1 100644 --- a/src/c3nav/settings.py +++ b/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' diff --git a/src/requirements.txt b/src/requirements.txt index ed378939..ea77c2d8 100644 --- a/src/requirements.txt +++ b/src/requirements.txt @@ -1,7 +1 @@ -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 -django-htmlmin>=0.9,<0.10 +-r requirements/production.txt diff --git a/src/requirements/dev.txt b/src/requirements/dev.txt new file mode 100644 index 00000000..8c853015 --- /dev/null +++ b/src/requirements/dev.txt @@ -0,0 +1,2 @@ +flake8 +isort diff --git a/src/requirements/htmlmin.txt b/src/requirements/htmlmin.txt new file mode 100644 index 00000000..5692111e --- /dev/null +++ b/src/requirements/htmlmin.txt @@ -0,0 +1 @@ +django-htmlmin>=0.9,<0.10 diff --git a/src/requirements/mysql.txt b/src/requirements/mysql.txt new file mode 100644 index 00000000..bc645a65 --- /dev/null +++ b/src/requirements/mysql.txt @@ -0,0 +1,2 @@ +requirements.txt +mysqlclient diff --git a/src/requirements/postgres.txt b/src/requirements/postgres.txt new file mode 100644 index 00000000..1022ca46 --- /dev/null +++ b/src/requirements/postgres.txt @@ -0,0 +1,2 @@ +requirements.txt +psycopg2 diff --git a/src/requirements/production-extra.txt b/src/requirements/production-extra.txt new file mode 100644 index 00000000..5692111e --- /dev/null +++ b/src/requirements/production-extra.txt @@ -0,0 +1 @@ +django-htmlmin>=0.9,<0.10 diff --git a/src/requirements/production.txt b/src/requirements/production.txt new file mode 100644 index 00000000..b5752df9 --- /dev/null +++ b/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 diff --git a/src/requirements_dev.txt b/src/requirements_dev.txt deleted file mode 100644 index ff0f7870..00000000 --- a/src/requirements_dev.txt +++ /dev/null @@ -1,3 +0,0 @@ --r requirements.txt -flake8 -isort diff --git a/src/requirements_mysql.txt b/src/requirements_mysql.txt deleted file mode 100644 index e0eb2a21..00000000 --- a/src/requirements_mysql.txt +++ /dev/null @@ -1,2 +0,0 @@ --r requirements.txt -mysqlclient diff --git a/src/requirements_postgres.txt b/src/requirements_postgres.txt deleted file mode 100644 index b52ba826..00000000 --- a/src/requirements_postgres.txt +++ /dev/null @@ -1,2 +0,0 @@ --r requirements.txt -psycopg2