jenkins-bot has submitted this change and it was merged.
Change subject: unicodedata2 support for Python 2 only added ......................................................................
unicodedata2 support for Python 2 only added
Bug: T108068 Change-Id: I3014f97766ad23f335330734f7faa1a2ce2f717e --- M requirements.txt M setup.py 2 files changed, 2 insertions(+), 3 deletions(-)
Approvals: John Vandenberg: Looks good to me, but someone else must approve XZise: Looks good to me, approved jenkins-bot: Verified
diff --git a/requirements.txt b/requirements.txt index efc4d0b..629ede0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -34,8 +34,7 @@
ipaddr>=2.1.10 ; python_version < '3'
-git+https://github.com/jayvdb/unicodedata2@issue_2#egg=unicodedata2-7.0.0 ; python_version < '2.7' -unicodedata2 ; python_version >= '2.7' +git+https://github.com/jayvdb/unicodedata2@issue_2#egg=unicodedata2-7.0.0 ; python_version < '3'
# core interwiki_graph.py: git+https://github.com/nlhepler/pydot#egg=pydot-1.0.29 diff --git a/setup.py b/setup.py index 266ba8d..a956d07 100644 --- a/setup.py +++ b/setup.py @@ -51,7 +51,7 @@ # 0.6.1 supports socket.io 1.0, but WMF is using 0.9 (T91393 and T85716) 'rcstream': ['socketIO-client<0.6.1'], 'security': ['requests[security]'], - 'unicode7': ['unicodedata2'], + 'unicode7': ['unicodedata2'] if PY2 else [], }
if PY2: