diff --git a/.gitignore b/.gitignore index a5346fffdf76d7e214e6a58686f518ba069f42e6..cc53efad33c4618a2d89ea837e94cab2822d8fb0 100644 --- a/.gitignore +++ b/.gitignore @@ -86,3 +86,4 @@ MANIFEST scikit_gilearn.egg-info/ scikit_splearn.egg-info/* .idea/ +*.tar.gz diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000000000000000000000000000000000000..fd56bbf8ae66b6d594bba8b57685c1ead4f7cbe2 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,19 @@ +# CI Config for splearn / gitlab + +# Tests on ubuntu 17.10 +unbutu:17.10: + image: registry.gitlab.lis-lab.fr:5005/dev/scikit-splearn + tags: + - docker + script: + - pip3 install -e . + - nosetests + - python3 setup.py build_sphinx + - cp -r build/sphinx/html/* public/ + artifacts: + when: always + untracked: true + paths: + - build_python + expire_in: 8d + diff --git a/HISTORY.rst b/HISTORY.rst index dd6b0a5a221cc9990419f5916cdebcad04da19e3..ff4829ed61bb4f82ac2218aec272a831ece54c7d 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -9,4 +9,10 @@ First version 1.0.1 (2016-10-07) ------------------ -Bug setup correction \ No newline at end of file +Bug setup correction + +1.1.0 (2018-15-02) +------------------ +Adding IO functions +Rebase +Dot display method \ No newline at end of file diff --git a/docker/Dockerfile b/docker/Dockerfile new file mode 100644 index 0000000000000000000000000000000000000000..45a277be457331471ef1582be90e6b294fa11ace --- /dev/null +++ b/docker/Dockerfile @@ -0,0 +1,18 @@ +FROM ubuntu:latest +MAINTAINER Denis Arrivault +WORKDIR / +RUN apt-get update && apt-get install -y \ + python3 \ + python3-pip \ + python3-scipy \ + graphviz-dev +RUN pip3 install --upgrade pip +RUN pip3 install nose coverage sphinx sphinxcontrib-bibtex + +# Copy the scikit-splearn sdist in the docker directory and uncomment the following line +# if you want to include grackelpy sources in the docker image : +# ADD scikit-splearn-1.1.0.tar.gz / + + +# cleanup +RUN apt-get -qy autoremove diff --git a/setup.py b/setup.py index cbb1d501ea1f1c16a62f537e621ffe376d0a187f..01b12d9dc2ce131e256c6eeb1f815ec89315e9e7 100755 --- a/setup.py +++ b/setup.py @@ -1,5 +1,39 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- +# ######### COPYRIGHT ######### +# +# Copyright(c) 2016-2018 +# ----------------- +# +# * LabEx Archimède: http://labex-archimede.univ-amu.fr/ +# * Laboratoire d'Informatique et Systèmes : http://www.lis-lab.fr/ +# +# Contributors: +# ------------ +# +# * François Denis <francois.denis_AT_lis-lab.fr> +# * Rémi Eyraud <remi.eyraud_AT_lis-lab.fr> +# * Denis Arrivault <contact.dev_AT_lis-lab.fr> +# * Dominique Benielli <dominique.benielli_AT_univ-amu.fr> +# +# Description: +# ----------- +# +# scitkit-splearn is a toolbox in +# python for spectral learning algorithms. +# +# Version: +# ------- +# +# * splearn version = 1.1.0 +# +# Licence: +# ------- +# +# License: 3-clause BSD +# +# +# ######### COPYRIGHT ######### from __future__ import print_function import os @@ -93,7 +127,7 @@ class m_sdist(sdist): ########################## def read(*paths): """Build a file path from *paths* and return the contents.""" - with open(os.path.join(*paths), 'r') as f: + with open(os.path.join(*paths), 'r', encoding='utf-8') as f: return f.read() diff --git a/splearn/automaton.py b/splearn/automaton.py index 9a980d7b9f74a1b0fe10d43a8903a51a35dd36bf..2d007e3f6a0746b1225b6bb54c4d3d30bf5c6c07 100644 --- a/splearn/automaton.py +++ b/splearn/automaton.py @@ -1,4 +1,38 @@ # -*- coding: utf-8 -*- +# ######### COPYRIGHT ######### +# +# Copyright(c) 2016-2018 +# ----------------- +# +# * LabEx Archimède: http://labex-archimede.univ-amu.fr/ +# * Laboratoire d'Informatique et Systèmes : http://www.lis-lab.fr/ +# +# Contributors: +# ------------ +# +# * François Denis <francois.denis_AT_lis-lab.fr> +# * Rémi Eyraud <remi.eyraud_AT_lis-lab.fr> +# * Denis Arrivault <contact.dev_AT_lis-lab.fr> +# * Dominique Benielli <dominique.benielli_AT_univ-amu.fr> +# +# Description: +# ----------- +# +# scitkit-splearn is a toolbox in +# python for spectral learning algorithms. +# +# Version: +# ------- +# +# * splearn version = 1.1.0 +# +# Licence: +# ------- +# +# License: 3-clause BSD +# +# +# ######### COPYRIGHT ######### """This module contains the Automaton class """ diff --git a/splearn/datasets/data_sample.py b/splearn/datasets/data_sample.py index 26746e337a053640020e05bdc2498aa655829911..3122630e07138773178dcb3f6ee76fca2a19041b 100644 --- a/splearn/datasets/data_sample.py +++ b/splearn/datasets/data_sample.py @@ -1,4 +1,38 @@ # -*- coding: utf-8 -*- +# ######### COPYRIGHT ######### +# +# Copyright(c) 2016-2018 +# ----------------- +# +# * LabEx Archimède: http://labex-archimede.univ-amu.fr/ +# * Laboratoire d'Informatique et Systèmes : http://www.lis-lab.fr/ +# +# Contributors: +# ------------ +# +# * François Denis <francois.denis_AT_lis-lab.fr> +# * Rémi Eyraud <remi.eyraud_AT_lis-lab.fr> +# * Denis Arrivault <contact.dev_AT_lis-lab.fr> +# * Dominique Benielli <dominique.benielli_AT_univ-amu.fr> +# +# Description: +# ----------- +# +# scitkit-splearn is a toolbox in +# python for spectral learning algorithms. +# +# Version: +# ------- +# +# * splearn version = 1.1.0 +# +# Licence: +# ------- +# +# License: 3-clause BSD +# +# +# ######### COPYRIGHT ######### """This module contains the DataSample class and Splearn_array class The DataSample class encapsulates a sample 's components nbL and nbEx numbers, diff --git a/splearn/hankel.py b/splearn/hankel.py index d91ff7220854c622f06f92c8a0e18594902c5431..f239f698a225929c6c497fbf7911b172c30b3a0b 100644 --- a/splearn/hankel.py +++ b/splearn/hankel.py @@ -1,4 +1,38 @@ # -*- coding: utf-8 -*- +# ######### COPYRIGHT ######### +# +# Copyright(c) 2016-2018 +# ----------------- +# +# * LabEx Archimède: http://labex-archimede.univ-amu.fr/ +# * Laboratoire d'Informatique et Systèmes : http://www.lis-lab.fr/ +# +# Contributors: +# ------------ +# +# * François Denis <francois.denis_AT_lis-lab.fr> +# * Rémi Eyraud <remi.eyraud_AT_lis-lab.fr> +# * Denis Arrivault <contact.dev_AT_lis-lab.fr> +# * Dominique Benielli <dominique.benielli_AT_univ-amu.fr> +# +# Description: +# ----------- +# +# scitkit-splearn is a toolbox in +# python for spectral learning algorithms. +# +# Version: +# ------- +# +# * splearn version = 1.1.0 +# +# Licence: +# ------- +# +# License: 3-clause BSD +# +# +# ######### COPYRIGHT ######### """This module contains the Hankel class """ diff --git a/splearn/serializer.py b/splearn/serializer.py index 5109cdf3fc685b268719ad38f6db69affe3282b0..eae59a7994f997e534a1eadfda322d06d877eec0 100644 --- a/splearn/serializer.py +++ b/splearn/serializer.py @@ -1,4 +1,38 @@ # -*- coding: utf-8 -*- +# ######### COPYRIGHT ######### +# +# Copyright(c) 2016-2018 +# ----------------- +# +# * LabEx Archimède: http://labex-archimede.univ-amu.fr/ +# * Laboratoire d'Informatique et Systèmes : http://www.lis-lab.fr/ +# +# Contributors: +# ------------ +# +# * François Denis <francois.denis_AT_lis-lab.fr> +# * Rémi Eyraud <remi.eyraud_AT_lis-lab.fr> +# * Denis Arrivault <contact.dev_AT_lis-lab.fr> +# * Dominique Benielli <dominique.benielli_AT_univ-amu.fr> +# +# Description: +# ----------- +# +# scitkit-splearn is a toolbox in +# python for spectral learning algorithms. +# +# Version: +# ------- +# +# * splearn version = 1.1.0 +# +# Licence: +# ------- +# +# License: 3-clause BSD +# +# +# ######### COPYRIGHT ######### """This module contains the Serializer class """ diff --git a/splearn/spectral.py b/splearn/spectral.py index 883ffdfd0d6af8c6e718f442a3816af47f645845..1bc76ee2e0f8d951992035514cf4a3009d2e5e85 100644 --- a/splearn/spectral.py +++ b/splearn/spectral.py @@ -1,4 +1,38 @@ # -*- coding: utf-8 -*- +# ######### COPYRIGHT ######### +# +# Copyright(c) 2016-2018 +# ----------------- +# +# * LabEx Archimède: http://labex-archimede.univ-amu.fr/ +# * Laboratoire d'Informatique et Systèmes : http://www.lis-lab.fr/ +# +# Contributors: +# ------------ +# +# * François Denis <francois.denis_AT_lis-lab.fr> +# * Rémi Eyraud <remi.eyraud_AT_lis-lab.fr> +# * Denis Arrivault <contact.dev_AT_lis-lab.fr> +# * Dominique Benielli <dominique.benielli_AT_univ-amu.fr> +# +# Description: +# ----------- +# +# scitkit-splearn is a toolbox in +# python for spectral learning algorithms. +# +# Version: +# ------- +# +# * splearn version = 1.1.0 +# +# Licence: +# ------- +# +# License: 3-clause BSD +# +# +# ######### COPYRIGHT ######### """This module contains the Spectral and Learning class .. module author:: François Denis diff --git a/splearn/tests/datasets/get_dataset_path.py b/splearn/tests/datasets/get_dataset_path.py index f497951469e8d0e1f0d284443f6a70bd8bfcd19a..7175fb1b65d41d968e71858b96015d9c2a555fe8 100644 --- a/splearn/tests/datasets/get_dataset_path.py +++ b/splearn/tests/datasets/get_dataset_path.py @@ -1,4 +1,38 @@ # -*- coding: utf-8 -*- +# ######### COPYRIGHT ######### +# +# Copyright(c) 2016-2018 +# ----------------- +# +# * LabEx Archimède: http://labex-archimede.univ-amu.fr/ +# * Laboratoire d'Informatique et Systèmes : http://www.lis-lab.fr/ +# +# Contributors: +# ------------ +# +# * François Denis <francois.denis_AT_lis-lab.fr> +# * Rémi Eyraud <remi.eyraud_AT_lis-lab.fr> +# * Denis Arrivault <contact.dev_AT_lis-lab.fr> +# * Dominique Benielli <dominique.benielli_AT_univ-amu.fr> +# +# Description: +# ----------- +# +# scitkit-splearn is a toolbox in +# python for spectral learning algorithms. +# +# Version: +# ------- +# +# * splearn version = 1.1.0 +# +# Licence: +# ------- +# +# License: 3-clause BSD +# +# +# ######### COPYRIGHT ######### """Module to get the absolute path of a reference dataset for tests .. moduleauthor:: Denis Arrivault diff --git a/splearn/tests/test_automaton.py b/splearn/tests/test_automaton.py index 72416fa6f960957bd08abf0a4f778ad8350b6b5b..ce1ceb79c0ce16852ede3facd16424e473cdfcc6 100644 --- a/splearn/tests/test_automaton.py +++ b/splearn/tests/test_automaton.py @@ -1,4 +1,38 @@ # -*- coding: utf-8 -*- +# ######### COPYRIGHT ######### +# +# Copyright(c) 2016-2018 +# ----------------- +# +# * LabEx Archimède: http://labex-archimede.univ-amu.fr/ +# * Laboratoire d'Informatique et Systèmes : http://www.lis-lab.fr/ +# +# Contributors: +# ------------ +# +# * François Denis <francois.denis_AT_lis-lab.fr> +# * Rémi Eyraud <remi.eyraud_AT_lis-lab.fr> +# * Denis Arrivault <contact.dev_AT_lis-lab.fr> +# * Dominique Benielli <dominique.benielli_AT_univ-amu.fr> +# +# Description: +# ----------- +# +# scitkit-splearn is a toolbox in +# python for spectral learning algorithms. +# +# Version: +# ------- +# +# * splearn version = 1.1.0 +# +# Licence: +# ------- +# +# License: 3-clause BSD +# +# +# ######### COPYRIGHT ######### from __future__ import division, print_function import unittest import numpy as np diff --git a/splearn/tests/test_base.py b/splearn/tests/test_base.py index 1fbe062c0b71312378cb06caa4a4f38e541c0cab..b0abc2c91d7ff17f1b904fe94fb511cc546203c9 100644 --- a/splearn/tests/test_base.py +++ b/splearn/tests/test_base.py @@ -1,4 +1,38 @@ # -*- coding: utf-8 -*- +# ######### COPYRIGHT ######### +# +# Copyright(c) 2016-2018 +# ----------------- +# +# * LabEx Archimède: http://labex-archimede.univ-amu.fr/ +# * Laboratoire d'Informatique et Systèmes : http://www.lis-lab.fr/ +# +# Contributors: +# ------------ +# +# * François Denis <francois.denis_AT_lis-lab.fr> +# * Rémi Eyraud <remi.eyraud_AT_lis-lab.fr> +# * Denis Arrivault <contact.dev_AT_lis-lab.fr> +# * Dominique Benielli <dominique.benielli_AT_univ-amu.fr> +# +# Description: +# ----------- +# +# scitkit-splearn is a toolbox in +# python for spectral learning algorithms. +# +# Version: +# ------- +# +# * splearn version = 1.1.0 +# +# Licence: +# ------- +# +# License: 3-clause BSD +# +# +# ######### COPYRIGHT ######### from __future__ import division, print_function import numpy as np diff --git a/splearn/tests/test_data_sample.py b/splearn/tests/test_data_sample.py index 326ca5fa4bffed389fa5dcb22d9deb5286e54a74..1eae3ba20ab49018b0ed668c0593104487bcba93 100644 --- a/splearn/tests/test_data_sample.py +++ b/splearn/tests/test_data_sample.py @@ -1,4 +1,38 @@ # -*- coding: utf-8 -*- +# ######### COPYRIGHT ######### +# +# Copyright(c) 2016-2018 +# ----------------- +# +# * LabEx Archimède: http://labex-archimede.univ-amu.fr/ +# * Laboratoire d'Informatique et Systèmes : http://www.lis-lab.fr/ +# +# Contributors: +# ------------ +# +# * François Denis <francois.denis_AT_lis-lab.fr> +# * Rémi Eyraud <remi.eyraud_AT_lis-lab.fr> +# * Denis Arrivault <contact.dev_AT_lis-lab.fr> +# * Dominique Benielli <dominique.benielli_AT_univ-amu.fr> +# +# Description: +# ----------- +# +# scitkit-splearn is a toolbox in +# python for spectral learning algorithms. +# +# Version: +# ------- +# +# * splearn version = 1.1.0 +# +# Licence: +# ------- +# +# License: 3-clause BSD +# +# +# ######### COPYRIGHT ######### from __future__ import division, print_function import numpy as np diff --git a/splearn/tests/test_hankel.py b/splearn/tests/test_hankel.py index 10574395b3a4539cbf72cc94cf44b7b42e952b09..970f16a1a6417c97e51d896b40e66c7f6d8e3fe1 100644 --- a/splearn/tests/test_hankel.py +++ b/splearn/tests/test_hankel.py @@ -1,4 +1,38 @@ # -*- coding: utf-8 -*- +# ######### COPYRIGHT ######### +# +# Copyright(c) 2016-2018 +# ----------------- +# +# * LabEx Archimède: http://labex-archimede.univ-amu.fr/ +# * Laboratoire d'Informatique et Systèmes : http://www.lis-lab.fr/ +# +# Contributors: +# ------------ +# +# * François Denis <francois.denis_AT_lis-lab.fr> +# * Rémi Eyraud <remi.eyraud_AT_lis-lab.fr> +# * Denis Arrivault <contact.dev_AT_lis-lab.fr> +# * Dominique Benielli <dominique.benielli_AT_univ-amu.fr> +# +# Description: +# ----------- +# +# scitkit-splearn is a toolbox in +# python for spectral learning algorithms. +# +# Version: +# ------- +# +# * splearn version = 1.1.0 +# +# Licence: +# ------- +# +# License: 3-clause BSD +# +# +# ######### COPYRIGHT ######### from __future__ import division, print_function import unittest diff --git a/splearn/tests/test_serializer.py b/splearn/tests/test_serializer.py index 524a7c9536ff2b1411e417ebf7c4e2e2c3a2516f..bf9cdb30b1085fae1a24a99066edc366ff56c9a4 100644 --- a/splearn/tests/test_serializer.py +++ b/splearn/tests/test_serializer.py @@ -1,4 +1,38 @@ # -*- coding: utf-8 -*- +# ######### COPYRIGHT ######### +# +# Copyright(c) 2016-2018 +# ----------------- +# +# * LabEx Archimède: http://labex-archimede.univ-amu.fr/ +# * Laboratoire d'Informatique et Systèmes : http://www.lis-lab.fr/ +# +# Contributors: +# ------------ +# +# * François Denis <francois.denis_AT_lis-lab.fr> +# * Rémi Eyraud <remi.eyraud_AT_lis-lab.fr> +# * Denis Arrivault <contact.dev_AT_lis-lab.fr> +# * Dominique Benielli <dominique.benielli_AT_univ-amu.fr> +# +# Description: +# ----------- +# +# scitkit-splearn is a toolbox in +# python for spectral learning algorithms. +# +# Version: +# ------- +# +# * splearn version = 1.1.0 +# +# Licence: +# ------- +# +# License: 3-clause BSD +# +# +# ######### COPYRIGHT ######### import unittest import numpy as np import filecmp diff --git a/splearn/tests/test_spectral.py b/splearn/tests/test_spectral.py index 20ab7ec68def9acc35e94dd00377c5859ddb610e..3ab9abb16289316d96c1c581c415ec19cb70b5d3 100644 --- a/splearn/tests/test_spectral.py +++ b/splearn/tests/test_spectral.py @@ -1,4 +1,38 @@ # -*- coding: utf-8 -*- +# ######### COPYRIGHT ######### +# +# Copyright(c) 2016-2018 +# ----------------- +# +# * LabEx Archimède: http://labex-archimede.univ-amu.fr/ +# * Laboratoire d'Informatique et Systèmes : http://www.lis-lab.fr/ +# +# Contributors: +# ------------ +# +# * François Denis <francois.denis_AT_lis-lab.fr> +# * Rémi Eyraud <remi.eyraud_AT_lis-lab.fr> +# * Denis Arrivault <contact.dev_AT_lis-lab.fr> +# * Dominique Benielli <dominique.benielli_AT_univ-amu.fr> +# +# Description: +# ----------- +# +# scitkit-splearn is a toolbox in +# python for spectral learning algorithms. +# +# Version: +# ------- +# +# * splearn version = 1.1.0 +# +# Licence: +# ------- +# +# License: 3-clause BSD +# +# +# ######### COPYRIGHT ######### from __future__ import division, print_function import numpy as np