From 293d11cfcf37c6a4d23718c38f1fa9410ec2a834 Mon Sep 17 00:00:00 2001 From: Antony Lee Date: Wed, 25 Oct 2017 02:01:01 -0700 Subject: [PATCH] Remove LaTeX checking in setup.py. We already have runtime tests for LaTeX and associated dependencies; the check in setup.py is not used for anything. --- setup.py | 5 ---- setupext.py | 69 ----------------------------------------------------- 2 files changed, 74 deletions(-) diff --git a/setup.py b/setup.py index 9a60d269cf2c..0b1b3c5e8191 100644 --- a/setup.py +++ b/setup.py @@ -105,11 +105,6 @@ setupext.BackendAgg(), setupext.BackendCairo(), setupext.Windowing(), - 'Optional LaTeX dependencies', - setupext.DviPng(), - setupext.Ghostscript(), - setupext.LaTeX(), - setupext.PdfToPs(), 'Optional package data', setupext.Dlls(), ] diff --git a/setupext.py b/setupext.py index c56ee47cd30e..c962e47cd046 100644 --- a/setupext.py +++ b/setupext.py @@ -2181,75 +2181,6 @@ def check_requirements(self): return "cairocffi version %s" % cairocffi.version -class DviPng(SetupPackage): - name = "dvipng" - optional = True - - def check(self): - try: - output = check_output('dvipng -version', shell=True, - stderr=subprocess.STDOUT) - return "version %s" % output.splitlines()[1].decode().split()[-1] - except (IndexError, ValueError, subprocess.CalledProcessError): - raise CheckFailed() - - -class Ghostscript(SetupPackage): - name = "ghostscript" - optional = True - - def check(self): - if sys.platform == 'win32': - # mgs is the name in miktex - gs_execs = ['gswin32c', 'gswin64c', 'mgs', 'gs'] - else: - gs_execs = ['gs'] - for gs_exec in gs_execs: - try: - command = gs_exec + ' --version' - output = check_output(command, shell=True, - stderr=subprocess.STDOUT) - return "version %s" % output.decode()[:-1] - except (IndexError, ValueError, subprocess.CalledProcessError): - pass - - raise CheckFailed() - - -class LaTeX(SetupPackage): - name = "latex" - optional = True - - def check(self): - try: - output = check_output('latex -version', shell=True, - stderr=subprocess.STDOUT) - line = output.splitlines()[0].decode() - pattern = '(3\.1\d+)|(MiKTeX \d+.\d+)' - match = re.search(pattern, line) - return "version %s" % match.group(0) - except (IndexError, ValueError, AttributeError, subprocess.CalledProcessError): - raise CheckFailed() - - -class PdfToPs(SetupPackage): - name = "pdftops" - optional = True - - def check(self): - try: - output = check_output('pdftops -v', shell=True, - stderr=subprocess.STDOUT) - for line in output.splitlines(): - line = line.decode() - if 'version' in line: - return "version %s" % line.split()[2] - except (IndexError, ValueError, subprocess.CalledProcessError): - pass - - raise CheckFailed() - - class OptionalPackageData(OptionalPackage): config_category = "package_data"