Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Provenance integration in OpenAlea Scientific Workflows #2

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Provenance integration in OpenAlea Scientific Workflows #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9a65bfe
added uid in Factory
revesansparole Jul 20, 2016
2aa8f76
added uid to factories and cleaned wraleas
revesansparole Jul 20, 2016
7d9d456
put provenance back into the system
revesansparole Jul 26, 2016
e076241
added get method in metadatadict
revesansparole Jul 27, 2016
3ebaa0c
removed bad init of provenance
revesansparole Jul 27, 2016
ef89307
bug correction call to after_eval
revesansparole Jul 27, 2016
2ee2560
preserve uid over rewriting of cnf
revesansparole Jul 27, 2016
513c827
preserve uid over rewriting, bug correction when writing node factories
revesansparole Jul 27, 2016
a4aaf02
added IRef interface
revesansparole Aug 4, 2016
475e817
added openalea.provenance as requirement
revesansparole Aug 4, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions .pkglts/pkg_cfg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@
},
"base": {
"authors": [
[
"openalea",
"openalea@inria.fr"
],
[
"Christophe Pradal",
"christophe dot pradal at cirad dot fr"
Expand All @@ -36,7 +32,7 @@
]
},
"github": {
"owner": "{{ base.authors[0][0] }}",
"owner": "openalea",
"project": "{{ base.pkgname }}",
"url": "https://github.com/{{ github.owner }}/{{ github.project }}"
},
Expand All @@ -50,7 +46,7 @@
"intended_versions": [
"27"
],
"require": [["git", "openalea/deploy"]]
"require": [["git", "openalea/deploy"], ["git", "openalea/provenance"]]
},
"readthedocs": {
"project": "openalea-core"
Expand Down
10 changes: 5 additions & 5 deletions .pkglts/pkg_hash.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
"travis": "p39laCS5PHN7gbwAtgU28Z+UXHRifGIORlali3ZkK7OQKjjRhn1Dbwscp76SZeocjKUEBtl3fI1857Ri37wPWQ==",
"travis.addons": "z4PhNX7vuL3xVChQ1m2AB9Yg5AULVxXcg/SpIdNs6c5H0NE8XYXysP+DGNKHfuwvY7kxvUdBeoGlODJ6+SfaPg==",
"travis.after": "z4PhNX7vuL3xVChQ1m2AB9Yg5AULVxXcg/SpIdNs6c5H0NE8XYXysP+DGNKHfuwvY7kxvUdBeoGlODJ6+SfaPg==",
"travis.install": "CwigKKORJdg9WEl3DxAU095HFtme5Hwv7S2mH5Lgo0sUuwWuoSyhs+pBYWCzDXGyxZIcTPSIEY5/0PuaYqGR6Q==",
"travis.install": "Ay/BrD6JoeZi+JszHb0sHpFfzVEp9qaeFsWBBBJG0t2xwgF3tinQxifkNFwuJdlyCjy6U9k901dZnqt6yrzzxQ==",
"travis.script": "STjpu3u3YoOeTz4mBIflZ58OodPdFRPFtLt6c8CUciNwe/fYhCTxlKTMB/S7VL1ippUsQVIfrFGl+OQ/ALWmPQ=="
},
"AUTHORS.rst": {
"doc": "mr4dDvb808KCdcLSRWe9brxcIBamJp3DMpFzoEhHCeSLmr7Q0QfrNRZ79dnneEyWHgcs2srtibLIZlGOq1S0rQ=="
"doc": "HvXVe1vS1t/xzXuerP756vvyf3I4V8xEOqvNIEGejKpuzVRZr6wR4C24rm8O9OnBsYedYHvDxQRF25urtQCDMQ=="
},
"CONTRIBUTING.rst": {},
"HISTORY.rst": {},
Expand All @@ -32,7 +32,7 @@
"doc/_static/nonempty.txt": {},
"doc/authors.rst": {},
"doc/conf.py": {
"sphinx": "tTFNmgl+NIWu4UMwBw2aJyhQQDpiLrp/aYkMscpqFQWjeHO7YBU9ErwQX5XnRLMGZHCtBsweFcnlbzN2b0NsBg=="
"sphinx": "vfmn2Bw5s7XSpWirr5eXEjxifmpqNg4YCiNCojKEmRaCHDw3F/yzd6ghqanWEdjEkbs7Dn9Z9U3jdHBM6/j3oA=="
},
"doc/contributing.rst": {},
"doc/history.rst": {},
Expand All @@ -47,14 +47,14 @@
"pysetup": "XWPKeIfT2RoNPeDhPDgWWOssKAjkq/OXoEfIpSs8vJrYkPahRrEs1qXFvqxzqoV09MjmnVg0zrG9m/wRXfrRxw=="
},
"requirements.txt": {
"pysetup": "/5djJXLbrvuFk7LIgtfgYR8RnQrY5BEmOB4zEd0PrKeswR/8sQkzj4yKy7Zl3LAdRzYjPDhWiRkS1oMCG4FX7Q=="
"pysetup": "ROpjsUQMjMbn87UPzWB8XD7JnQAUNptjTBj99UwCmDUKNGQNqmlZD0gN+ukVdk4E87brwVEgqOZ47nid1EGpww=="
},
"setup.cfg": {
"pysetup": "QBedkKDNLW8WmznOFdyIyCL2sTDHYcmudSzjx+7QUcRI1vVxIHnNm82aiMvaMeEAYpOCr+8+Nj4ZTr9P0dSxSg=="
},
"setup.py": {
"pysetup.call": "2wHuP94SpWKZpqOzExkQGTxnhGPgBHK3qOdPn0Ncstj5FkZ7FBGGM/inqAXaI4QLKQtTNlOUYRGSkYUWAUcf1w==",
"pysetup.kwds": "2Wo8eNut4J6R97mY1RTBwstqt7yVHd/9KVgNH17IV7oOc5Wb1g8Vcpgm7H9sabVWjkN9V7QQYNNZEneBkTNddw=="
"pysetup.kwds": "dlgrvck1HbacSgA60B/51tvoA65q1tPJ/9ZWW0mrNh0uCq4ceY5GW2McnmDVal/PjP19xCfhoyUBuElz9HvuSA=="
},
"src/openalea/core/__init__.py": {
"base": "gR33dW0qqYmsV9NSNB+DD8XmuxnC2t0mKjnMoU5728qh97fSER6MbX+3QKxpZDLByZToaAay4xhx8acxketJmA=="
Expand Down
1 change: 1 addition & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ install:


- pip install git+https://github.com/openalea/deploy
- pip install git+https://github.com/openalea/provenance
- conda install coverage
- conda install mock
- conda install nose
Expand Down
1 change: 0 additions & 1 deletion AUTHORS.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ Development Lead

.. {# pkglts, doc

* openalea, <openalea@inria.fr>
* Christophe Pradal, <christophe dot pradal at cirad dot fr>
* Samuel Dufour-Kowalski, <dufourko at cirad dot fr>
* revesansparole, <revesansparole@gmail.com>
Expand Down
6 changes: 3 additions & 3 deletions doc/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@
latex_documents = [
('index', 'core.tex',
u'core Documentation',
u'openalea', 'manual'),
u'Christophe Pradal', 'manual'),
]

# The name of an image file (relative to this directory) to place at
Expand Down Expand Up @@ -278,7 +278,7 @@
man_pages = [
('index', 'core',
u'core Documentation',
[u'openalea'], 1)
[u'Christophe Pradal'], 1)
]

# If true, show URL addresses after external links.
Expand All @@ -293,7 +293,7 @@
texinfo_documents = [
('index', 'core',
u'core Documentation',
u'openalea',
u'Christophe Pradal',
'core',
'OpenAlea.Core is able to discover and manage packages and logical components, build and evaluate dataflows and Generate final applications',
'Miscellaneous'),
Expand Down
2 changes: 2 additions & 0 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
# edit .pkglts/pkg_cfg instead
# section pysetup

# openalea/deploy
# openalea/provenance

# #}

4 changes: 2 additions & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
version=version["__version__"],
description=short_descr,
long_description=readme + '\n\n' + history,
author="openalea, Christophe Pradal, Samuel Dufour-Kowalski, revesansparole, ",
author_email="openalea@inria.fr, christophe dot pradal at cirad dot fr, dufourko at cirad dot fr, revesansparole@gmail.com, ",
author="Christophe Pradal, Samuel Dufour-Kowalski, revesansparole, ",
author_email="christophe dot pradal at cirad dot fr, dufourko at cirad dot fr, revesansparole@gmail.com, ",
url='https://github.com/openalea/core',
license='cecill-c',
zip_safe=False,
Expand Down
Loading