Mentions légales du service

Skip to content
Snippets Groups Projects
Commit 01c26e4a authored by AZAIS Romain's avatar AZAIS Romain
Browse files

Merge branch 'release/1.6.2'

parents 2cc4fe90 46df286a
No related branches found
No related tags found
No related merge requests found
Pipeline #96099 passed
......@@ -47,6 +47,6 @@
"version": {
"major": 1,
"minor": 6,
"post": 1
"post": 2
}
}
\ No newline at end of file
......@@ -41,12 +41,12 @@
},
"setup.py": {
"pysetup.call": "t30iIuCMd/sWxStR2XNYb8bCBgwanhKt8YYn2VKACyAqL5cKFRUWpVRIpAR+uxXUZ9PYYy2csMmECcONnRZE8w==",
"pysetup.kwds": "cvDQ2kh9HkdAUPomT/GP7pBzXQZ5oVP5APRS2XMecHkpk7m3H1OMb+PtKzS0KBg5MW7UBvXfYx8A3xckMK4fyQ=="
"pysetup.kwds": "89OdW7QrF0NJib52kpdfp0pdqK/C9RGH0L1Z4rvItl+pc05qs83nJr5spYOO7a3B0UizagV6MQm9sWsJ45am4w=="
},
"src/treex/__init__.py": {
"base": "+GVGxVjJGifAp8dAR9V2W3aVPe7/D53bN7r0O5VxO9OUqG4vnGTZvnORu1objjjIwm86DgemQd7ax/IJpRa8Wg=="
},
"src/treex/version.py": {
"version": "2xXCy5Pgfhj7HIKzCj2c0rwYbcvqI1HB0TCIoZNay9UfeYVcTG/lVADbhD1tIlD6f2OqWvq/XCeI4r/nvNlSRg=="
"version": "lqZ3pvBTKrUtGZASkqBMGABjxuRVzm0FKb57GAF7DpkFKk8zIaZLOwh1F9/YEcMbrbG0EjyQ6aqyBLbGqHfeKw=="
}
}
\ No newline at end of file
......@@ -7,7 +7,7 @@ Development Lead
.. {# pkglts, doc.authors
* Romain Azais, <romain.azais@inria.fr>
* Romain Azais <romain.azais@inria.fr>
.. #}
......@@ -18,7 +18,7 @@ Contributors
.. #}
* Guillaume Cerutti, <guillaume.cerutti@inria.fr>
* Didier Gemmerle, <didier.gemmerle@univ-lorraine.fr>
* Florian Ingels, <florian.ingels@inria.fr>
* Guillaume Cerutti <guillaume.cerutti@inria.fr>
* Didier Gemmerle <didier.gemmerle@univ-lorraine.fr>
* Florian Ingels <florian.ingels@inria.fr>
* Farah Ben Naoum <farahbennaoum@yahoo.fr>
\ No newline at end of file
......@@ -11,7 +11,7 @@ The trees can be ordered or not, with or without labels on their vertices.
:Coordination: Romain Azais
:Contributors: Guillaume Cerutti, Didier Gemmerle, Florian Ingels
:Contributors: Guillaume Cerutti, Didier Gemmerle, Florian Ingels, Farah Ben Naoum
:Team: Inria team MOSAIC
......@@ -46,6 +46,7 @@ Requirements
* NetworkX: https://networkx.github.io/
* NumPy: http://www.numpy.org/
* matplotlib: https://matplotlib.org/
* lxml: https://lxml.de/
************************
Install
......@@ -120,7 +121,7 @@ Create a new environment for treex
- networkx
- matplotlib
- scikit-learn
- pandas
- lxml
- jupyter
- qtconsole
- nose
......
......@@ -95,9 +95,9 @@ copyright = u"2019, treex"
#
# The short X.Y version.
version = "1.6.1"
version = "1.6.2"
# The full version, including alpha/beta/rc tags.
release = "1.6.1"
release = "1.6.2"
# The language for content autogenerated by Sphinx. Refer to documentation
......
......@@ -18,7 +18,7 @@ pkgs = find_packages('src')
setup_kwds = dict(
name='treex',
version="1.6.1",
version="1.6.2",
description=short_descr,
long_description=readme + '\n\n' + history,
author="Romain Azais",
......
......@@ -8,23 +8,19 @@ __version__ = version.__version__
from treex.tree import *
from treex.dag import *
from treex.simulation import *
from treex.toptree import *
from treex.visualization import *
from treex.selfnestedness import *
from treex.edit_distance import *
from treex.simulation import *
from treex.converters import *
from treex.save import *
from treex.visualization import *
from treex.toptree import *
from treex.doublychainedtree import *
from treex.coding_process import *
from treex.converters import *
from treex.edit_distance import *
from treex.kernels import *
from treex.coding_process import *
from treex.selfnestedness import *
from treex.galton_watson import *
from treex.enumeration import *
\ No newline at end of file
......@@ -11,7 +11,7 @@ MAJOR = 1
MINOR = 6
"""(int) Version minor component."""
POST = 1
POST = 2
"""(int) Version post or bugfix component."""
__version__ = ".".join([str(s) for s in (MAJOR, MINOR, POST)])
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment