Skip to content
This repository
Browse code

use extras_require to install mako and additional modules via easy_in…

…stall
  • Loading branch information...
commit 3e89b741096bf5c409cc48976cea234ce39724ea 1 parent 5110d69
Martin Zimmermann authored January 20, 2013
4  README.rst
Source Rendered
@@ -105,7 +105,7 @@ Quickstart
105 105
     easy_install -U acrylamid
106 106
 
107 107
 This installs Acrylamid with Jinja2_ as templating engine. For Mako_ use
108  
-``easy_install -U acrylamid --mako``. This installs two additional but not
  108
+``easy_install -U acrylamid[mako]``. This installs two additional but not
109 109
 required dependencies: ``Markdown`` and ``translitcodec``. To get a list of
110 110
 all supported modules, head over to `additional supported modules`_.
111 111
 
@@ -115,7 +115,7 @@ Initialize the base structure, edit *conf.py* and *layouts/* and compile with:
115 115
 
116 116
 ::
117 117
 
118  
-    $ acrylamid init myblog
  118
+    $ acrylamid init myblog  # --mako, defaults to --jinja2
119 119
         create  myblog/conf.py
120 120
         ...
121 121
     $ cd myblog/
4  docs/index.rst
Source Rendered
@@ -122,7 +122,7 @@ Quickstart
122 122
     easy_install -U acrylamid
123 123
 
124 124
 This installs Acrylamid with Jinja2_ as templating engine. For Mako_ use
125  
-``easy_install -U acrylamid --mako``. This installs two additional but not
  125
+``easy_install -U acrylamid[mako]``. This installs two additional but not
126 126
 required dependencies: ``Markdown`` and ``translitcodec``. To get a list of
127 127
 all supported modules, head over to `additional supported modules`_.
128 128
 
@@ -133,7 +133,7 @@ Initialize the base structure, edit *conf.py* and *layouts/* and compile with:
133 133
 .. raw:: html
134 134
 
135 135
     <pre>
136  
-    $ acrylamid init myblog
  136
+    $ acrylamid init myblog  <span style="color: #999"># --mako, defaults to --jinja2</span>
137 137
       <span style="font-weight: bold; color: #00aa00">   create</span>  myblog/output/conf.py
138 138
         ...
139 139
     $ cd myblog/
3  docs/installation.rst
Source Rendered
@@ -20,7 +20,8 @@ already installed (10.6 or later).
20 20
     $> easy_install -U acrylamid
21 21
 
22 22
 And you are done with the simplest setup (by the way even markdown and
23  
-translitcodec are not must-have dependency).
  23
+translitcodec are not must-have dependency). You can install all supprted
  24
+modules via ``easy_install -U acrylamid[full]``.
24 25
 
25 26
 .. note::
26 27
 
19  setup.py
@@ -22,20 +22,6 @@
22 22
 if sys.version_info < (2, 7):
23 23
     requires.append('argparse')
24 24
 
25  
-if '--full' in sys.argv:
26  
-    requires.extend([
27  
-        'pygments',
28  
-        'docutils',
29  
-        'smartypants',
30  
-        'asciimathml',
31  
-        'textile',
32  
-        'PyYAML'
33  
-    ])
34  
-
35  
-if '--mako' in sys.argv:
36  
-    requires.remove('Jinja2>=2.4')
37  
-    requires.append('Mako')
38  
-
39 25
 setup(
40 26
     name='acrylamid',
41 27
     version=version,
@@ -63,6 +49,11 @@
63 49
         "Programming Language :: Python :: 3.2",
64 50
     ],
65 51
     install_requires=requires,
  52
+    extras_require={
  53
+        'full': ['pygments', 'docutils', 'smartypants', 'asciimathml',
  54
+                 'textile', 'unidecode', 'PyYAML', 'twitter', 'discount'],
  55
+        'mako': ['mako'],
  56
+    },
66 57
     test_require=['Attest', 'cram', 'docutils'],
67 58
     test_loader='attest:auto_reporter.test_loader',
68 59
     test_suite='acrylamid.specs.testsuite',

0 notes on commit 3e89b74

Please sign in to comment.
Something went wrong with that request. Please try again.