Skip to content

Commit

Permalink
Solve the conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
pradal committed Feb 9, 2018
2 parents f58e917 + 0fe087c commit f871902
Show file tree
Hide file tree
Showing 21 changed files with 1,213 additions and 663 deletions.
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# {# pkglts, github
# {# pkglts, git
# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
Expand Down Expand Up @@ -80,7 +80,7 @@ target/

# svn
.svn

.cache/

# coverage
.coverage
Expand Down
94 changes: 53 additions & 41 deletions .pkglts/pkg_cfg.json
Original file line number Diff line number Diff line change
@@ -1,69 +1,81 @@
{
"_pkglts": {
"auto_install": true,
"install_front_end": "stdout",
"use_prompts": false,
"version": 3
},
"auto_install": true,
"install_front_end": "stdout",
"use_prompts": false,
"version": 11
},
"base": {
"authors": [
[
"openalea",
"openalea@inria.fr"
],
[
"Christophe Pradal",
"Christophe Pradal",
"christophe dot pradal at cirad dot fr"
],
],
[
"Samuel Dufour-Kowalski",
"Samuel Dufour-Kowalski",
"dufourko at cirad dot fr"
],
],
[
"revesansparole",
"revesansparole",
"revesansparole@gmail.com"
],
[
"Guillaume Baty",
""
]
],
"namespace": "openalea",
"pkgname": "core",
"url": null
},
"coverage": {},
],
"namespace": "openalea",
"namespace_method": "pkg_util",
"pkgname": "core",
"url": "https://github.com/openalea/core"
},
"coverage": {},
"doc": {
"description": "OpenAlea.Core is able to discover and manage packages and logical components, build and evaluate dataflows and Generate final applications",
"description": "OpenAlea.Core is able to discover and manage packages and logical components, build and evaluate dataflows and Generate final applications",
"fmt": "rst",
"keywords": [
"openalea"
]
},
],
"contributors": "OpenAlea",
"authors": "Christophe Pradal"
},
"git": {},
"github": {
"owner": "{{ base.authors[0][0] }}",
"project": "{{ base.pkgname }}",
"owner": "{{ base.authors[0][0] }}",
"project": "{{ base.pkgname }}",
"url": "https://github.com/{{ github.owner }}/{{ github.project }}"
},
},
"license": {
"name": "cecill-c",
"organization": "CIRAD/INRIA",
"project": "{{ base.pkgname }}",
"name": "cecill-c",
"organization": "CIRAD/INRIA",
"project": "{{ base.pkgname }}",
"year": 2015
},
},
"pysetup": {
"intended_versions": [
"27"
],
"require": [["git", "openalea/deploy"]]
},
],
"require": [
{
"name": "openalea/deploy",
"pkg_mng": "git"
}
]
},
"readthedocs": {
"project": "openalea-core"
},
},
"sphinx": {
"autodoc_dvlpt": true,
"autodoc_dvlpt": true,
"build_dir": "build/sphinx",
"theme": "default"
},
"test": {},
"travis": {},
},
"test": {
"suite_name": "pytest"
},
"version": {
"major": 1,
"minor": 4,
"post": 0
"major": 2,
"minor": 0,
"post": 2
}
}
80 changes: 40 additions & 40 deletions .pkglts/pkg_hash.json
Original file line number Diff line number Diff line change
@@ -1,66 +1,66 @@
{
".coveragerc": {
"coverage": "fJOlJPmBiCjF4ydI8eATEwZLJXAhQR/S/fMnVio8FMbz4iTTM+1JD+8J0wJ+Je7t0Fi7sY+cxlRjpumCigbtVg=="
},
},
".gitignore": {
"github": "wVVlsQPP65I5Gg6bW37JENFtYxO6Naq7x+mO0DaDGFVbMPk2o5QJ3DUwMoYfkOfou9lcR/6DC0MXr7hnrTWc9g=="
},
"git": "BajiufpLax6rf5dmemG7nvqJTLIyPShHtj2YTKyJ7vgPbEZrmsUMebpVX4WoruGBcRQwPOqS5fn5D/PjPmQErw=="
},
".travis.yml": {
"travis": "p39laCS5PHN7gbwAtgU28Z+UXHRifGIORlali3ZkK7OQKjjRhn1Dbwscp76SZeocjKUEBtl3fI1857Ri37wPWQ==",
"travis.addons": "z4PhNX7vuL3xVChQ1m2AB9Yg5AULVxXcg/SpIdNs6c5H0NE8XYXysP+DGNKHfuwvY7kxvUdBeoGlODJ6+SfaPg==",
"travis.after": "z4PhNX7vuL3xVChQ1m2AB9Yg5AULVxXcg/SpIdNs6c5H0NE8XYXysP+DGNKHfuwvY7kxvUdBeoGlODJ6+SfaPg==",
"travis.install": "CwigKKORJdg9WEl3DxAU095HFtme5Hwv7S2mH5Lgo0sUuwWuoSyhs+pBYWCzDXGyxZIcTPSIEY5/0PuaYqGR6Q==",
"travis.script": "STjpu3u3YoOeTz4mBIflZ58OodPdFRPFtLt6c8CUciNwe/fYhCTxlKTMB/S7VL1ippUsQVIfrFGl+OQ/ALWmPQ=="
},
"travis": "p39laCS5PHN7gbwAtgU28Z+UXHRifGIORlali3ZkK7OQKjjRhn1Dbwscp76SZeocjKUEBtl3fI1857Ri37wPWQ==",
"travis.addons": "z4PhNX7vuL3xVChQ1m2AB9Yg5AULVxXcg/SpIdNs6c5H0NE8XYXysP+DGNKHfuwvY7kxvUdBeoGlODJ6+SfaPg==",
"travis.after": "z4PhNX7vuL3xVChQ1m2AB9Yg5AULVxXcg/SpIdNs6c5H0NE8XYXysP+DGNKHfuwvY7kxvUdBeoGlODJ6+SfaPg==",
"travis.install": "uieq8tZxbKnpbCZFJeBMPIUo7cheWgDZyiVg50+CQR2yN9/eejR+Go6jNh+0S89LtB5LgmlQ0Ao3KTB3xaN8Xg==",
"travis.script": "DuMVu20DK3x0WVdVZxihdiYnEkfDqmOlMUuCHohyYvi4fv3Ew8OeAca6AdKM/ZCSZvVS9tywx+PhPrmDexl6hg=="
},
"AUTHORS.rst": {
"doc": "mr4dDvb808KCdcLSRWe9brxcIBamJp3DMpFzoEhHCeSLmr7Q0QfrNRZ79dnneEyWHgcs2srtibLIZlGOq1S0rQ=="
},
"CONTRIBUTING.rst": {},
"HISTORY.rst": {},
},
"CONTRIBUTING.rst": {},
"HISTORY.rst": {},
"LICENSE": {
"license": "21ExMhSzB2uXQuU1VoH7++nrb4u6TbesqGtJDpM39OLPWft9SJ2tJ956R6foYmkI9VuJay7SUrhFLPxxMEHLxg=="
},
},
"MANIFEST.in": {
"pysetup": "vzgcfdwg7fafu0G3HEmFsZnC8jB8sa4zeSFQ2ReZO+pUfGeynOcw4+CIzP/ZV7n5nmpGGI7xqcdcPtOFfoivdQ=="
},
},
"README.rst": {
"doc": "324FZvzs5aJAtcREXT4nIIv/zjrfc0EZj+qjxyrZ9EP+UXQERzKyDx+4u1FDMMfzP2WJhOkPf9QQXzV4T+92GA=="
},
"doc": "TgYu4NHXwUZvrQ1Qz0L2XXLNIO5XdbfOzfd9SLpaFYHkcByYGk0nzosJrGveh1tzoGHf8mHbIh3j4hJuZA1YAQ=="
},
"doc/Makefile": {
"sphinx": "C58jxdu8XJNOoaWOw7VWy4LwFmS8lTQt/JeZLt5JozMSJ503plOZchucx+vAEzELbx/Czs/h9pshe9s+9HeOeQ=="
},
"doc/_static/nonempty.txt": {},
"doc/authors.rst": {},
},
"doc/_static/nonempty.txt": {},
"doc/authors.rst": {},
"doc/conf.py": {
"sphinx": "tTFNmgl+NIWu4UMwBw2aJyhQQDpiLrp/aYkMscpqFQWjeHO7YBU9ErwQX5XnRLMGZHCtBsweFcnlbzN2b0NsBg=="
},
"doc/contributing.rst": {},
"doc/history.rst": {},
"doc/index.rst": {},
"doc/installation.rst": {},
"sphinx": "2tQ8D7EDdBCKug4c/mp+T6BWPLejyfJxv7mvT+e+YeHWxWEf+x3rqpFdHax/2g7Kx6mFSJJjD4OZtD3SFQ0sug=="
},
"doc/contributing.rst": {},
"doc/history.rst": {},
"doc/index.rst": {},
"doc/installation.rst": {},
"doc/make.bat": {
"sphinx": "oA67PK7JSR3w9u1V0gOXFZAb8qgfgUJ0wQ46cVXu7M3iJyAbLf76WkEqw6Y1r5Q6EvHAogcjmImdGsOpiYZ22g=="
},
"doc/readme.rst": {},
"doc/usage.rst": {},
},
"doc/readme.rst": {},
"doc/usage.rst": {},
"dvlpt_requirements.txt": {
"pysetup": "XWPKeIfT2RoNPeDhPDgWWOssKAjkq/OXoEfIpSs8vJrYkPahRrEs1qXFvqxzqoV09MjmnVg0zrG9m/wRXfrRxw=="
},
"pysetup": "ONHd7KJUHI6bXimIhJ5wQNBLkFxjrrx8QaUiAWX5VuehOEm8oScMVo6MBE1ir0kydnZQMPfVfE2xEsCIx0OQKA=="
},
"requirements.txt": {
"pysetup": "/5djJXLbrvuFk7LIgtfgYR8RnQrY5BEmOB4zEd0PrKeswR/8sQkzj4yKy7Zl3LAdRzYjPDhWiRkS1oMCG4FX7Q=="
},
"pysetup": "Wv2Gn+Cy4Ukfy3XXDV3p9fubX0FVqMuS8E22TTvSMcFdhxdVqQIZP6vTgFVAFbdZ4MDsP9xN7IVXQr177j00hQ=="
},
"setup.cfg": {
"pysetup": "QBedkKDNLW8WmznOFdyIyCL2sTDHYcmudSzjx+7QUcRI1vVxIHnNm82aiMvaMeEAYpOCr+8+Nj4ZTr9P0dSxSg=="
},
"pysetup": "60E8EHReCNkZG5fVvzln5jA58snyNhSP2LiCl0ngVMVo9R1qT6G/JRnGQpx8+c6trba9O5teM0eZ4PUNXh/QEw=="
},
"setup.py": {
"pysetup.call": "2wHuP94SpWKZpqOzExkQGTxnhGPgBHK3qOdPn0Ncstj5FkZ7FBGGM/inqAXaI4QLKQtTNlOUYRGSkYUWAUcf1w==",
"pysetup.kwds": "2Wo8eNut4J6R97mY1RTBwstqt7yVHd/9KVgNH17IV7oOc5Wb1g8Vcpgm7H9sabVWjkN9V7QQYNNZEneBkTNddw=="
},
"pysetup.call": "2wHuP94SpWKZpqOzExkQGTxnhGPgBHK3qOdPn0Ncstj5FkZ7FBGGM/inqAXaI4QLKQtTNlOUYRGSkYUWAUcf1w==",
"pysetup.kwds": "lvC2rA9j9gbWQdPVGNGAhw6qs2S8QktXHUGLpZ4GhykYRbGFqqlC9B9Wdzktgqspie28hxjP+yCQorsxi38PUg=="
},
"src/openalea/core/__init__.py": {
"base": "gR33dW0qqYmsV9NSNB+DD8XmuxnC2t0mKjnMoU5728qh97fSER6MbX+3QKxpZDLByZToaAay4xhx8acxketJmA=="
},
},
"src/openalea/core/version.py": {
"version": "uGFlizzcSxlY4JEVKPFfVPXszFKJiUw9c8Qi6ykA2LAe63uOU3NiKVlpwCmmmHHR+TSxwUnoSGLg+QuZ5yV//g=="
},
"version": "xMbInCdDTk9EH4B/UZg9ywcImWAvphx9GNRPd1pqfQuDuBxOkF60Y3if3LGty+BFNAXheBp782+M8vMWyY2Uqw=="
},
"test/__init__.py": {}
}
5 changes: 0 additions & 5 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,6 @@ openalea.core
:alt: Documentation status
:target: https://openalea-core.readthedocs.io/en/latest/?badge=latest


