Skip to content

Commit 414228f

Browse files
HenrikBengtssonHenrikBengtsson
committed
Merge branch 'release/0.20.0'
2 parents 6531673 + ac7be74 commit 414228f

File tree

151 files changed

+6434
-3383
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

151 files changed

+6434
-3383
lines changed

‎.Rbuildignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ Rplots.pdf$
5454
# Package specific
5555
#----------------------------
5656
^[.]BatchJobs[.]R$
57-
[.]future
57+
^[.]future
5858

5959
#----------------------------
6060
# Miscellaneous

‎.github/workflows/R-CMD-check.yaml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,15 @@ jobs:
2121
- {os: windows-latest, r: 'oldrel' }
2222
# - {os: macOS-latest, r: 'devel' }
2323
- {os: macOS-latest, r: 'release' }
24-
- {os: macOS-latest, r: 'oldrel' }
24+
# - {os: macOS-latest, r: 'oldrel' }
2525
- {os: ubuntu-latest, r: 'devel' }
2626
- {os: ubuntu-latest, r: 'release' }
27+
- {os: ubuntu-latest, r: 'release', future_version: develop, label: 'future develop' }
2728
- {os: ubuntu-latest, r: 'oldrel' }
2829
- {os: ubuntu-latest, r: 'oldrel-1' }
2930
- {os: ubuntu-latest, r: 'oldrel-2' }
30-
- {os: ubuntu-latest, r: '3.6' }
31+
- {os: ubuntu-latest, r: '4.0' }
3132
- {os: ubuntu-latest, r: 'release' , language: ko, label: ko }
32-
- {os: ubuntu-latest, r: 'release', future_version: develop, label: 'w/ future-develop' }
33-
- {os: ubuntu-latest, r: 'release', future_version: feature/evalFuture-3, label: 'w/ future-feature/evalFuture-3' }
3433

3534
env:
3635
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/future_tests.yaml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ jobs:
2222
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
2323
R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
2424
## R CMD check
25-
_R_CHECK_LENGTH_1_CONDITION_: true
26-
_R_CHECK_LENGTH_1_LOGIC2_: true
2725
_R_CHECK_MATRIX_DATA_: true
2826
_R_CHECK_CRAN_INCOMING_: false
2927
## Specific to futures

‎DESCRIPTION‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
Package: future.batchtools
2-
Version: 0.12.2
2+
Version: 0.20.0
33
Depends:
44
R (>= 3.2.0),
55
parallelly,
6-
future (>= 1.49.0)
6+
future (>= 1.58.0)
77
Imports:
8-
batchtools (>= 0.9.16),
8+
batchtools (>= 0.9.17),
99
utils
1010
Suggests:
1111
globals,
@@ -30,5 +30,7 @@ License: LGPL (>= 2.1)
3030
LazyLoad: TRUE
3131
URL: https://future.batchtools.futureverse.org, https://github.com/futureverse/future.batchtools
3232
BugReports: https://github.com/futureverse/future.batchtools/issues
33+
Language: en-US
34+
Encoding: UTF-8
3335
RoxygenNote: 7.3.2
3436
Roxygen: list(markdown = TRUE)

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ future.tests: future.tests/future.batchtools\:\:batchtools_local
1010

1111
spelling:
1212
$(R_SCRIPT) -e "spelling::spell_check_package()"
13-
$(R_SCRIPT) -e "spelling::spell_check_files(c('NEWS', dir('vignettes', pattern='[.]rsp', full.names=TRUE)), ignore=readLines('inst/WORDLIST', warn=FALSE))"
13+
$(R_SCRIPT) -e "spelling::spell_check_files(c('NEWS.md', dir('vignettes', pattern='[.]rsp', full.names=TRUE)), ignore=readLines('inst/WORDLIST', warn=FALSE))"

‎NAMESPACE‎

Lines changed: 38 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,50 @@
11
# Generated by roxygen2: do not edit by hand
22

33
S3method(add_finalizer,BatchtoolsFuture)
4-
S3method(cancel,BatchtoolsFuture)
54
S3method(delete,BatchtoolsFuture)
5+
S3method(interruptFuture,BatchtoolsFutureBackend)
6+
S3method(launchFuture,BatchtoolsFutureBackend)
67
S3method(loggedError,BatchtoolsFuture)
78
S3method(loggedOutput,BatchtoolsFuture)
8-
S3method(nbrOfFreeWorkers,batchtools)
9-
S3method(nbrOfFreeWorkers,batchtools_multiprocess)
10-
S3method(nbrOfFreeWorkers,batchtools_uniprocess)
11-
S3method(nbrOfWorkers,batchtools)
12-
S3method(nbrOfWorkers,batchtools_multicore)
13-
S3method(nbrOfWorkers,batchtools_uniprocess)
9+
S3method(nbrOfFreeWorkers,BatchtoolsFutureBackend)
10+
S3method(nbrOfFreeWorkers,BatchtoolsMultiprocessFutureBackend)
11+
S3method(nbrOfFreeWorkers,BatchtoolsUniprocessFutureBackend)
12+
S3method(nbrOfWorkers,BatchtoolsFutureBackend)
13+
S3method(nbrOfWorkers,BatchtoolsMulticoreFutureBackend)
14+
S3method(nbrOfWorkers,BatchtoolsUniprocessFutureBackend)
1415
S3method(print,BatchtoolsFuture)
16+
S3method(print,BatchtoolsFutureBackend)
17+
S3method(print,BatchtoolsSGEFutureBackend)
18+
S3method(print,BatchtoolsSlurmFutureBackend)
1519
S3method(registerFuture,BatchtoolsFuture)
1620
S3method(registerFuture,BatchtoolsUniprocessFuture)
1721
S3method(registerFuture,default)
1822
S3method(resolved,BatchtoolsFuture)
1923
S3method(result,BatchtoolsFuture)
20-
S3method(run,BatchtoolsFuture)
24+
S3method(stopWorkers,BatchtoolsFutureBackend)
2125
S3method(unregisterFuture,BatchtoolsFuture)
2226
S3method(unregisterFuture,BatchtoolsUniprocessFuture)
2327
S3method(unregisterFuture,default)
2428
S3method(waitForWorker,BatchtoolsFuture)
2529
S3method(waitForWorker,BatchtoolsUniprocessFuture)
2630
S3method(waitForWorker,default)
2731
export("%resources%")
28-
export(BatchtoolsBashFuture)
29-
export(BatchtoolsCustomFuture)
30-
export(BatchtoolsFuture)
32+
export(BatchtoolsBashFutureBackend)
33+
export(BatchtoolsCustomFutureBackend)
34+
export(BatchtoolsFutureBackend)
3135
export(BatchtoolsFutureError)
32-
export(BatchtoolsInteractiveFuture)
33-
export(BatchtoolsLocalFuture)
34-
export(BatchtoolsLsfFuture)
35-
export(BatchtoolsMulticoreFuture)
36-
export(BatchtoolsMultiprocessFuture)
37-
export(BatchtoolsOpenLavaFuture)
38-
export(BatchtoolsSGEFuture)
39-
export(BatchtoolsSSHFuture)
40-
export(BatchtoolsSlurmFuture)
41-
export(BatchtoolsTemplateFuture)
42-
export(BatchtoolsTorqueFuture)
43-
export(BatchtoolsUniprocessFuture)
36+
export(BatchtoolsInteractiveFutureBackend)
37+
export(BatchtoolsLocalFutureBackend)
38+
export(BatchtoolsLsfFutureBackend)
39+
export(BatchtoolsMulticoreFutureBackend)
40+
export(BatchtoolsMultiprocessFutureBackend)
41+
export(BatchtoolsOpenLavaFutureBackend)
42+
export(BatchtoolsSGEFutureBackend)
43+
export(BatchtoolsSSHFutureBackend)
44+
export(BatchtoolsSlurmFutureBackend)
45+
export(BatchtoolsTemplateFutureBackend)
46+
export(BatchtoolsTorqueFutureBackend)
47+
export(BatchtoolsUniprocessFutureBackend)
4448
export(batchtools_bash)
4549
export(batchtools_custom)
4650
export(batchtools_interactive)
@@ -54,6 +58,7 @@ export(batchtools_ssh)
5458
export(batchtools_torque)
5559
export(loggedError)
5660
export(loggedOutput)
61+
export(makeClusterFunctionsBash)
5762
importFrom(batchtools,Worker)
5863
importFrom(batchtools,batchExport)
5964
importFrom(batchtools,batchMap)
@@ -65,6 +70,7 @@ importFrom(batchtools,findTemplateFile)
6570
importFrom(batchtools,getErrorMessages)
6671
importFrom(batchtools,getLog)
6772
importFrom(batchtools,getStatus)
73+
importFrom(batchtools,killJobs)
6874
importFrom(batchtools,loadResult)
6975
importFrom(batchtools,makeClusterFunctions)
7076
importFrom(batchtools,makeClusterFunctionsInteractive)
@@ -82,20 +88,26 @@ importFrom(batchtools,saveRegistry)
8288
importFrom(batchtools,setJobNames)
8389
importFrom(batchtools,submitJobs)
8490
importFrom(batchtools,waitForJobs)
85-
importFrom(future,Future)
91+
importFrom(future,FutureBackend)
8692
importFrom(future,FutureError)
93+
importFrom(future,FutureInterruptError)
94+
importFrom(future,FutureLaunchError)
95+
importFrom(future,FutureWarning)
8796
importFrom(future,cancel)
88-
importFrom(future,getExpression)
89-
importFrom(future,getGlobalsAndPackages)
97+
importFrom(future,interruptFuture)
98+
importFrom(future,launchFuture)
9099
importFrom(future,nbrOfFreeWorkers)
91100
importFrom(future,nbrOfWorkers)
92101
importFrom(future,plan)
93102
importFrom(future,resolved)
94103
importFrom(future,result)
95104
importFrom(future,run)
105+
importFrom(future,stopWorkers)
96106
importFrom(future,tweak)
97107
importFrom(parallelly,availableCores)
98108
importFrom(parallelly,availableWorkers)
109+
importFrom(parallelly,supportsMulticore)
110+
importFrom(tools,pskill)
99111
importFrom(utils,capture.output)
100112
importFrom(utils,file_test)
101113
importFrom(utils,sessionInfo)

0 commit comments

Comments
 (0)