release v3.2

README.md

@@ -224,7 +224,7 @@ Here's how to package, test, and ship a new release. (Note that this is [largely
    deactivate
    ```
 1. Bump the version number in `setup.py` and `docs/conf.py`. `git grep` the old version number to make sure it only appears in the changelog. Change the current changelog entry in `README.md` for this new version from _unreleased_ to the current date.
-1. Bump the `oauth-dropins` version specifier in `setup.py` to the most recent version, usually the same version number as this granary release.
+1. Bump the `oauth-dropins` version specifier in `setup.py` to the most recent version.
 1. Build the docs. If you added any new modules, add them to the appropriate file(s) in `docs/source/`. Then run `./docs/build.sh`. Check that the generated HTML looks fine by opening `docs/_build/html/index.html` and looking around.
 1. `git commit -am 'release vX.Y'`
 1. Upload to [test.pypi.org](https://test.pypi.org/) for testing.
@@ -304,7 +304,7 @@ On the open source side, there are many related projects. [php-mf2-shim](https:/
 
 Changelog
 ---
-### 3.2 - unreleased
+### 3.2 - 2021-09-15
 * `Source.original_post_discovery`: add new `include_reserved_hosts` kwarg, defaults to `True`.
 * Facebook:
   * Scraping: handle pictures, videos, link attachments, and text links in timeline/news feed posts.

docs/conf.py

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

docs/index.rst

@@ -268,7 +268,7 @@ the repo root directory:
    python3 -m venv local
    source local/bin/activate
    pip install -r requirements.txt
-   ln -s local/lib/python3*/site-packages/oauth_dropins
+   ln -s local/lib/python3*/site-packages/oauth_dropins/static oauth_dropins_static
 
 Now, run the tests to check that everything is set up ok:
 
@@ -294,12 +294,13 @@ If you want to work on
 `oauth-dropins <https://github.com/snarfed/oauth-dropins>`__ at the same
 time, install it in “source” mode with
 ``pip install -e <path to oauth-dropins repo>``. You’ll also need to
-update the ``oauth_dropins`` symlink, which is needed for serving static
-file assets in dev_appserver:
-``ln -sf <path-to-oauth-dropins-repo>/oauth_dropins``. To test it with
-dev_appserver you also need to replace the line in requirements.txt from
+update the ``oauth_dropins_static`` symlink, which is needed for serving
+static file assets in dev_appserver:
+``ln -sf <path-to-oauth-dropins-repo>/oauth_dropins/static oauth_dropins_static``.
+To test it with dev_appserver you also need to replace the line in
+requirements.txt from
 ``git+https://github.com/snarfed/oauth-dropins.git@master#egg=oauth_dropins``
