jenkins-bot has submitted this change and it was merged.
Change subject: Use unicodedata2>=7.0.0-2 ......................................................................
Use unicodedata2>=7.0.0-2
Bug: T108068 Change-Id: Icf04bb53ee4412d7142c5ccaafc1e5092aa2b9b4 --- M requirements.txt M setup.py 2 files changed, 2 insertions(+), 4 deletions(-)
Approvals: XZise: Looks good to me, approved jenkins-bot: Verified
diff --git a/requirements.txt b/requirements.txt index 629ede0..e12c55c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -34,7 +34,7 @@
ipaddr>=2.1.10 ; python_version < '3'
-git+https://github.com/jayvdb/unicodedata2@issue_2#egg=unicodedata2-7.0.0 ; python_version < '3' +unicodedata2>=7.0.0-2 ; 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 a956d07..eab2bcf 100644 --- a/setup.py +++ b/setup.py @@ -51,7 +51,6 @@ # 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'] if PY2 else [], }
if PY2: @@ -59,6 +58,7 @@ extra_deps.update({ 'csv': ['unicodecsv'], 'MySQL': ['oursql'], + 'unicode7': ['unicodedata2>=7.0.0-2'], })
script_deps = { @@ -109,8 +109,6 @@
script_deps['replicate_wiki.py'] = ['argparse'] dependencies.append('future>=0.15.0') # provides collections backports - dependency_links.append( - 'git+https://github.com/jayvdb/unicodedata2@issue_2#egg=unicodedata2-7.0.0')
dependencies += extra_deps['unicode7'] # T102461 workaround