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

Update version and dependencies (openalea.plantgl vs vplants.plantgl) #8

Merged
merged 2 commits into from
Jan 29, 2018
Merged

Update version and dependencies (openalea.plantgl vs vplants.plantgl) #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f80b91b
Update version and dependencies (openalea.plantgl vs vplants.plantgl)
pradal Jan 29, 2018
f1a8fc9
Fix unremoved reference to vplants.plantgl. Replace by openlea.plantgl
pradal Jan 29, 2018
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: 4 additions & 4 deletions conda/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ about:

build:
preserve_egg_dir: True
number: 0
number: 1

requirements:
build:
Expand All @@ -22,11 +22,11 @@ requirements:
- openalea.deploy
- scons
- openalea.sconsx
- vplants.plantgl
- openalea.plantgl
- qt ==4.8.6 [osx]
- qt <5 [not osx]
run:
- vplants.plantgl
- openalea.plantgl

test:
requires:
Expand All @@ -36,4 +36,4 @@ test:
source_files:
- test/
commands:
- nosetests -v -I test_predecessor_at_scale.py -I test_ui.py
- nosetests -v -I test_predecessor_at_scale.py -I test_ui.py
4 changes: 2 additions & 2 deletions metainfo.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

[metainfo]
version = 2.4.0
release = 2.4
version = 2.7.0
release = 2.7
project = vplants
package = lpy
name = VPlants.Lpy
Expand Down
18 changes: 10 additions & 8 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
wralea_name= namespace + '.' + package + '_wralea'


meta_version = version
meta_version = version
# check that meta version is updated
f = pj(os.path.dirname(__file__),'src', 'openalea', 'lpy','__version__.py')
d = {}
Expand All @@ -38,10 +38,12 @@
from setuptools import setup
from openalea.deploy.binary_deps import binary_deps

install_requires = [binary_deps('vplants.plantgl')]
# Do not use eggs to build lpy anymore.
# install_requires = [binary_deps('vplants.plantgl')]
#if 'linux' not in sys.platform:
# install_requires.append('PyOpenGL')
# install_requires.append('pyqglviewer')
install_requires = []

setup(
name=name,
Expand All @@ -52,19 +54,19 @@
author_email=authors_email,
url=url,
license=license,

scons_scripts = ['SConstruct'],

namespace_packages = [namespace],
create_namespaces = False,

# pure python packages
packages = [ pkg_name, pkg_name+'.gui',pkg_name+'.gui.plugins', pkg_name+'.cpfg_compat', wralea_name ],
py_modules = ['lpygui_postinstall'],

# python packages directory
package_dir = { '' : 'src',},

# Add package platform libraries if any
include_package_data = True,
package_data = {'' : ['*.pyd', '*.so', '*.dylib', '*.lpy','*.ui','*.qrc'],},
Expand All @@ -83,9 +85,9 @@
'gui_scripts': ['lpy = openalea.lpy.gui.lpystudio:main',],
'console_scripts': ['cpfg2lpy = openalea.lpy.cpfg_compat.cpfg2lpy:main',],
},

postinstall_scripts = ['lpygui_postinstall'],

# Dependencies
setup_requires = ['openalea.deploy'],
dependency_links = ['http://openalea.gforge.inria.fr/pi'],
Expand Down