[PATCH] setup: exclude vendored futures package on Python 3

Yuya Nishihara yuya at tcha.org
Fri Sep 14 13:59:31 UTC 2018


# HG changeset patch
# User Yuya Nishihara <yuya at tcha.org>
# Date 1536931382 -32400
#      Fri Sep 14 22:23:02 2018 +0900
# Node ID 96bffce40f5b98d3b378c19de2de72fee8653c21
# Parent  053aa673947f0af7d5176dece016e2ebb7c93847
setup: exclude vendored futures package on Python 3

The vendored future can't live on Python 3.

diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -818,8 +818,6 @@ packages = ['mercurial',
             'mercurial.thirdparty.attr',
             'mercurial.thirdparty.cbor',
             'mercurial.thirdparty.cbor.cbor2',
-            'mercurial.thirdparty.concurrent',
-            'mercurial.thirdparty.concurrent.futures',
             'mercurial.thirdparty.zope',
             'mercurial.thirdparty.zope.interface',
             'mercurial.utils',
@@ -832,6 +830,9 @@ packages = ['mercurial',
             'hgext.largefiles', 'hgext.lfs', 'hgext.narrow',
             'hgext.zeroconf', 'hgext3rd',
             'hgdemandimport']
+if sys.version_info[0] == 2:
+    packages.extend(['mercurial.thirdparty.concurrent',
+                     'mercurial.thirdparty.concurrent.futures'])
 
 common_depends = ['mercurial/bitmanipulation.h',
                   'mercurial/compat.h',


More information about the Mercurial-devel mailing list