Moving Visualea to Python 3 / Qt5 or Qt6

.gitignore

@@ -0,0 +1,71 @@
+# Python files
+*.py[cod]
+
+# C extensions
+*.so
+*.dll
+*.dylib
+
+# Compiled Static libraries
+*.lai
+*.la
+*.a
+
+# Compiled Object files
+*.os
+
+# Packages
+*.egg
+*.egg-info
+dist
+build
+build-scons
+eggs
+.eggs
+parts
+bin
+var
+sdist
+develop-eggs
+.installed.cfg
+lib
+lib64
+__pycache__
+*.pth
+*.bak
+
+# Installer logs
+pip-log.txt
+.amlog
+.sconsign.dblite
+
+# Unit test / coverage reports
+.coverage
+.tox
+nosetests.xml
+
+# Designer files
+*visualea/src/visualea/ui_*
+
+# Translations
+*.mo
+
+# Vim files
+*.swp
+*.*~
+
+# Mr Developer
+.mr.developer.cfg
+.project
+.pydevproject
+.settings
+.idea
+
+# svn
+.svn
+
+# temporary files
+*._icon.png
+
+# Mac dirs
+.DS_Store

conda/meta.yaml

@@ -1,31 +1,32 @@
-{% set version = "2.0.1" %}
+{% set data = load_setup_py_data() %}
 
 package:
   name: openalea.grapheditor
-  version: {{ version }}
+  version: {{ data.get('version') }}
 
 source:
   path: ..
 
 build:
+  noarch: python
   preserve_egg_dir: True
   number: 0
-  script: python setup.py install --prefix=$PREFIX
+  script: {{PYTHON}} setup.py install 
 
 requirements:
   build:
     - openalea.deploy
   run:
     - openalea.deploy
     - openalea.core
-    - openalea.vpltk
+    - qtpy
 
 test:
   imports:
     - openalea.grapheditor
 
 about:
-  home: http://github.com/openalea/visualea
+  home: {{ data.get('url') }}
   license: Cecill-c License
-  summary: GraphEditor package for OpenAlea.
+  summary: {{ data.get('description') }}
 

examples/networkx/conf.py

@@ -37,8 +37,8 @@
 master_doc = 'index'
 
 # General information about the project.