-to ``<path-to-oauth-dropins-repo>`` (an alternative workaround for
+to ``-e <path-to-oauth-dropins-repo>`` (an alternative workaround for
 dev_appserver.py can be found
 `here <https://issuetracker.google.com/issues/144150446>`__.
 
@@ -419,8 +420,7 @@ too <https://github.com/snarfed/oauth-dropins#release-instructions>`__.)
     .. code:: sh
 
        git tag -a v$ver --cleanup=verbatim
-       git push
-       git push --tags
+       git push && git push --tags
 
 10. `Click here to draft a new release on
     GitHub. <https://github.com/snarfed/granary/releases/new>`__ Enter
@@ -502,6 +502,60 @@ Facebook and Twitter’s raw HTML.
 Changelog
 ---------
 
+3.2 - 2021-09-15
+~~~~~~~~~~~~~~~~
+
+-  ``Source.original_post_discovery``: add new
+   ``include_reserved_hosts`` kwarg, defaults to ``True``.
+-  Facebook:
+
+   -  Scraping: handle pictures, videos, link attachments, and text
+      links in timeline/news feed posts.
+
+-  Mastodon:
+
+   -  Bug fix for ``get_activities()`` with ``fetch_mentions=True``:
+      handle notifications with ``status: null``. Maybe happens when a
+      status is deleted?
+   -  ``create``/``preview_create``: support bookmarks. (Nothing special
+      happens with them; their ``content`` is posted as a normal toot.)
+
+-  microformats2:
+
+   -  Stop rendering ``image.displayName`` as visible text in HTML,
+      since it’s already in the ``<img>``\ ’s ``alt`` attribute.
+   -  Add
+      `bookmark-of <https://indieweb.org/bookmark#How_to_markup>`__
+      support.
+   -  Add ``prefix_image_urls()`` function.
+   -  Handle null ``content`` in AS1/2 objects.
+   -  ``json_to_object`` bug fix for composite ``bookmark-of``
+      properties.
+
+-  Twitter:
+
+   -  ``create``/``preview``: `support large
+      videos <https://twittercommunity.com/t/large-file-can-not-be-finalized-synchronously/82929/3>`__
+      via async upload. We now pass ``media_category=tweet_video`` to
+      the chunked upload ``INIT`` stage, and then make blocking
+      ``STATUS`` calls until the video is finished processing.
+      (`bridgy#1043 <https://github.com/snarfed/bridgy/issues/1043>`__)
+   -  ``create``/``preview``: allow bookmarks.
+      (`bridgy#1045 <https://github.com/snarfed/bridgy/issues/1045>`__)
+   -  ``create``/``preview``: allow non-Twitter replies, ie activities
+      that include ``inReplyTo`` URLs even if none of them point to a
+      tweet.
+      (`bridgy#1063 <https://github.com/snarfed/bridgy/issues/1063>`__)
+   -  ``get_activities``: support list ids as well as slugs.
+   -  Bug fixes for removing t.co links to quoted tweets.
+   -  Bug fix for multiple instances of the same link in tweet text.
+   -  ``get_activities()``: raise ``ValueError`` on invalid ``user_id``.
+
+-  REST API: ported web framework from webapp2 to Flask. No user-visible
+   behavior change expected.
+
+.. _section-1:
+
 3.1 - 2021-04-03
 ~~~~~~~~~~~~~~~~
 
@@ -605,7 +659,7 @@ Changelog
    -  ``from_as1()``: convert ``username`` to ``preferredUsername``.
    -  ``from_as1()``: bug fix, make ``context`` kwarg actually work.
 
-.. _section-1:
+.. _section-2:
 
 3.0 - 2020-04-08
 ~~~~~~~~~~~~~~~~
@@ -684,7 +738,7 @@ Non-breaking changes:
    caching now.
 -  Added Meetup.com support for publishing RSVPs.
 
-.. _section-2:
+.. _section-3:
 
 2.2 - 2019-11-02
 ~~~~~~~~~~~~~~~~
@@ -733,7 +787,7 @@ Non-breaking changes:
       supports one enclosure per item, so we now only include the first,
       and log a warning if the activity has more.)
 
-.. _section-3:
+.. _section-4:
 
 2.1 - 2019-09-04
 ~~~~~~~~~~~~~~~~
@@ -783,7 +837,7 @@ Non-breaking changes:
 
    -  Default title to ellipsized content.
 
-.. _section-4:
+.. _section-5:
 
 2.0 - 2019-03-01
 ~~~~~~~~~~~~~~~~
@@ -792,7 +846,7 @@ Non-breaking changes:
 March <https://developers.google.com/+/api-shutdown>`__. Notably, this
 removes the ``googleplus`` module.
 
-.. _section-5:
+.. _section-6:
 
 1.15 - 2019-02-28
 ~~~~~~~~~~~~~~~~~
@@ -843,7 +897,7 @@ removes the ``googleplus`` module.
 -  ``/url``: Return HTTP 400 when fetching the user’s URL results in an
    infinite redirect.
 
-.. _section-6:
+.. _section-7:
 
 1.14 - 2018-11-12
 ~~~~~~~~~~~~~~~~~
@@ -870,7 +924,7 @@ Encode ``&``\ s in author URL and email address too. (Thanks
 `sebsued <https://twitter.com/sebsued>`__!) \* AS2: \* Add ``Follow``
 support.
 
-.. _section-7:
+.. _section-8:
 
 1.13 - 2018-08-08
 ~~~~~~~~~~~~~~~~~
@@ -931,7 +985,7 @@ support.
    -  Support ``alt`` attribute in ``<img>`` tags
       (`snarfed/bridgy#756 <https://github.com/snarfed/bridgy/issues/756>`__).
 
-.. _section-8:
+.. _section-9:
 
 1.12 - 2018-03-24
 ~~~~~~~~~~~~~~~~~
@@ -966,7 +1020,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-9:
+.. _section-10:
 
 1.11 - 2018-03-09
 ~~~~~~~~~~~~~~~~~
@@ -1039,7 +1093,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-10:
+.. _section-11:
 
 1.10 - 2017-12-10
 ~~~~~~~~~~~~~~~~~
@@ -1081,7 +1135,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-11:
+.. _section-12:
 
 1.9 - 2017-10-24
 ~~~~~~~~~~~~~~~~
@@ -1109,7 +1163,7 @@ still bugs. Please file issues if you notice anything broken!
       ``json``, ``json-mf2``, and ``xml`` are still accepted, but
       deprecated.
 
-.. _section-12:
+.. _section-13:
 
 1.8 - 2017-08-29
 ~~~~~~~~~~~~~~~~
@@ -1189,7 +1243,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-13:
+.. _section-14:
 
 1.7 - 2017-02-27
 ~~~~~~~~~~~~~~~~
@@ -1237,7 +1291,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-14:
+.. _section-15:
 
 1.6 - 2016-11-26
 ~~~~~~~~~~~~~~~~
@@ -1271,7 +1325,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-15:
+.. _section-16:
 
 1.5 - 2016-08-25
 ~~~~~~~~~~~~~~~~
@@ -1309,14 +1363,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-16:
+.. _section-17:
 
 1.4.1 - 2016-06-27
 ~~~~~~~~~~~~~~~~~~
 
 -  Bump oauth-dropins requirement to 1.4.
 
-.. _section-17:
+.. _section-18:
 
 1.4.0 - 2016-06-27
 ~~~~~~~~~~~~~~~~~~
@@ -1350,15 +1404,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-18:
+.. _section-19:
 
 1.3.1 - 2016-04-07
 ~~~~~~~~~~~~~~~~~~
 
 -  Update `oauth-dropins <https://github.com/snarfed/oauth-dropins>`__
    dependency to >=1.3.
 
-.. _section-19:
+.. _section-20:
 
 1.3.0 - 2016-04-06
 ~~~~~~~~~~~~~~~~~~
@@ -1401,7 +1455,7 @@ still bugs. Please file issues if you notice anything broken!
 -  Misc bug fixes.
 -  Set up Coveralls.
 
-.. _section-20:
+.. _section-21:
 
 1.2.0 - 2016-01-11
 ~~~~~~~~~~~~~~~~~~
@@ -1457,7 +1511,7 @@ still bugs. Please file issues if you notice anything broken!
 -  Misc bug fixes.
 -  Set up CircleCI.
 
-.. _section-21:
+.. _section-22:
 
 1.1.0 - 2015-09-06
 ~~~~~~~~~~~~~~~~~~
@@ -1480,15 +1534,15 @@ still bugs. Please file issues if you notice anything broken!
 -  Improve original post discovery algorithm.
 -  New logo.
 
-.. _section-22:
+.. _section-23:
 
 1.0.1 - 2015-07-11
 ~~~~~~~~~~~~~~~~~~
 
 -  Bug fix for atom template rendering.
 -  Facebook, Instagram: support access_token parameter.
 
-.. _section-23:
+.. _section-24:
 
 1.0 - 2015-07-10
 ~~~~~~~~~~~~~~~~

setup.py

@@ -11,7 +11,7 @@
 
 
 setup(name='granary',
-      version='3.1',
+      version='3.2',
       description='The social web translator',
       long_description=open('README.md').read(),
       long_description_content_type='text/markdown',
@@ -44,7 +44,7 @@
           'humanfriendly>=4.18,<10.0',
           'jinja2>=2.10,<4.0',
           'mf2util>=0.5.0',
-          'oauth-dropins>=3.1',
+          'oauth-dropins>=4.0',
           'praw>=7.3.0,<8.0',
           'python-dateutil~=2.8',
           'requests~=2.22',