Index: head/net/py-twitter-tools/Makefile
===================================================================
--- head/net/py-twitter-tools/Makefile	(revision 499984)
+++ head/net/py-twitter-tools/Makefile	(revision 499985)
@@ -1,30 +1,33 @@
 # Created by: Kubilay Kocak <koobs@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	twitter
-PORTVERSION=	1.17.1
+PORTVERSION=	1.18.0
 DISTVERSIONPREFIX=	${PORTNAME}-
 CATEGORIES=	net python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 PKGNAMESUFFIX=	-tools
 
 MAINTAINER=	koobs@FreeBSD.org
-COMMENT=	Python API and command-line toolset for Twitter
+COMMENT=	API and command-line toolset for Twitter (twitter.com)
 
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR}
-
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		python:2.7
-USE_PYTHON=	distutils concurrent autoplist
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR}
+
+USES=		python
 USE_GITHUB=	yes
+USE_PYTHON=	distutils concurrent autoplist
 
 GH_ACCOUNT=	sixohsix
 
 NO_ARCH=	yes
+
+# A number of test failures are (still) present in test_util
+# https://github.com/sixohsix/twitter/issues/166
 
 do-test:
 	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
 
 .include <bsd.port.mk>
Index: head/net/py-twitter-tools/distinfo
===================================================================
--- head/net/py-twitter-tools/distinfo	(revision 499984)
+++ head/net/py-twitter-tools/distinfo	(revision 499985)
@@ -1,2 +1,3 @@
-SHA256 (sixohsix-twitter-twitter-1.17.1_GH0.tar.gz) = 7a1e0cc35f137b95f235ea89b2949db8985fb47fef47223acae74176d39335e7
-SIZE (sixohsix-twitter-twitter-1.17.1_GH0.tar.gz) = 45992
+TIMESTAMP = 1556188728
+SHA256 (sixohsix-twitter-twitter-1.18.0_GH0.tar.gz) = 561483b319aa153f94b334266341351c4dee9934835db976a030906a5d931567
+SIZE (sixohsix-twitter-twitter-1.18.0_GH0.tar.gz) = 47400
Index: head/net/py-twitter-tools/files/patch-tests_test__sanity.py
===================================================================
--- head/net/py-twitter-tools/files/patch-tests_test__sanity.py	(revision 499984)
+++ head/net/py-twitter-tools/files/patch-tests_test__sanity.py	(nonexistent)
@@ -1,16 +0,0 @@
-From 15ea270b76053effb114a3f423a2215506a4e24d Mon Sep 17 00:00:00 2001
-From: RouxRC <b.ooghe@gmail.com>
-Date: Mon, 23 Nov 2015 20:49:25 +0100
-Subject: [PATCH] adapt tests to now full https twitter
-
---- tests/test_sanity.py.orig	2016-02-20 07:27:26 UTC
-+++ tests/test_sanity.py
-@@ -52,7 +52,7 @@ def test_API_set_unicode_tweet():
- 
- 
- def clean_link(text):
--    pos = text.find(" http://t.co")
-+    pos = text.find(" https://t.co")
-     if pos != -1:
-         return text[:pos]
-     return text

Property changes on: head/net/py-twitter-tools/files/patch-tests_test__sanity.py
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/net/py-twitter-tools/files/patch-setup.py
===================================================================
--- head/net/py-twitter-tools/files/patch-setup.py	(nonexistent)
+++ head/net/py-twitter-tools/files/patch-setup.py	(revision 499985)
@@ -0,0 +1,17 @@
+# Fix UnicodeDecodeError: 'ascii' codec can't decode error
+
+--- setup.py.orig	2019-04-25 10:41:18 UTC
++++ setup.py
+@@ -1,11 +1,7 @@
+ from setuptools import setup, find_packages
+ import sys, os
+ 
+-try:
+-    import pypandoc
+-    long_description = pypandoc.convert('README', 'rst', format='md')
+-except ImportError:
+-    long_description = open('./README', 'r').read()
++long_description = open('./README', 'rb').read().decode("utf-8")
+ 
+ version = '1.18.0'
+ 

Property changes on: head/net/py-twitter-tools/files/patch-setup.py
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property