Disable hg_startup on Python 3

python · Jul 30, 2019 · 748db03 · 748db03
1 parent dece6d0
commit 748db03
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 6 deletions.
diff --git a/doc/changelog.rst b/doc/changelog.rst
@@ -4,7 +4,7 @@ Changelog
 Version 0.9.2
 -------------
 
-* Enable hg_startup and pyflate benchmarks on Python 3.
+* Enable pyflate benchmarks on Python 3.
 
 Version 0.9.1 (2019-07-29)
 --------------------------

diff --git a/pyperformance/benchmarks/__init__.py b/pyperformance/benchmarks/__init__.py
@@ -88,6 +88,7 @@ def BM_2to3(python, options):
     return run_perf_script(python, options, "2to3")
 
 
+@python2_only
 def BM_hg_startup(python, options):
     return run_perf_script(python, options, "hg_startup")
 

diff --git a/pyperformance/requirements.txt b/pyperformance/requirements.txt
@@ -64,7 +64,7 @@ Genshi==0.7.3                             # bm_genshi
 Mako==1.0.14                              # bm_mako
 SQLAlchemy==1.3.6                         # bm_sqlalchemy_declarative
 dulwich==0.19.11                          # dulwich_log
-mercurial==5.0.2                          # bm_hg_startup
+mercurial==5.0.2; python_version < '3.0'  # bm_hg_startup
 html5lib==1.0.1                           # bm_html5lib
 pathlib2==2.3.4; python_version < '3.4'   # bm_pathlib
 pyaes==1.6.1                              # bm_crypto_pyaes

diff --git a/pyperformance/venv.py b/pyperformance/venv.py
@@ -199,10 +199,6 @@ def create_environ(inherit_environ):
         if name in os.environ:
             env[name] = os.environ[name]
 
-    # Needed to install Mercurial on Python 3 for hg_startup:
-    # https://www.mercurial-scm.org/wiki/Python3
-    env['HGPYTHON3'] = '1'
-
     return env