-project = u'NetworkX GraphEditor Strategy'
-copyright = u'2010, Daniel Barbeau'
+project = 'NetworkX GraphEditor Strategy'
+copyright = '2010, Daniel Barbeau'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -172,8 +172,8 @@
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
-  ('index', 'NetworkXGraphEditorStrategy.tex', u'NetworkX GraphEditor Strategy Documentation',
-   u'Daniel Barbeau', 'manual'),
+  ('index', 'NetworkXGraphEditorStrategy.tex', 'NetworkX GraphEditor Strategy Documentation',
+   'Daniel Barbeau', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of

examples/networkx/__init__.py → examples/networkx/nx_app.py

@@ -7,10 +7,15 @@
 them.
 """
 
+import weakref
 import networkx as nx
+
+from functools import cmp_to_key
+
 from openalea.grapheditor.all import  Observed, GraphAdapterBase
-import weakref
 
+def cmp(a, b):
+    return (id(a) > id(b)) - (id(a) < id(b))
 
 class NxObservedVertex(Observed):
 
@@ -23,18 +28,18 @@ def notify_position(self, pos):
         self.notify_listeners(("metadata_changed", "position", pos))
 
     def notify_update(self, **kwargs):
-        for k, v in kwargs.iteritems():
+        for k, v in kwargs.items():
             self.notify_listeners(("metadata_changed", k, v))
 
-        pos = self.g().node[self]["position"]
+        pos = self.g().nodes[self]["position"]
         self.notify_position(pos)
 
     def __setitem__(self, key, value):
-        self.g().node[self][key] = value
+        self.g().nodes[self][key] = value
         self.notify_update()
 
     def __getitem__(self, key):
-        return self.g().node[self][key]
+        return self.g().nodes[self][key]
 
 class NXObservedGraph( GraphAdapterBase, Observed ):
     """An adapter to networkx.Graph"""
@@ -55,7 +60,7 @@ def add_vertex(self, vertex, **kwargs):
             if "position" not in kwargs : 
                 kwargs["position"] = [0., 0.]
             else:
-                kwargs["position"] = map(float, kwargs["position"])
+                kwargs["position"] = list(map(float, kwargs["position"]))
             if "color" not in kwargs :
                 kwargs["color"] = QtGui.QColor(0, 0, 0)
 
@@ -71,7 +76,7 @@ def remove_vertex(self, vertex):
 
     def add_edge(self, src_vertex, tgt_vertex, **kwargs):
         edge = [src_vertex, tgt_vertex]
-        edge.sort(lambda x, y: cmp(id(x), id(y)))
+        edge.sort(key=cmp_to_key(cmp))
         edge = tuple(edge)
         if self.graph.has_edge(*edge):
             return
@@ -81,7 +86,7 @@ def add_edge(self, src_vertex, tgt_vertex, **kwargs):
 
     def remove_edge(self, src_vertex, tgt_vertex):
         edge =  [src_vertex, tgt_vertex]
-        edge.sort(lambda x, y: cmp(id(x), id(y)))
+        edge.sort(key=cmp_to_key(cmp))
         edge = tuple(edge)
         self.graph.remove_edge(edge[0], edge[1])
         self.notify_listeners(("edge_removed", ("default",edge)))
@@ -92,17 +97,17 @@ def remove_edges(self, edges):
     # -- not in the adapter interface (yet): --
     def set_vertex_data(self, vertex, **kwargs):
         if vertex in self.graph:
-            for k, v in kwargs.iteritems():
-                self.graph.node[vertex][k]=v
+            for k, v in kwargs.items():
+                self.graph.nodes[vertex][k]=v
 
     def set_edge_data(self, edge_proxy, **kwargs):
-        #nothing right now"
+        #nothing right now
         pass
 
 #------------------------
 # -- the graph qt view --
 #------------------------
-from PyQt4 import QtGui, QtCore
+from qtpy import QtGui, QtCore, QtWidgets
 from openalea.grapheditor.qt import (Vertex, View, mixin_method,
                                      QtGraphStrategyMaker,
                                      DefaultGraphicalEdge,
@@ -112,16 +117,16 @@ def set_edge_data(self, edge_proxy, **kwargs):
 
 class GraphicalNode( DefaultGraphicalVertex ):
     def initialise_from_model(self):
-        self.setPos(QtCore.QPointF(*self.graph().graph.node[self.vertex()]["position"]))
-        color = self.graph().graph.node[self.vertex()]["color"]
+        self.setPos(QtCore.QPointF(*self.graph().graph.nodes[self.vertex()]["position"]))
+        color = self.graph().graph.nodes[self.vertex()]["color"]
         brush = QtGui.QBrush(color)
         self.setBrush(brush)
 
     def store_view_data(self, **kwargs):
         self.graph().set_vertex_data(self.vertex(), **kwargs)
 
     def get_view_data(self, key):
-        return self.graph().graph.node[self.vertex()][key]
+        return self.graph().graph.nodes[self.vertex()][key]
 
 class GraphicalView( View ):
     def __init__(self, parent):
@@ -157,10 +162,10 @@ def removeElement(self, event):
                                                           "floating-default":DefaultGraphicalFloatingEdge} )
 
 #THE APPLICATION'S MAIN WINDOW
-class MainWindow(QtGui.QMainWindow):
+class MainWindow(QtWidgets.QMainWindow):
     def __init__(self, parent=None):
         """                """
-        QtGui.QMainWindow.__init__(self, parent)
+        QtWidgets.QMainWindow.__init__(self, parent)
 
         self.setMinimumSize(800,600)
 
@@ -181,9 +186,9 @@ def __init__(self, parent=None):
 
 if __name__=="__main__":
 
-    instance = QtGui.QApplication.instance()
+    instance = QtWidgets.QApplication.instance()
     if instance is None :
-        app = QtGui.QApplication([])
+        app = QtWidgets.QApplication([])
     else :
         app = instance
 

setup.py

@@ -6,11 +6,20 @@
 
 from setuptools import setup, find_packages
 
-from openalea.deploy.metainfo import read_metainfo
+name = "OpenAlea.GraphEditor"
+description= "GraphEditor package for OpenAlea."
+long_description= "An generic GGUI API for viewing and interacting with various sorts of graphs."
+authors = "Daniel Barbeau, Christophe Pradal"
+authors_email = "[email protected]"
+url = "https://github.com/openalea/grapheditor"
+license = "Cecill-C"
 
-metadata = read_metainfo('metainfo.ini', verbose=True)
-for key,value in metadata.iteritems():
-    exec("%s = '%s'" % (key, value))
+
+# find version number in src/openalea/core/version.py
+_version = {}
+with open("src/openalea/core/version.py") as fp:
+    exec(fp.read(), _version)
+    version = _version["__version__"]
 
 namespace = 'openalea'
 packages=find_packages('src')
@@ -19,7 +28,7 @@
 setup_requires = ['openalea.deploy']
 install_requires = []
 # web sites where to find eggs
-dependency_links = ['http://openalea.gforge.inria.fr/pi']
+dependency_links = []
 
 # setup function call
 #
@@ -40,8 +49,8 @@
     package_dir= package_dir,
 
     # Namespace packages creation by deploy
-    namespace_packages=[namespace],
-    create_namespaces=True,
+    #namespace_packages=[namespace],
+    #create_namespaces=True,
 
     zip_safe=False,