Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Q
QueryR
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Julien Lopez
QueryR
Commits
3a01b06a
Commit
3a01b06a
authored
8 years ago
by
Mick Jordan
Browse files
Options
Downloads
Patches
Plain Diff
pylint fix; remove old vignette setup code
parent
c3ad4544
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
mx.fastr/mx_fastr_pkgs.py
+6
-20
6 additions, 20 deletions
mx.fastr/mx_fastr_pkgs.py
with
6 additions
and
20 deletions
mx.fastr/mx_fastr_pkgs.py
+
6
−
20
View file @
3a01b06a
...
@@ -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
():
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment