From a5aa5107567746c6e1039518c486fb54b82489a3 Mon Sep 17 00:00:00 2001
From: Ronan Hamon <ronan.hamon@lis-lab.fr>
Date: Tue, 17 Apr 2018 15:55:52 +0200
Subject: [PATCH] update contributors + minor changes
---
README.rst | 1 +
doc/credits.rst | 1 +
madarrays/mad_array.py | 3 ++-
madarrays/tests/test_madarray.py | 1 +
madarrays/tests/test_waveform.py | 1 +
madarrays/tests/utils.py | 1 +
madarrays/waveform.py | 1 +
setup.py | 3 ++-
8 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/README.rst b/README.rst
index c8ced3b..3425a3b 100644
--- a/README.rst
+++ b/README.rst
@@ -49,6 +49,7 @@ Contributors
* `Ronan Hamon <mailto:ronan.hamon@lis-lab.fr>`_
* `Valentin Emiya <mailto:valentin.emiya@lis-lab.fr>`_
+* `Florent Jaillet <mailto:florent.jaillet@lis-lab.fr>`_
License
-------
diff --git a/doc/credits.rst b/doc/credits.rst
index 0436019..ed59777 100644
--- a/doc/credits.rst
+++ b/doc/credits.rst
@@ -14,6 +14,7 @@ Contributors
* Ronan Hamon <firstname.lastname_AT_lis-lab.fr>
* Valentin Emiya <firstname.lastname_AT_lis-lab.fr>
+* Florent Jaillet <firstname.lastname_AT_lis-lab.fr>
Licence
-------
diff --git a/madarrays/mad_array.py b/madarrays/mad_array.py
index f921f1b..0993007 100644
--- a/madarrays/mad_array.py
+++ b/madarrays/mad_array.py
@@ -14,6 +14,7 @@
#
# * Ronan Hamon <firstname.lastname_AT_lis-lab.fr>
# * Valentin Emiya <firstname.lastname_AT_lis-lab.fr>
+# * Florent Jaillet <firstname.lastname_AT_lis-lab.fr>
#
# Description
# -----------
@@ -91,7 +92,7 @@ def _merge_masks(ma1, ma2):
def _complex_masking_only(f):
def decorated(self):
if not self._complex_masking:
- errmsg = 'Method not defined if masking is not complex'
+ errmsg = 'Method not defined if masking is not complex.'
raise ValueError(errmsg)
return f(self)
return decorated
diff --git a/madarrays/tests/test_madarray.py b/madarrays/tests/test_madarray.py
index 9fc96dc..4907643 100644
--- a/madarrays/tests/test_madarray.py
+++ b/madarrays/tests/test_madarray.py
@@ -14,6 +14,7 @@
#
# * Ronan Hamon <firstname.lastname_AT_lis-lab.fr>
# * Valentin Emiya <firstname.lastname_AT_lis-lab.fr>
+# * Florent Jaillet <firstname.lastname_AT_lis-lab.fr>
#
# Description
# -----------
diff --git a/madarrays/tests/test_waveform.py b/madarrays/tests/test_waveform.py
index e8e8349..3348fe8 100644
--- a/madarrays/tests/test_waveform.py
+++ b/madarrays/tests/test_waveform.py
@@ -14,6 +14,7 @@
#
# * Ronan Hamon <firstname.lastname_AT_lis-lab.fr>
# * Valentin Emiya <firstname.lastname_AT_lis-lab.fr>
+# * Florent Jaillet <firstname.lastname_AT_lis-lab.fr>
#
# Description
# -----------
diff --git a/madarrays/tests/utils.py b/madarrays/tests/utils.py
index d35c5ee..57a8f32 100644
--- a/madarrays/tests/utils.py
+++ b/madarrays/tests/utils.py
@@ -14,6 +14,7 @@
#
# * Ronan Hamon <firstname.lastname_AT_lis-lab.fr>
# * Valentin Emiya <firstname.lastname_AT_lis-lab.fr>
+# * Florent Jaillet <firstname.lastname_AT_lis-lab.fr>
#
# Description
# -----------
diff --git a/madarrays/waveform.py b/madarrays/waveform.py
index bf2c9e3..40e8f58 100644
--- a/madarrays/waveform.py
+++ b/madarrays/waveform.py
@@ -14,6 +14,7 @@
#
# * Ronan Hamon <firstname.lastname_AT_lis-lab.fr>
# * Valentin Emiya <firstname.lastname_AT_lis-lab.fr>
+# * Florent Jaillet <firstname.lastname_AT_lis-lab.fr>
#
# Description
# -----------
diff --git a/setup.py b/setup.py
index dd2db8e..c404542 100644
--- a/setup.py
+++ b/setup.py
@@ -15,6 +15,7 @@
#
# * Ronan Hamon <firstname.lastname_AT_lis-lab.fr>
# * Valentin Emiya <firstname.lastname_AT_lis-lab.fr>
+# * Florent Jaillet <firstname.lastname_AT_lis-lab.fr>
#
# Description
# -----------
@@ -123,7 +124,7 @@ def setup_package():
author_email=AUTHOR_EMAIL,
classifiers=CLASSIFIERS,
keywords=KEYWORDS,
- packages=find_packages(exclude=['doc', 'tests']),
+ packages=find_packages(exclude=['doc', 'dev']),
install_requires=INSTALL_REQUIRES,
python_requires=PYTHON_REQUIRES,
extras_require=EXTRA_REQUIRE,
--
GitLab