Permalink
Browse files

use extras_require to install mako and additional modules via easy_in…

…stall
  • Loading branch information...
1 parent 5110d69 commit 3e89b741096bf5c409cc48976cea234ce39724ea @posativ committed Jan 20, 2013
Showing with 11 additions and 19 deletions.
  1. +2 −2 README.rst
  2. +2 −2 docs/index.rst
  3. +2 −1 docs/installation.rst
  4. +5 −14 setup.py
View
@@ -105,7 +105,7 @@ Quickstart
easy_install -U acrylamid
This installs Acrylamid with Jinja2_ as templating engine. For Mako_ use
-``easy_install -U acrylamid --mako``. This installs two additional but not
+``easy_install -U acrylamid[mako]``. This installs two additional but not
required dependencies: ``Markdown`` and ``translitcodec``. To get a list of
all supported modules, head over to `additional supported modules`_.
@@ -115,7 +115,7 @@ Initialize the base structure, edit *conf.py* and *layouts/* and compile with:
::
- $ acrylamid init myblog
+ $ acrylamid init myblog # --mako, defaults to --jinja2
create myblog/conf.py
...
$ cd myblog/
View
@@ -122,7 +122,7 @@ Quickstart
easy_install -U acrylamid
This installs Acrylamid with Jinja2_ as templating engine. For Mako_ use
-``easy_install -U acrylamid --mako``. This installs two additional but not
+``easy_install -U acrylamid[mako]``. This installs two additional but not
required dependencies: ``Markdown`` and ``translitcodec``. To get a list of
all supported modules, head over to `additional supported modules`_.
@@ -133,7 +133,7 @@ Initialize the base structure, edit *conf.py* and *layouts/* and compile with:
.. raw:: html
<pre>
- $ acrylamid init myblog
+ $ acrylamid init myblog <span style="color: #999"># --mako, defaults to --jinja2</span>
<span style="font-weight: bold; color: #00aa00"> create</span> myblog/output/conf.py
...
$ cd myblog/
@@ -20,7 +20,8 @@ already installed (10.6 or later).
$> easy_install -U acrylamid
And you are done with the simplest setup (by the way even markdown and
-translitcodec are not must-have dependency).
+translitcodec are not must-have dependency). You can install all supprted
+modules via ``easy_install -U acrylamid[full]``.
.. note::
View
@@ -22,20 +22,6 @@
if sys.version_info < (2, 7):
requires.append('argparse')
-if '--full' in sys.argv:
- requires.extend([
- 'pygments',
- 'docutils',
- 'smartypants',
- 'asciimathml',
- 'textile',
- 'PyYAML'
- ])
-
-if '--mako' in sys.argv:
- requires.remove('Jinja2>=2.4')
- requires.append('Mako')
-
setup(
name='acrylamid',
version=version,
@@ -63,6 +49,11 @@
"Programming Language :: Python :: 3.2",
],
install_requires=requires,
+ extras_require={
+ 'full': ['pygments', 'docutils', 'smartypants', 'asciimathml',
+ 'textile', 'unidecode', 'PyYAML', 'twitter', 'discount'],
+ 'mako': ['mako'],
+ },
test_require=['Attest', 'cram', 'docutils'],
test_loader='attest:auto_reporter.test_loader',
test_suite='acrylamid.specs.testsuite',

0 comments on commit 3e89b74

Please sign in to comment.