Skip to content
Snippets Groups Projects
Commit 3a01b06a authored by Mick Jordan's avatar Mick Jordan
Browse files

pylint fix; remove old vignette setup code

parent c3ad4544
Branches
No related tags found
No related merge requests found
...@@ -194,9 +194,6 @@ def pkgtest(args): ...@@ -194,9 +194,6 @@ def pkgtest(args):
env['FASTR_OPTION_PrintErrorStacktracesToFile'] = 'false' env['FASTR_OPTION_PrintErrorStacktracesToFile'] = 'false'
env['FASTR_OPTION_PrintErrorStacktraces'] = 'true' env['FASTR_OPTION_PrintErrorStacktraces'] = 'true'
# TODO enable but via installing Suggests
#_install_vignette_support('FastR', env)
out = OutputCapture() out = OutputCapture()
# install and test the packages, unless just listing versions # install and test the packages, unless just listing versions
if not '--list-versions' in install_args: if not '--list-versions' in install_args:
...@@ -240,11 +237,11 @@ def pkgtest(args): ...@@ -240,11 +237,11 @@ def pkgtest(args):
return rc return rc
def tar_tests(testdir): def tar_tests(testdir):
test_tar = join(_fastr_suite_dir, testdir + '.tar') test_tar = join(_fastr_suite_dir, testdir + '.tar')
subprocess.call(['tar', 'cf', test_tar, os.path.basename(testdir)]) subprocess.call(['tar', 'cf', test_tar, os.path.basename(testdir)])
if os.path.exists(test_tar + '.gz'): if os.path.exists(test_tar + '.gz'):
os.remove(test_tar + '.gz') os.remove(test_tar + '.gz')
subprocess.call(['gzip', test_tar]) subprocess.call(['gzip', test_tar])
class TestFileStatus: class TestFileStatus:
''' '''
...@@ -292,15 +289,6 @@ def _get_test_outputs(rvm, pkg_name, test_info): ...@@ -292,15 +289,6 @@ def _get_test_outputs(rvm, pkg_name, test_info):
relfile = relpath(absfile, pkg_testdir) relfile = relpath(absfile, pkg_testdir)
test_info[pkg_name].testfile_outputs[relfile] = TestFileStatus(status, absfile) test_info[pkg_name].testfile_outputs[relfile] = TestFileStatus(status, absfile)
def _install_vignette_support(rvm, env):
# knitr is needed for vignettes, but FastR can't handle it yet
if rvm == 'FastR':
return
_log_step('BEGIN', 'install vignette support', rvm)
args = [_installpkgs_script(), '--ignore-blacklist', '^rmarkdown$|^knitr$']
mx_fastr.gnu_rscript(args, env)
_log_step('END', 'install vignette support', rvm)
def _gnur_install_test(pkgs, gnur_libinstall, gnur_install_tmp): def _gnur_install_test(pkgs, gnur_libinstall, gnur_install_tmp):
gnur_packages = join(_fastr_suite_dir(), 'gnur.packages') gnur_packages = join(_fastr_suite_dir(), 'gnur.packages')
with open(gnur_packages, 'w') as f: with open(gnur_packages, 'w') as f:
...@@ -310,9 +298,7 @@ def _gnur_install_test(pkgs, gnur_libinstall, gnur_install_tmp): ...@@ -310,9 +298,7 @@ def _gnur_install_test(pkgs, gnur_libinstall, gnur_install_tmp):
env = os.environ.copy() env = os.environ.copy()
env["TMPDIR"] = gnur_install_tmp env["TMPDIR"] = gnur_install_tmp
env['R_LIBS_USER'] = gnur_libinstall env['R_LIBS_USER'] = gnur_libinstall
env["TZDIR"] = "/usr/share/zoneinfo/"
# TODO enable but via installing Suggests
# _install_vignette_support('GnuR', env)
args = [] args = []
if _graalvm(): if _graalvm():
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment