hiro/jobmanager
1
0
Fork 0
mirror of https://github.com/vale981/jobmanager synced 2025-03-04 17:31:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

travis gh-pages: display commit

Browse source
This commit is contained in:
Travis CI 2015-08-25 10:34:49 +02:00
parent 662fb2032b
commit 4a2c2ff562
3 changed files with 27 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/conf.py
View file

@ -139,7 +139,7 @@ exclude_patterns = ['_build']
# The theme to use for HTML and HTML Help pages. See the documentation for
# a list of builtin themes.
html_theme = 'default'
html_theme = 'classic'
# Theme options are theme-specific and customize the look and feel of a theme
# further. For a list of options available for each theme, see the

3
doc/deploy_ghpages.py
View file

@ -71,8 +71,9 @@ sp.check_output("rsync -rt --del --exclude='.git' --exclude='.nojekyll' ./build/
os.chdir("gh_pages")
sp.check_output("echo 'https://${GH_TOKEN}:@github.com' > .git/credentials", shell=True)
sp.check_output("git add --all ./*", shell=True)
try:
sp.check_output("git commit -a -m 'travis bot build ${TRAVIS_COMMIT} [ci skip]'", shell=True)
sp.check_output("git commit -a -m 'travis bot build {} [ci skip]'".format(os.getenv("TRAVIS_COMMIT")), shell=True)
except:
pass #nothing to do
else:

48
jobmanager/clients.py
View file

@ -16,30 +16,30 @@ from . import ode_wrapper
def merge_arg_and_const_arg(arg, const_arg):
"""
prepares data from arg and const_arg such that they can be passed
to the general integration routine
arg and const_arg are both assumed to be dictionaries
the merge process must not alter arg nor const_arg
in order to be used in the jobmanager context
returns the arguments passed to the function
defining the derivative such that
args_dgl = arg['args'] + const_arg['args']
where as arg['args'] and const_arg['args'] have been assumed to be tuples
e.g.
arg['args'] = (2, 'low')
const_arg['args'] = (15, np.pi)
f will be called with
f(t, x, 2, 'low', 15, np.pi)
returns further the combined dictionary
arg + const_arg with the keyword 'args' removed
For any duplicate keys the value will be the value
from the 'arg' dictionary.
prepares data from arg and const_arg such that they can be passed
to the general integration routine
arg and const_arg are both assumed to be dictionaries
the merge process must not alter arg nor const_arg
in order to be used in the jobmanager context
returns the arguments passed to the function
defining the derivative such that
args_dgl = arg['args'] + const_arg['args']
where as arg['args'] and const_arg['args'] have been assumed to be tuples
e.g.
arg['args'] = (2, 'low')
const_arg['args'] = (15, np.pi)
f will be called with
f(t, x, 2, 'low', 15, np.pi)
returns further the combined dictionary
arg + const_arg with the keyword 'args' removed
For any duplicate keys the value will be the value
from the 'arg' dictionary.
"""
# allows arg to be a namedtuple (or any other object that