Merge pull request #1215 from justinmayer/typogrify

Use the actively maintained typogrify-web package

.travis.yml

@@ -8,9 +8,7 @@ before_install:
  - sudo locale-gen fr_FR.UTF-8 tr_TR.UTF-8
 install:
     - if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then ln -s /usr/share/asciidoc/asciidocapi.py ~/virtualenv/python2.7/lib/python2.7/site-packages/; fi
-    - if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then pip install typogrify ; fi
-    - if [[ $TRAVIS_PYTHON_VERSION == '3.3' ]]; then pip install git+https://github.com/dmdm/typogrify.git@py3k#egg=typogrify; fi
-    - pip install mock nose nose-cov Markdown
+    - pip install mock nose nose-cov Markdown typogrify-web
     - pip install .
 script: nosetests -sv --with-coverage --cover-package=pelican pelican
 after_success:

dev_requirements.txt

@@ -5,7 +5,7 @@ mock
 Markdown
 BeautifulSoup4
 lxml
-typogrify
+typogrify-web
 
 # To perform release
 bumpr==0.2.0

docs/changelog.rst

@@ -4,6 +4,8 @@ Release history
 Next release
 ============
 
+* Replace the neglected ``typogrify`` package with the actively-maintained
+  ``typogrify-web`` package.
 * Added the `:modified:` metadata field to complement `:date:`.
   Used to specify the last date and time an article was updated independently from the date and time it was published.
 * Produce inline links instead of reference-style links when importing content.

docs/getting_started.rst

@@ -136,8 +136,8 @@ manually via ``pip``:
 
 * `markdown <http://pypi.python.org/pypi/Markdown>`_, for supporting Markdown as
   an input format
-* `typogrify <http://pypi.python.org/pypi/typogrify>`_, for typographical
-  enhancements
+* `typogrify-web <http://pypi.python.org/pypi/typogrify-web>`_, for
+  typographical enhancements
 
 Kickstart your site
 ===================

docs/settings.rst

@@ -133,8 +133,8 @@ Setting name (default value)                                            What doe
                                                                         section below for more info.
 `TYPOGRIFY` (``False``)                                                 If set to True, several typographical improvements will be
                                                                         incorporated into the generated HTML via the `Typogrify
-                                                                        <http://static.mintchaos.com/projects/typogrify/>`_
-                                                                        library, which can be installed via: ``pip install typogrify``
+                                                                        <https://pypi.python.org/pypi/typogrify-web>`_ library,
+                                                                        which can be installed via: ``pip install typogrify-web``
 `DIRECT_TEMPLATES` (``('index', 'tags', 'categories', 'archives')``)    List of templates that are used directly to render
                                                                         content. Typically direct templates are used to generate
                                                                         index pages for collections of content (e.g., tags and

tox.ini

@@ -14,7 +14,7 @@ deps =
     mock
     Markdown
     BeautifulSoup4
-    typogrify
+    typogrify-web
     lxml
 
 [testenv:py33]
@@ -22,5 +22,5 @@ deps =
     mock
     Markdown
     BeautifulSoup4
-    git+https://github.com/dmdm/typogrify.git@py3k#egg=typogrify
+    typogrify-web
     lxml