.. image:: https://travis-ci.org/openalea/core.svg?branch=master
:alt: Travis build status
:target: https://travis-ci.org/openalea/core

.. #}
OpenAlea.Core is able to discover and manage packages and logical components, build and evaluate dataflows and Generate final applications
Expand Down
38 changes: 38 additions & 0 deletions conda/meta.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{% set version = "2.0.1" %}

package:
name: openalea.core
version: {{ version }}

source:
path: ..

build:
preserve_egg_dir: True
number: 1
script: python setup.py install --prefix=$PREFIX

requirements:
build:
- openalea.deploy #==2.0.0
run:
- python
- ipykernel

test:
imports:
- openalea.core
requires:
- nose
source_files:
- test/
- test/*.py

commands:
- nosetests -v -I test_compositenode.py -I test_alias.py -I test_data.py -I test_eval.py -I test_package.py

about:
home: http://github.com/openalea/core
license: Cecill-c License
summary: OpenAlea Core component and Scientific Workflow platform.

40 changes: 17 additions & 23 deletions doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
#
# Package (Undefined, u'core') documentation build configuration file, created by
# Package core documentation build configuration file, created by
# sphinx-quickstart on Tue Jul 9 22:26:36 2013.
#
# This file is execfile()d with the current directory set to its
Expand Down Expand Up @@ -247,7 +247,11 @@
latex_documents = [
('index', 'core.tex',
u'core Documentation',
<<<<<<< HEAD
u'openalea', 'manual'),
=======
u'Christophe Pradal', 'manual'),
>>>>>>> 0fe087c31d10150c3297017c390524ff944d0de8
]

# The name of an image file (relative to this directory) to place at
Expand Down Expand Up @@ -278,7 +282,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 +297,11 @@
texinfo_documents = [
('index', 'core',
u'core Documentation',
<<<<<<< HEAD
u'openalea',
=======
u'Christophe Pradal',
>>>>>>> 0fe087c31d10150c3297017c390524ff944d0de8
'core',
'OpenAlea.Core is able to discover and manage packages and logical components, build and evaluate dataflows and Generate final applications',
'Miscellaneous'),
Expand All @@ -315,30 +323,16 @@
# use apidoc to generate developer doc
import os
from os import path
from sphinx.apidoc import create_modules_toc_file, recurse_tree


class Opt(object):
pass
from sphinx.apidoc import main


rootpath = path.abspath(path.join(project_root, "src"))
opts = Opt()
opts.modulefirst = None
opts.separatemodules = None
opts.noheadings = None
opts.destdir = path.abspath(path.join(project_root, "doc", "_dvlpt"))
opts.suffix = source_suffix[1:]
opts.dryrun = None
opts.force = None
opts.header = 'src'
opts.maxdepth = 4
opts.includeprivate = False

if not path.isdir(opts.destdir):
os.makedirs(opts.destdir)

modules = recurse_tree(rootpath, [], opts)
create_modules_toc_file(modules, opts)
destdir = path.abspath(path.join(project_root, "doc", "_dvlpt"))

if not path.isdir(destdir):
os.makedirs(destdir)

main(['-e', '-o', destdir, '-d', '4', '-s', source_suffix[1:], '--force', rootpath])

# #}
9 changes: 5 additions & 4 deletions dvlpt_requirements.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
# {# pkglts, pysetup
coverage
mock
nose
sphinx
coverage # pip install coverage
pytest # pip install pytest
pytest-cov # pip install pytest-cov
pytest-mock # pip install pytest-mock
sphinx # pip install sphinx

# #}
1 change: 1 addition & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
# edit .pkglts/pkg_cfg instead
# section pysetup

#openalea/deploy # pip install git+git

# #}

Loading

0 comments on commit f871902

Please sign in to comment.