From 42961b0aa3f0432db2ee70c67fda1314f3bf11bc Mon Sep 17 00:00:00 2001
From: Dominique Benielli <dominique.benielli@univ-amu.fr>
Date: Fri, 16 May 2025 11:43:05 +0200
Subject: [PATCH] update version and tagging
---
README.rst | 4 ++++
VERSION | 2 +-
copyright.py | 2 ++
copyrightstamp.txt | 5 ++---
license.txt | 2 +-
multimodal/__init__.py | 2 +-
multimodal/boosting/boost.py | 8 +++++---
multimodal/boosting/combo.py | 8 +++++---
multimodal/boosting/mumbo.py | 8 +++++---
multimodal/datasets/data_sample.py | 10 ++++++----
multimodal/kernels/lpMKL.py | 8 +++++---
multimodal/kernels/mkernel.py | 8 +++++---
multimodal/kernels/mvml.py | 8 +++++---
multimodal/tests/data/get_dataset_path.py | 10 ++++++----
multimodal/tests/datasets/get_dataset_path.py | 10 ++++++----
multimodal/tests/test_combo.py | 8 +++++---
multimodal/tests/test_data_sample.py | 8 +++++---
multimodal/tests/test_mkl.py | 8 +++++---
multimodal/tests/test_mumbo.py | 8 +++++---
multimodal/tests/test_mvml.py | 8 +++++---
setup.py | 11 +++++------
21 files changed, 89 insertions(+), 57 deletions(-)
diff --git a/README.rst b/README.rst
index 87330b7..9b54820 100644
--- a/README.rst
+++ b/README.rst
@@ -62,6 +62,10 @@ You can get the **source code** from the **Git** repository of the project::
git clone git@gitlab.lis-lab.fr:dev/scikit-multimodallearn.git
+or
+
+ git clone git@github.com:multi-learn/scikit-multimodallearn.git
+
Testing
~~~~~~~
diff --git a/VERSION b/VERSION
index 1f0d027..c1fee13 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-multimodal:0.0.2
+multimodal:0.0.3
diff --git a/copyright.py b/copyright.py
index f471123..95e2f54 100644
--- a/copyright.py
+++ b/copyright.py
@@ -70,9 +70,11 @@ def getVersionsAndDate():
def writeStamp():
""" Write a copyright stamp on all files """
stamp = getStamp(*getVersionsAndDate())
+ print("stamp", stamp)
files = findFiles(os.path.join(os.path.dirname(os.path.abspath(__file__)),
"multimodal"))
for filename in files:
+ print("filename", filename)
fileStamping(filename, stamp)
fileStamping("setup.py", stamp)
diff --git a/copyrightstamp.txt b/copyrightstamp.txt
index c863e02..6daa2a8 100644
--- a/copyrightstamp.txt
+++ b/copyrightstamp.txt
@@ -6,7 +6,7 @@ Copyright(c) DATE
* Université d'Aix Marseille (AMU) -
* Centre National de la Recherche Scientifique (CNRS) -
* Université de Toulon (UTLN).
-* Copyright © 2019-2020 AMU, CNRS, UTLN
+* Copyright © 2019-2025 AMU, CNRS, UTLN
Contributors:
------------
@@ -36,5 +36,4 @@ Licence:
License: New BSD License
-
-######### COPYRIGHT #########
+######### COPYRIGHT #########
\ No newline at end of file
diff --git a/license.txt b/license.txt
index 573f99a..c962d5a 100644
--- a/license.txt
+++ b/license.txt
@@ -1,6 +1,6 @@
New BSD License
-Copyright (c) 2020-15-01, The scikit-multimodallearn developers.
+Copyright (c) 2025-15-04, The scikit-multimodallearn developers.
All rights reserved.
Redistribution and use in source and binary forms, with or without
diff --git a/multimodal/__init__.py b/multimodal/__init__.py
index 3b93d0b..27fdca4 100644
--- a/multimodal/__init__.py
+++ b/multimodal/__init__.py
@@ -1 +1 @@
-__version__ = "0.0.2"
+__version__ = "0.0.3"
diff --git a/multimodal/boosting/boost.py b/multimodal/boosting/boost.py
index bf1f743..67c592e 100644
--- a/multimodal/boosting/boost.py
+++ b/multimodal/boosting/boost.py
@@ -1,13 +1,13 @@
# -*- coding: utf-8 -*-
# ######### COPYRIGHT #########
#
-# Copyright(c) 2020
+# Copyright(c) 2025
# -----------------
#
# * Université d'Aix Marseille (AMU) -
# * Centre National de la Recherche Scientifique (CNRS) -
# * Université de Toulon (UTLN).
-# * Copyright © 2019-2020 AMU, CNRS, UTLN
+# * Copyright © 2019-2025 AMU, CNRS, UTLN
#
# Contributors:
# ------------
@@ -30,7 +30,7 @@
# Version:
# -------
#
-# * multimodal version = 0.0.dev0
+# * multimodal version = 0.0.3
#
# Licence:
# -------
@@ -39,6 +39,8 @@
#
#
# ######### COPYRIGHT #########
+#
+#
import numpy as np
import scipy.sparse as sp
from abc import ABCMeta
diff --git a/multimodal/boosting/combo.py b/multimodal/boosting/combo.py
index 5f4ef53..7f3bf90 100644
--- a/multimodal/boosting/combo.py
+++ b/multimodal/boosting/combo.py
@@ -1,13 +1,13 @@
# -*- coding: utf-8 -*-
# ######### COPYRIGHT #########
#
-# Copyright(c) 2020
+# Copyright(c) 2025
# -----------------
#
# * Université d'Aix Marseille (AMU) -
# * Centre National de la Recherche Scientifique (CNRS) -
# * Université de Toulon (UTLN).
-# * Copyright © 2019-2020 AMU, CNRS, UTLN
+# * Copyright © 2019-2025 AMU, CNRS, UTLN
#
# Contributors:
# ------------
@@ -30,7 +30,7 @@
# Version:
# -------
#
-# * multimodal version = 0.0.dev0
+# * multimodal version = 0.0.3
#
# Licence:
# -------
@@ -39,6 +39,8 @@
#
#
# ######### COPYRIGHT #########
+#
+#
r"""
This module contains a **Mu**\ lti\ **C**\ onfusion **M**\ Matrix **B**\ osting (**CoMBo**)
diff --git a/multimodal/boosting/mumbo.py b/multimodal/boosting/mumbo.py
index 30f66fe..8dd4b84 100644
--- a/multimodal/boosting/mumbo.py
+++ b/multimodal/boosting/mumbo.py
@@ -1,13 +1,13 @@
# -*- coding: utf-8 -*-
# ######### COPYRIGHT #########
#
-# Copyright(c) 2020
+# Copyright(c) 2025
# -----------------
#
# * Université d'Aix Marseille (AMU) -
# * Centre National de la Recherche Scientifique (CNRS) -
# * Université de Toulon (UTLN).
-# * Copyright © 2019-2020 AMU, CNRS, UTLN
+# * Copyright © 2019-2025 AMU, CNRS, UTLN
#
# Contributors:
# ------------
@@ -30,7 +30,7 @@
# Version:
# -------
#
-# * multimodal version = 0.0.dev0
+# * multimodal version = 0.0.3
#
# Licence:
# -------
@@ -39,6 +39,8 @@
#
#
# ######### COPYRIGHT #########
+#
+#
r"""Multimodal Boosting
This module contains a **Mu**\ lti\ **M**\ odal **Bo**\ osting (**MuMBo**)
diff --git a/multimodal/datasets/data_sample.py b/multimodal/datasets/data_sample.py
index c44b360..1af5aff 100644
--- a/multimodal/datasets/data_sample.py
+++ b/multimodal/datasets/data_sample.py
@@ -1,13 +1,13 @@
# -*- coding: utf-8 -*-
# ######### COPYRIGHT #########
#
-# Copyright(c) 2020
+# Copyright(c) 2025
# -----------------
#
# * Université d'Aix Marseille (AMU) -
# * Centre National de la Recherche Scientifique (CNRS) -
# * Université de Toulon (UTLN).
-# * Copyright © 2019-2020 AMU, CNRS, UTLN
+# * Copyright © 2019-2025 AMU, CNRS, UTLN
#
# Contributors:
# ------------
@@ -24,13 +24,13 @@
# -----------
#
# The multimodal package implement classifiers multiview,
-# MumboClassifier class, MuCumboClassifier class, MVML class, MKL class.
+# MumboClassifier class, MuComboClassifier class, MVML class, MKL class.
# compatible with sklearn
#
# Version:
# -------
#
-# * multimodal version = 0.0.dev0
+# * multimodal version = 0.0.3
#
# Licence:
# -------
@@ -44,6 +44,8 @@
#
#
#
+#
+#
"""This module contains the DataSample class, MultiModalArray, MultiModalSparseArray, MultiModalSparseInfo and MultiModalData, class
The DataSample class encapsulates a sample 's components
diff --git a/multimodal/kernels/lpMKL.py b/multimodal/kernels/lpMKL.py
index 7e2c7e2..e5ec695 100644
--- a/multimodal/kernels/lpMKL.py
+++ b/multimodal/kernels/lpMKL.py
@@ -1,13 +1,13 @@
# -*- coding: utf-8 -*-
# ######### COPYRIGHT #########
#
-# Copyright(c) 2020
+# Copyright(c) 2025
# -----------------
#
# * Université d'Aix Marseille (AMU) -
# * Centre National de la Recherche Scientifique (CNRS) -
# * Université de Toulon (UTLN).
-# * Copyright © 2019-2020 AMU, CNRS, UTLN
+# * Copyright © 2019-2025 AMU, CNRS, UTLN
#
# Contributors:
# ------------
@@ -30,7 +30,7 @@
# Version:
# -------
#
-# * multimodal version = 0.0.dev0
+# * multimodal version = 0.0.3
#
# Licence:
# -------
@@ -39,6 +39,8 @@
#
#
# ######### COPYRIGHT #########
+#
+#
import numpy as np
from sklearn.base import BaseEstimator
from sklearn.base import ClassifierMixin
diff --git a/multimodal/kernels/mkernel.py b/multimodal/kernels/mkernel.py
index 4424867..1166d0b 100644
--- a/multimodal/kernels/mkernel.py
+++ b/multimodal/kernels/mkernel.py
@@ -1,13 +1,13 @@
# -*- coding: utf-8 -*-
# ######### COPYRIGHT #########
#
-# Copyright(c) 2020
+# Copyright(c) 2025
# -----------------
#
# * Université d'Aix Marseille (AMU) -
# * Centre National de la Recherche Scientifique (CNRS) -
# * Université de Toulon (UTLN).
-# * Copyright © 2019-2020 AMU, CNRS, UTLN
+# * Copyright © 2019-2025 AMU, CNRS, UTLN
#
# Contributors:
# ------------
@@ -30,7 +30,7 @@
# Version:
# -------
#
-# * multimodal version = 0.0.dev0
+# * multimodal version = 0.0.3
#
# Licence:
# -------
@@ -40,6 +40,8 @@
#
# ######### COPYRIGHT #########
#
+#
+#
import numpy as np
import scipy as sp
from sklearn.metrics.pairwise import pairwise_kernels, PAIRWISE_KERNEL_FUNCTIONS
diff --git a/multimodal/kernels/mvml.py b/multimodal/kernels/mvml.py
index afee667..0a1c5d6 100644
--- a/multimodal/kernels/mvml.py
+++ b/multimodal/kernels/mvml.py
@@ -1,13 +1,13 @@
# -*- coding: utf-8 -*-
# ######### COPYRIGHT #########
#
-# Copyright(c) 2020
+# Copyright(c) 2025
# -----------------
#
# * Université d'Aix Marseille (AMU) -
# * Centre National de la Recherche Scientifique (CNRS) -
# * Université de Toulon (UTLN).
-# * Copyright © 2019-2020 AMU, CNRS, UTLN
+# * Copyright © 2019-2025 AMU, CNRS, UTLN
#
# Contributors:
# ------------
@@ -30,7 +30,7 @@
# Version:
# -------
#
-# * multimodal version = 0.0.dev0
+# * multimodal version = 0.0.3
#
# Licence:
# -------
@@ -39,6 +39,8 @@
#
#
# ######### COPYRIGHT #########
+#
+#
import numpy as np
import scipy.linalg as spli
from scipy.sparse.linalg import splu
diff --git a/multimodal/tests/data/get_dataset_path.py b/multimodal/tests/data/get_dataset_path.py
index f83880a..d2d4057 100644
--- a/multimodal/tests/data/get_dataset_path.py
+++ b/multimodal/tests/data/get_dataset_path.py
@@ -1,13 +1,13 @@
# -*- coding: utf-8 -*-
# ######### COPYRIGHT #########
#
-# Copyright(c) 2020
+# Copyright(c) 2025
# -----------------
#
# * Université d'Aix Marseille (AMU) -
# * Centre National de la Recherche Scientifique (CNRS) -
# * Université de Toulon (UTLN).
-# * Copyright © 2019-2020 AMU, CNRS, UTLN
+# * Copyright © 2019-2025 AMU, CNRS, UTLN
#
# Contributors:
# ------------
@@ -24,13 +24,13 @@
# -----------
#
# The multimodal package implement classifiers multiview,
-# MumboClassifier class, MuCumboClassifier class, MVML class, MKL class.
+# MumboClassifier class, MuComboClassifier class, MVML class, MKL class.
# compatible with sklearn
#
# Version:
# -------
#
-# * multimodal version = 0.0.dev0
+# * multimodal version = 0.0.3
#
# Licence:
# -------
@@ -44,6 +44,8 @@
#
#
#
+#
+#
from __future__ import print_function, division
diff --git a/multimodal/tests/datasets/get_dataset_path.py b/multimodal/tests/datasets/get_dataset_path.py
index f83880a..d2d4057 100644
--- a/multimodal/tests/datasets/get_dataset_path.py
+++ b/multimodal/tests/datasets/get_dataset_path.py
@@ -1,13 +1,13 @@
# -*- coding: utf-8 -*-
# ######### COPYRIGHT #########
#
-# Copyright(c) 2020
+# Copyright(c) 2025
# -----------------
#
# * Université d'Aix Marseille (AMU) -
# * Centre National de la Recherche Scientifique (CNRS) -
# * Université de Toulon (UTLN).
-# * Copyright © 2019-2020 AMU, CNRS, UTLN
+# * Copyright © 2019-2025 AMU, CNRS, UTLN
#
# Contributors:
# ------------
@@ -24,13 +24,13 @@
# -----------
#
# The multimodal package implement classifiers multiview,
-# MumboClassifier class, MuCumboClassifier class, MVML class, MKL class.
+# MumboClassifier class, MuComboClassifier class, MVML class, MKL class.
# compatible with sklearn
#
# Version:
# -------
#
-# * multimodal version = 0.0.dev0
+# * multimodal version = 0.0.3
#
# Licence:
# -------
@@ -44,6 +44,8 @@
#
#
#
+#
+#
from __future__ import print_function, division
diff --git a/multimodal/tests/test_combo.py b/multimodal/tests/test_combo.py
index 5b864e6..ddf9c1d 100644
--- a/multimodal/tests/test_combo.py
+++ b/multimodal/tests/test_combo.py
@@ -1,13 +1,13 @@
# -*- coding: utf-8 -*-
# ######### COPYRIGHT #########
#
-# Copyright(c) 2020
+# Copyright(c) 2025
# -----------------
#
# * Université d'Aix Marseille (AMU) -
# * Centre National de la Recherche Scientifique (CNRS) -
# * Université de Toulon (UTLN).
-# * Copyright © 2019-2020 AMU, CNRS, UTLN
+# * Copyright © 2019-2025 AMU, CNRS, UTLN
#
# Contributors:
# ------------
@@ -30,7 +30,7 @@
# Version:
# -------
#
-# * multimodal version = 0.0.dev0
+# * multimodal version = 0.0.3
#
# Licence:
# -------
@@ -44,6 +44,8 @@
#
#
#
+#
+#
"""Testing for the mumbo module."""
diff --git a/multimodal/tests/test_data_sample.py b/multimodal/tests/test_data_sample.py
index a25977e..80af0b6 100644
--- a/multimodal/tests/test_data_sample.py
+++ b/multimodal/tests/test_data_sample.py
@@ -1,13 +1,13 @@
# -*- coding: utf-8 -*-
# ######### COPYRIGHT #########
#
-# Copyright(c) 2020
+# Copyright(c) 2025
# -----------------
#
# * Université d'Aix Marseille (AMU) -
# * Centre National de la Recherche Scientifique (CNRS) -
# * Université de Toulon (UTLN).
-# * Copyright © 2019-2020 AMU, CNRS, UTLN
+# * Copyright © 2019-2025 AMU, CNRS, UTLN
#
# Contributors:
# ------------
@@ -30,7 +30,7 @@
# Version:
# -------
#
-# * multimodal version = 0.0.dev0
+# * multimodal version = 0.0.3
#
# Licence:
# -------
@@ -39,6 +39,8 @@
#
#
# ######### COPYRIGHT #########
+#
+#
import unittest
import numpy as np
diff --git a/multimodal/tests/test_mkl.py b/multimodal/tests/test_mkl.py
index b384db4..6dc8951 100644
--- a/multimodal/tests/test_mkl.py
+++ b/multimodal/tests/test_mkl.py
@@ -1,13 +1,13 @@
# -*- coding: utf-8 -*-
# ######### COPYRIGHT #########
#
-# Copyright(c) 2020
+# Copyright(c) 2025
# -----------------
#
# * Université d'Aix Marseille (AMU) -
# * Centre National de la Recherche Scientifique (CNRS) -
# * Université de Toulon (UTLN).
-# * Copyright © 2019-2020 AMU, CNRS, UTLN
+# * Copyright © 2019-2025 AMU, CNRS, UTLN
#
# Contributors:
# ------------
@@ -30,7 +30,7 @@
# Version:
# -------
#
-# * multimodal version = 0.0.dev0
+# * multimodal version = 0.0.3
#
# Licence:
# -------
@@ -39,6 +39,8 @@
#
#
# ######### COPYRIGHT #########
+#
+#
import unittest
import numpy as np
from sklearn.metrics.pairwise import rbf_kernel
diff --git a/multimodal/tests/test_mumbo.py b/multimodal/tests/test_mumbo.py
index 204097c..b513b09 100644
--- a/multimodal/tests/test_mumbo.py
+++ b/multimodal/tests/test_mumbo.py
@@ -1,13 +1,13 @@
# -*- coding: utf-8 -*-
# ######### COPYRIGHT #########
#
-# Copyright(c) 2020
+# Copyright(c) 2025
# -----------------
#
# * Université d'Aix Marseille (AMU) -
# * Centre National de la Recherche Scientifique (CNRS) -
# * Université de Toulon (UTLN).
-# * Copyright © 2019-2020 AMU, CNRS, UTLN
+# * Copyright © 2019-2025 AMU, CNRS, UTLN
#
# Contributors:
# ------------
@@ -30,7 +30,7 @@
# Version:
# -------
#
-# * multimodal version = 0.0.dev0
+# * multimodal version = 0.0.3
#
# Licence:
# -------
@@ -39,6 +39,8 @@
#
#
# ######### COPYRIGHT #########
+#
+#
#"""Testing for the mumbo module."""#
# Author: Florent JAILLET - Laboratoire d'Informatique et Systèmes - UMR 7020
diff --git a/multimodal/tests/test_mvml.py b/multimodal/tests/test_mvml.py
index 3a27d97..9d5b69a 100644
--- a/multimodal/tests/test_mvml.py
+++ b/multimodal/tests/test_mvml.py
@@ -1,13 +1,13 @@
# -*- coding: utf-8 -*-
# ######### COPYRIGHT #########
#
-# Copyright(c) 2020
+# Copyright(c) 2025
# -----------------
#
# * Université d'Aix Marseille (AMU) -
# * Centre National de la Recherche Scientifique (CNRS) -
# * Université de Toulon (UTLN).
-# * Copyright © 2019-2020 AMU, CNRS, UTLN
+# * Copyright © 2019-2025 AMU, CNRS, UTLN
#
# Contributors:
# ------------
@@ -30,7 +30,7 @@
# Version:
# -------
#
-# * multimodal version = 0.0.dev0
+# * multimodal version = 0.0.3
#
# Licence:
# -------
@@ -39,6 +39,8 @@
#
#
# ######### COPYRIGHT #########
+#
+#
import pickle
import unittest
diff --git a/setup.py b/setup.py
index 50c5e73..68db76d 100644
--- a/setup.py
+++ b/setup.py
@@ -1,13 +1,13 @@
# -*- coding: utf-8 -*-
# ######### COPYRIGHT #########
#
-# Copyright(c) 2020
+# Copyright(c) 2025
# -----------------
#
# * Université d'Aix Marseille (AMU) -
# * Centre National de la Recherche Scientifique (CNRS) -
# * Université de Toulon (UTLN).
-# * Copyright © 2019-2020 AMU, CNRS, UTLN
+# * Copyright © 2019-2025 AMU, CNRS, UTLN
#
# Contributors:
# ------------
@@ -30,9 +30,9 @@
# Version:
# -------
#
-# * multimodal version = 0.0.dev0
+# * multimodal version = 0.0.3
#
-# Licence:(
+# Licence:
# -------
#
# License: New BSD License
@@ -61,7 +61,7 @@ try:
from copyright import writeStamp, eraseStamp
except ImportError:
USE_COPYRIGHT = False
-
+print(USE_COPYRIGHT)
###################
# Get Multimodal version
####################
@@ -128,7 +128,6 @@ class m_sdist(sdist):
WARNING : The stamping must be done on an default utf8 machine !
"""
-
def run(self):
if USE_COPYRIGHT:
writeStamp()
--
GitLab