Commit 55785a00 authored by Steve Borho's avatar Steve Borho
Browse files

stop using bitbucket mirror of dulwich (chicken/egg problems)

allow py2exe to pick up the dulwich compiled and installed by pip
parent 6b655bb3e5d5
......@@ -52,7 +52,7 @@ from distutils.spawn import find_executable
import distutils.sysconfig
def set_syspath():
paths = ['hg', 'iniparse', 'dulwich', 'keyring', 'hg-git',
paths = ['hg', 'iniparse', 'keyring', 'hg-git',
'hgsubversion', 'thg']
buildroot = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
......@@ -98,7 +98,6 @@ URL = {
'hgkeyring' : 'https://bitbucket.org/Mekk/mercurial_keyring/',
'hgsubversion' : 'https://bitbucket.org/durin42/hgsubversion',
'hg-git' : 'https://bitbucket.org/durin42/hg-git',
'dulwich' : 'https://bitbucket.org/sborho/dulwich/',
'iniparse' : 'https://bitbucket.org/sborho/iniparse/',
'hgcr-gui' : 'https://bitbucket.org/glimchb/hgcr-gui/',
'projrc' : 'https://bitbucket.org/aragost/projrc/',
......@@ -113,7 +112,6 @@ extensions = [
# 'perfarce',
'keyring',
'hgkeyring',
'dulwich',
'iniparse',
'zipdoc',
'hgcr-gui',
......@@ -142,20 +140,19 @@ extfiles = {
}
# Extensions which require PYTHONPATH insertion
path_extensions = ('dulwich', 'keyring', 'iniparse', 'hg-git', 'hgsubversion')
path_extensions = ('keyring', 'iniparse', 'hg-git', 'hgsubversion')
# Specify the exact revision to ship for given extension
extversions = {
'iniparse': 'bd83edee7300ce0a4fdddc3eddf743dc6ea98602', # 0.4
'dulwich' : '8a5d01ef2433476f130a87123327f7d3f0120067', # 0.19.9
'keyring' : 'eded32d5a5687f633eca9e5d81d8e6a8f3432811', # 10.3.1
'hgkeyring':'e01afc28bac525a133a6ff4fd59812333e4b756d', # 1.2.1
'hgsubversion' : '207a0f26f797ecf241dddf00673e77e99bee7323', # 1.9.3
'evolve' : '33c617626fd90a0a00e831b4762f64fecb609317', # 8.5.0
'hgsubversion' : '6a6ce9d9da352801d30263178db6ba3f1637c197', # 1.9.3+
'evolve' : '756db65030c64b22836fe236d1db3b95477e3ef7', # 9.0.0
}
# Extensions which require compiled C++ Python extensions
compiled_extensions = ('dulwich', 'keyring')
compiled_extensions = ('keyring')
locales = ('cs', 'da', 'de', 'es', 'fr', 'it', 'ja', 'pt', 'pt_BR',
'ru', 'uk', 'zh_CN')
......@@ -772,8 +769,8 @@ def verify_thg_env():
site_packages_path = distutils.sysconfig.get_python_lib()
included_packages = ('mercurial', 'iniparse', 'dulwich',
'keyring', 'hg-git', 'hgsubversion')
included_packages = ('mercurial', 'iniparse', 'keyring', 'hg-git',
'hgsubversion')
# make sure that packages globally installed with e.g. easy_install
# don't override packages we want to bundle and build ourselves
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment