Make sure kinto[production] works.

Makefile

@@ -19,8 +19,7 @@ $(INSTALL_STAMP): $(PYTHON)
 	touch $(INSTALL_STAMP)
 
 install-postgres: $(INSTALL_STAMP)
-# Since pip install ".[postgresql]" is not enough...
-	$(VENV)/bin/pip install "cliquet[postgresql]"
+	$(VENV)/bin/pip install -Ue ".[production]"
 
 install-dev: $(INSTALL_STAMP) $(DEV_STAMP)
 $(DEV_STAMP): $(PYTHON)

docs/installation.rst

@@ -69,7 +69,7 @@ default. In order to install them, run:
 
 ::
 
-    pip install "kinto[postgresql]"
+    pip install "kinto[production]"
 
 
 The following instructions will create a local ``postgres`` database on

setup.py

@@ -1,5 +1,5 @@
-import os
 import codecs
+import os
 from setuptools import setup, find_packages
 
 here = os.path.abspath(os.path.dirname(__file__))
@@ -20,18 +20,15 @@ def read_file(filename):
     'cornice',
     'six',
     'waitress',
-    'cliquet'
+    'cliquet'  # Should be the last one.
 ]
 
-POSTGRESQL_REQUIREMENTS = REQUIREMENTS + [
-    'cliquet[postgresql]'
-]
 
-MONITORING_REQUIREMENTS = REQUIREMENTS + [
-    'cliquet[monitoring]'
+PRODUCTION_REQUIRES = REQUIREMENTS[:-1] + [
+    'cliquet[postgresql,monitoring]'
 ]
 
-FXA_REQUIREMENTS = REQUIREMENTS + [
+FXA_REQUIRES = REQUIREMENTS + [
     'cliquet-fxa'
 ]
 
@@ -63,9 +60,8 @@ def read_file(filename):
       zip_safe=False,
       install_requires=REQUIREMENTS,
       extras_require={
-          'postgresql': POSTGRESQL_REQUIREMENTS,
-          'monitoring': MONITORING_REQUIREMENTS,
-          'fxa': FXA_REQUIREMENTS,
+          'production': PRODUCTION_REQUIRES,
+          'fxa': FXA_REQUIRES,
       },
       entry_points=ENTRY_POINTS,
       dependency_links=DEPENDENCY_LINKS)