upgrade mf2py to 1.1.2 (unreleased)

details in #828, snarfed/granary#142, snarfed/granary@a989c3e, etc.

requirements.freeze.txt

@@ -4,33 +4,33 @@
 -e git+git@github.com:snarfed/python-future.git@all#egg=future
 -e git+git@github.com:snarfed/oauth-dropins.git#egg=oauth_dropins-master
 -e git+git@github.com:snarfed/webmention-tools.git#egg=webmentiontools
-beautifulsoup4==4.3.2
-certifi==2018.1.18
+beautifulsoup4==4.6.0
+certifi==2018.4.16
 chardet==3.0.4
 google-api-python-client==1.6.5
 html2text==2018.1.9
-html5lib==0.9999999
+html5lib==1.0.1
 httplib2==0.10.3
 humanize==0.5.1
-idna==2.6
+idna==2.7
 Jinja2==2.10
 lxml==3.7.3
 MarkupSafe==1.0
-mf2py==1.0.4
+-e git+https://github.com/snarfed/mf2py.git@all#egg=mf2py
 mf2util==0.5.0
 mox3==0.24.0
 oauth2client==4.1.2
 oauthlib==2.0.7
 pyasn1==0.3.3
 pyasn1-modules==0.1.1
 python-tumblpy==1.0.4
-requests==2.18.4
+requests==2.19.1
 requests-oauthlib==0.8.0
 requests-toolbelt==0.8.0
 rsa==3.4.2
 simplejson==3.7.3
 six==1.11.0
 tweepy==3.6.0
 uritemplate==3.0.0
-urllib3==1.22
+urllib3==1.23
 webapp2==3.0.0b1

requirements.txt

@@ -7,7 +7,7 @@ beautifulsoup4
 humanize
 jinja2>=2.10.0
 lxml==3.7.3
-mf2py>=1.0.4
+mf2py>=1.1.2
 mf2util>=0.5.0
 oauth2client
 requests>=2.10.0

test/test_blog_webmention.py

@@ -152,13 +152,14 @@ def test_rel_canonical_different_domain(self):
 
     html = """
 <article class="h-entry"><p class="e-content">
+<a href="http://bar.com/mention">this post</a>
 i hereby <a href="http://foo.zz/post/1">mention</a>
 </p></article>"""
     self.expect_requests_get('http://bar.com/mention', html)
 
     testutil.FakeSource.create_comment(
       'http://foo.zz/post/1', 'foo.zz', 'http://foo.zz/',
-      'mentioned this in <a href="http://bar.com/mention">i hereby mention</a>. <br /> <a href="http://bar.com/mention">via bar.com</a>')
+      'mentioned this in <a href="http://bar.com/mention">bar.com/mention</a>. <br /> <a href="http://bar.com/mention">via bar.com</a>')
     self.mox.ReplayAll()
 
     resp = self.get_response('http://bar.com/mention', 'http://foo.zz/post/1')
@@ -177,16 +178,16 @@ def test_mention(self):
     html = """\
 <article class="h-entry"><p class="e-content">
 <span class="p-name">my post</span>
-foo
-<a href="http://foo.com/post/1">this post</a>
+<a href="http://bar.com/mention">this post</a>
+<a href="http://foo.com/post/1">another post</a>
 </p></article>"""
-    self.expect_requests_get('http://bar.com/reply', html)
+    self.expect_requests_get('http://bar.com/mention', html)
     testutil.FakeSource.create_comment(
       'http://foo.com/post/1', 'foo.com', 'http://foo.com/',
-      'mentioned this in <a href="http://bar.com/reply">my post</a>. <br /> <a href="http://bar.com/reply">via bar.com</a>')
+      'mentioned this in <a href="http://bar.com/mention">my post</a>. <br /> <a href="http://bar.com/mention">via bar.com</a>')
     self.mox.ReplayAll()
 
-    resp = self.get_response()
+    resp = self.get_response('http://bar.com/mention')
     self.assertEquals(200, resp.status_int, resp.body)
 
   def test_domain_translates_to_lowercase(self):
@@ -271,6 +272,7 @@ def test_target_redirects(self):
   def test_source_link_check_ignores_fragment(self):
     html = """\
 <article class="h-entry"><p class="e-content">
+<a href="http://bar.com/reply">(permalink)</a>
 <span class="p-name">my post</span>
 <a href="http://foo.com/post/1"></a>
 </p></article>"""

test/test_publish.py

@@ -951,7 +951,6 @@ def test_expand_target_urls_h_event_in_h_feed(self):
     self.source.gr_source.create({
       'url': 'http://foo.com/bar',
       'verb': 'rsvp-yes',
-      'displayName': 'yes',
       'object': [{'url': 'http://orig.domain/baz'},
                  {'url': 'https://fa.ke/a/b'}],
       'objectType': 'activity',
@@ -1051,7 +1050,6 @@ def test_expand_target_urls_blacklisted_target(self):
     self.source.gr_source.create({
       'url': 'http://foo.com/bar',
       'verb': 'rsvp-yes',
-      'displayName': 'yes',
       'object': [{'url': 'http://fa.ke/homebrew-website-club'}],
       'objectType': 'activity',
       'content': '<span class="p-rsvp" value="yes">yes</span>\n<a class="u-in-reply-to" href="http://fa.ke/homebrew-website-club"></a>',