release v2.1

README.md

@@ -223,21 +223,25 @@ Here's how to package, test, and ship a new release. (Note that this is [largely
 1. Upload to [test.pypi.org](https://test.pypi.org/) for testing.
     ```sh
     python3 setup.py clean build sdist
-    setenv ver vX.Y
+    setenv ver X.Y
+    source local/bin/activate.csh
     twine upload -r pypitest dist/granary-$ver.tar.gz
     ```
 1. Install from test.pypi.org, both Python 2 and 3.
     ```sh
     cd /tmp
     virtualenv local
     source local/bin/activate.csh
+    # mf2py 1.1.2 on test pypi is currently broken
+    pip install mf2py==1.1.2
     pip install -i https://test.pypi.org/simple --extra-index-url https://pypi.org/simple granary==$ver
     deactivate
     ```
     ```sh
     python3 -m venv local3
     source local3/bin/activate.csh
     pip3 install --upgrade pip
+    pip3 install mf2py==1.1.2
     pip3 install -i https://test.pypi.org/simple --extra-index-url https://pypi.org/simple granary==$ver
     deactivate
     ```
@@ -273,7 +277,7 @@ Here's how to package, test, and ship a new release. (Note that this is [largely
     ```
 1. Tag the release in git. In the tag message editor, delete the generated comments at bottom, leave the first line blank (to omit the release "title" in github), put `### Notable changes` on the second line, then copy and paste this version's changelog contents below it.
     ```sh
-    git tag -a $ver --cleanup=verbatim
+    git tag -a v$ver --cleanup=verbatim
     git push
     git push --tags
     ```
@@ -304,7 +308,7 @@ On the open source side, there are many related projects. [php-mf2-shim](https:/
 
 Changelog
 ---
-### 2.1 - unreleased
+### 2.1 - 2019-09-04
 * Convert AS2 `Mention` tags to AS1 `objectType` `mention` (non-standard) and vice versa ([snarfed/bridgy-fed#46](https://github.com/snarfed/bridgy-fed/issues/46)).
 * Twitter:
   * Bug fix for large block list fetches that get rate limited after a few successful requests.

docs/conf.py

@@ -83,9 +83,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '2.0'
+version = '2.1'
 # The full version, including alpha/beta/rc tags.
-release = '2.0'
+release = '2.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

docs/index.rst

@@ -435,7 +435,7 @@ Facebook and Twitter’s raw HTML.
 Changelog
 ---------
 
-2.1 - unreleased
+2.1 - 2019-09-04
 ~~~~~~~~~~~~~~~~
 
 -  Convert AS2 ``Mention`` tags to AS1 ``objectType`` ``mention``
@@ -448,6 +448,10 @@ Changelog
    -  Handle HTTP 403 + error code 200 when fetching retweets for a
       protected or otherwise unavailable tweet
       (`bridgy#688 <https://github.com/snarfed/bridgy/issues/688#issuecomment-520600329>`__).
+   -  Demote @-mentions from
+      `person-tags <https://indieweb.org/person-tag>`__ to
+      `mentions <https://indieweb.org/mention>`__. Specifically, this
+      means they’ll no longer get rendered with ``u-category`` mf2.
 
 -  Instagram:
 
@@ -457,6 +461,7 @@ Changelog
    -  Update scraping to handle replies in new
       ``edge_media_to_parent_comment`` field
       (`#164 <https://github.com/snarfed/granary/issues/164>`__).
+   -  Use cookie for all scraping HTTP requests, not just for likes.
 
 -  microformats2:
 
@@ -467,18 +472,27 @@ Changelog
 
    -  Bug fix: don’t interpret ``photo.php`` as username in post URLs.
 
+-  Atom:
+
+   -  Switch from ``white-space: pre`` CSS back to converting newlines
+      to ``<br>``\ s because some feed readers (`eg
+      NewsBlur <https://forum.newsblur.com/t/android-cant-read-line-pre-formatted-lines/6116>`__)
+      follow it too strictly and don’t even line wrap.
+
 -  RSS:
 
    -  Default title to ellipsized content.
 
+.. _section-1:
+
 2.0 - 2019-03-01
 ~~~~~~~~~~~~~~~~
 
 *Breaking change*: drop Google+ since `it shuts down in
 March <https://developers.google.com/+/api-shutdown>`__. Notably, this
 removes the ``googleplus`` module.
 
-.. _section-1:
+.. _section-2:
 
 1.15 - 2019-02-28
 ~~~~~~~~~~~~~~~~~
@@ -529,7 +543,7 @@ removes the ``googleplus`` module.
 -  ``/url``: Return HTTP 400 when fetching the user’s URL results in an
    infinite redirect.
 
-.. _section-2:
+.. _section-3:
 
 1.14 - 2018-11-12
 ~~~~~~~~~~~~~~~~~
@@ -556,7 +570,7 @@ Encode ``&``\ s in author URL and email address too. (Thanks
 `sebsued <https://twitter.com/sebsued>`__!) \* AS2: \* Add ``Follow``
 support.
 
-.. _section-3:
+.. _section-4:
 
 1.13 - 2018-08-08
 ~~~~~~~~~~~~~~~~~
@@ -617,7 +631,7 @@ support.
    -  Support ``alt`` attribute in ``<img>`` tags
       (`snarfed/bridgy#756 <https://github.com/snarfed/bridgy/issues/756>`__).
 
-.. _section-4:
+.. _section-5:
 
 1.12 - 2018-03-24
 ~~~~~~~~~~~~~~~~~
@@ -652,7 +666,7 @@ impact of the Python 3 migration. It *should* be a noop for existing
 Python 2 users, and we’ve tested thoroughly, but I’m sure there are
 still bugs. Please file issues if you notice anything broken!
 
-.. _section-5:
+.. _section-6:
 
 1.11 - 2018-03-09
 ~~~~~~~~~~~~~~~~~
@@ -725,7 +739,7 @@ still bugs. Please file issues if you notice anything broken!
    -  Omit title from items if it’s the same as the content. (Often
       caused by microformats2’s implied ``p-name`` logic.)
 
-.. _section-6:
+.. _section-7:
 
 1.10 - 2017-12-10
 ~~~~~~~~~~~~~~~~~
@@ -767,7 +781,7 @@ still bugs. Please file issues if you notice anything broken!
    -  Fix bug that omitted title in some cases
       (`#122 <https://github.com/snarfed/granary/issues/122>`__).
 
-.. _section-7:
+.. _section-8:
 
 1.9 - 2017-10-24
 ~~~~~~~~~~~~~~~~
@@ -795,7 +809,7 @@ still bugs. Please file issues if you notice anything broken!
       ``json``, ``json-mf2``, and ``xml`` are still accepted, but
       deprecated.
 
-.. _section-8:
+.. _section-9:
 
 1.8 - 2017-08-29
 ~~~~~~~~~~~~~~~~
@@ -875,7 +889,7 @@ still bugs. Please file issues if you notice anything broken!
    `bug <https://github.com/kylewm/brevity/issues/5>`__
    `fixes <https://github.com/kylewm/brevity/issues/6>`__.
 
-.. _section-9:
+.. _section-10:
 
 1.7 - 2017-02-27
 ~~~~~~~~~~~~~~~~
@@ -923,7 +937,7 @@ still bugs. Please file issues if you notice anything broken!
    on “narrow” builds of Python 2 with ``--enable-unicode=ucs2``, which
    is the default on Mac OS X, Windows, and older \*nix.
 
-.. _section-10:
+.. _section-11:
 
 1.6 - 2016-11-26
 ~~~~~~~~~~~~~~~~
@@ -957,7 +971,7 @@ still bugs. Please file issues if you notice anything broken!
 -  Error handling: return HTTP 502 for non-JSON API responses, 504 for
    connection failures.
 
-.. _section-11:
+.. _section-12:
 
 1.5 - 2016-08-25
 ~~~~~~~~~~~~~~~~
@@ -995,14 +1009,14 @@ still bugs. Please file issues if you notice anything broken!
    -  Switch creating comments and reactions from GraphQL to REST API
       (`bridgy#824 <https://github.com/snarfed/bridgy/issues/824>`__.
 
-.. _section-12:
+.. _section-13:
 
 1.4.1 - 2016-06-27
 ~~~~~~~~~~~~~~~~~~
 
 -  Bump oauth-dropins requirement to 1.4.
 
-.. _section-13:
+.. _section-14:
 
 1.4.0 - 2016-06-27
 ~~~~~~~~~~~~~~~~~~
@@ -1036,15 +1050,15 @@ still bugs. Please file issues if you notice anything broken!
 -  Upgrade to requests 2.10.0 and requests-toolbelt 0.60, which support
    App Engine.
 
-.. _section-14:
+.. _section-15:
 
 1.3.1 - 2016-04-07
 ~~~~~~~~~~~~~~~~~~
 
 -  Update `oauth-dropins <https://github.com/snarfed/oauth-dropins>`__
    dependency to >=1.3.
 
-.. _section-15:
+.. _section-16:
 
 1.3.0 - 2016-04-06
 ~~~~~~~~~~~~~~~~~~
@@ -1087,7 +1101,7 @@ still bugs. Please file issues if you notice anything broken!
 -  Misc bug fixes.
 -  Set up Coveralls.
 
-.. _section-16:
+.. _section-17:
 
 1.2.0 - 2016-01-11
 ~~~~~~~~~~~~~~~~~~
@@ -1143,7 +1157,7 @@ still bugs. Please file issues if you notice anything broken!
 -  Misc bug fixes.
 -  Set up CircleCI.
 
-.. _section-17:
+.. _section-18:
 
 1.1.0 - 2015-09-06
 ~~~~~~~~~~~~~~~~~~
@@ -1166,15 +1180,15 @@ still bugs. Please file issues if you notice anything broken!
 -  Improve original post discovery algorithm.
 -  New logo.
 
-.. _section-18:
+.. _section-19:
 
 1.0.1 - 2015-07-11
 ~~~~~~~~~~~~~~~~~~
 
 -  Bug fix for atom template rendering.
 -  Facebook, Instagram: support access_token parameter.
 
-.. _section-19:
+.. _section-20:
 
 1.0 - 2015-07-10
 ~~~~~~~~~~~~~~~~

setup.py

@@ -18,7 +18,7 @@ def __init__(self, *args, **kwargs):
 
 
 setup(name='granary',
-      version='2.0',
+      version='2.1',
       description='The social web translator',
       long_description=open('README.md').read(),
       long_description_content_type='text/markdown',