From 0cfce5a7a58103858dbd9b506c747cfc482cf1c6 Mon Sep 17 00:00:00 2001 From: Denis Arrivault <denis.arrivault@lif.univ-mrs.fr> Date: Fri, 16 Feb 2018 11:15:15 +0100 Subject: [PATCH] Gitlab-CI first commit + stamping --- .gitignore | 1 + .gitlab-ci.yml | 19 ++++++++++++ HISTORY.rst | 8 ++++- docker/Dockerfile | 18 +++++++++++ setup.py | 36 +++++++++++++++++++++- splearn/automaton.py | 34 ++++++++++++++++++++ splearn/datasets/data_sample.py | 34 ++++++++++++++++++++ splearn/hankel.py | 34 ++++++++++++++++++++ splearn/serializer.py | 34 ++++++++++++++++++++ splearn/spectral.py | 34 ++++++++++++++++++++ splearn/tests/datasets/get_dataset_path.py | 34 ++++++++++++++++++++ splearn/tests/test_automaton.py | 34 ++++++++++++++++++++ splearn/tests/test_base.py | 34 ++++++++++++++++++++ splearn/tests/test_data_sample.py | 34 ++++++++++++++++++++ splearn/tests/test_hankel.py | 34 ++++++++++++++++++++ splearn/tests/test_serializer.py | 34 ++++++++++++++++++++ splearn/tests/test_spectral.py | 34 ++++++++++++++++++++ 17 files changed, 488 insertions(+), 2 deletions(-) create mode 100644 .gitlab-ci.yml create mode 100644 docker/Dockerfile diff --git a/.gitignore b/.gitignore index a5346ff..cc53efa 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 0000000..fd56bbf --- /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 dd6b0a5..ff4829e 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 0000000..45a277b --- /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 cbb1d50..01b12d9 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 9a980d7..2d007e3 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 26746e3..3122630 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 d91ff72..f239f69 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 5109cdf..eae59a7 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 883ffdf..1bc76ee 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 f497951..7175fb1 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 72416fa..ce1ceb7 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 1fbe062..b0abc2c 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 326ca5f..1eae3ba 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 1057439..970f16a 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 524a7c9..bf9cdb3 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 20ab7ec..3ab9abb 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 -- GitLab