Merge branch 'stable'

YannickJadoul · YannickJadoul · commit e3900059f021 · 2020-01-02T22:36:44.000+01:00
diff --git a/.travis.yml b/.travis.yml
@@ -214,6 +214,7 @@ before_install:
       PYTHON_CMD=python$PYTHON
     elif [ "$TRAVIS_OS_NAME" == "osx" ]; then
       unset -f cd; # Workaround for weird 'shell_session_update' issue: https://github.com/travis-ci/travis-ci/issues/8703
+      brew unlink python@2
       brew update > /dev/null
       brew install ccache
       export PATH=/usr/local/opt/ccache/libexec:$PATH
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2016-2019  Yannick Jadoul
+# Copyright (C) 2016-2020  Yannick Jadoul
 #
 # This file is part of Parselmouth.
 #
diff --git a/docs/conf.py b/docs/conf.py
@@ -62,7 +62,7 @@
 
 # General information about the project.
 project = 'Parselmouth'
-copyright = '2017-2019, Yannick Jadoul'
+copyright = '2017-2020, Yannick Jadoul'
 author = 'Yannick Jadoul'
 
 if on_rtd:
diff --git a/praat/CMakeLists.txt b/praat/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2016-2019  Yannick Jadoul
+# Copyright (C) 2016-2020  Yannick Jadoul
 #
 # This file is part of Parselmouth.
 #
diff --git a/res/cmake/add_sources.cmake b/res/cmake/add_sources.cmake
@@ -1,4 +1,4 @@
-# Copyright (C) 2016-2019  Yannick Jadoul
+# Copyright (C) 2016-2020  Yannick Jadoul
 #
 # This file is part of Parselmouth.
 #
diff --git a/res/etc/makefilelist.sh b/res/etc/makefilelist.sh
@@ -1,4 +1,4 @@
-# Copyright (C) 2016-2019  Yannick Jadoul
+# Copyright (C) 2016-2020  Yannick Jadoul
 #
 # This file is part of Parselmouth.
 #
diff --git a/setup.py b/setup.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2019  Yannick Jadoul
+# Copyright (C) 2017-2020  Yannick Jadoul
 #
 # This file is part of Parselmouth.
 #
diff --git a/src/Bindings.h b/src/Bindings.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2019  Yannick Jadoul
+ * Copyright (C) 2017-2020  Yannick Jadoul
  *
  * This file is part of Parselmouth.
  *
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2016-2019  Yannick Jadoul
+# Copyright (C) 2016-2020  Yannick Jadoul
 #
 # This file is part of Parselmouth.
 #
diff --git a/src/parselmouth.cpp b/src/parselmouth.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2019  Yannick Jadoul
+ * Copyright (C) 2016-2020  Yannick Jadoul
  *
  * This file is part of Parselmouth.
  *
diff --git a/src/parselmouth/CC.cpp b/src/parselmouth/CC.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2019  Yannick Jadoul
+ * Copyright (C) 2017-2020  Yannick Jadoul
  *
  * This file is part of Parselmouth.
  *
diff --git a/src/parselmouth/CMakeLists.txt b/src/parselmouth/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2019  Yannick Jadoul
+# Copyright (C) 2017-2020  Yannick Jadoul
 #
 # This file is part of Parselmouth.
 #
diff --git a/src/parselmouth/Data.cpp b/src/parselmouth/Data.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2019  Yannick Jadoul
+ * Copyright (C) 2017-2020  Yannick Jadoul
  *
  * This file is part of Parselmouth.
  *
diff --git a/src/parselmouth/Formant.cpp b/src/parselmouth/Formant.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2019  Yannick Jadoul
+ * Copyright (C) 2017-2020  Yannick Jadoul
  *
  * This file is part of Parselmouth.
  *
diff --git a/src/parselmouth/Function.cpp b/src/parselmouth/Function.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2019  Yannick Jadoul
+ * Copyright (C) 2017-2020  Yannick Jadoul
  *
  * This file is part of Parselmouth.
  *
diff --git a/src/parselmouth/Harmonicity.cpp b/src/parselmouth/Harmonicity.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2019  Yannick Jadoul
+ * Copyright (C) 2017-2020  Yannick Jadoul
  *
  * This file is part of Parselmouth.
  *
diff --git a/src/parselmouth/Intensity.cpp b/src/parselmouth/Intensity.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2019  Yannick Jadoul
+ * Copyright (C) 2017-2020  Yannick Jadoul
  *
  * This file is part of Parselmouth.
  *
diff --git a/src/parselmouth/Interpolation.h b/src/parselmouth/Interpolation.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2019  Yannick Jadoul
+ * Copyright (C) 2018-2020  Yannick Jadoul
  *
  * This file is part of Parselmouth.
  *
diff --git a/src/parselmouth/MFCC.cpp b/src/parselmouth/MFCC.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2019  Yannick Jadoul
+ * Copyright (C) 2017-2020  Yannick Jadoul
  *
  * This file is part of Parselmouth.
  *
diff --git a/src/parselmouth/Matrix.cpp b/src/parselmouth/Matrix.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2019  Yannick Jadoul
+ * Copyright (C) 2017-2020  Yannick Jadoul
  *
  * This file is part of Parselmouth.
  *
diff --git a/src/parselmouth/Parselmouth.h b/src/parselmouth/Parselmouth.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2019  Yannick Jadoul
+ * Copyright (C) 2017-2020  Yannick Jadoul
  *
  * This file is part of Parselmouth.
  *
diff --git a/src/parselmouth/Pitch.cpp b/src/parselmouth/Pitch.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2019  Yannick Jadoul
+ * Copyright (C) 2017-2020  Yannick Jadoul
  *
  * This file is part of Parselmouth.
  *
diff --git a/src/parselmouth/Sampled.cpp b/src/parselmouth/Sampled.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2019  Yannick Jadoul
+ * Copyright (C) 2017-2020  Yannick Jadoul
  *
  * This file is part of Parselmouth.
  *
diff --git a/src/parselmouth/SampledXY.cpp b/src/parselmouth/SampledXY.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2019  Yannick Jadoul
+ * Copyright (C) 2017-2020  Yannick Jadoul
  *
  * This file is part of Parselmouth.
  *
diff --git a/src/parselmouth/Sound.cpp b/src/parselmouth/Sound.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2019  Yannick Jadoul
+ * Copyright (C) 2017-2020  Yannick Jadoul
  *
  * This file is part of Parselmouth.
  *
diff --git a/src/parselmouth/Spectrogram.cpp b/src/parselmouth/Spectrogram.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2019  Yannick Jadoul
+ * Copyright (C) 2017-2020  Yannick Jadoul
  *
  * This file is part of Parselmouth.
  *
diff --git a/src/parselmouth/Spectrum.cpp b/src/parselmouth/Spectrum.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2019  Yannick Jadoul
+ * Copyright (C) 2017-2020  Yannick Jadoul
  *
  * This file is part of Parselmouth.
  *
diff --git a/src/parselmouth/Thing.cpp b/src/parselmouth/Thing.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2019  Yannick Jadoul
+ * Copyright (C) 2017-2020  Yannick Jadoul
  *
  * This file is part of Parselmouth.
  *
diff --git a/src/parselmouth/TimeClassAspects.h b/src/parselmouth/TimeClassAspects.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2019  Yannick Jadoul
+ * Copyright (C) 2017-2020  Yannick Jadoul
  *
  * This file is part of Parselmouth.
  *
diff --git a/src/parselmouth/Vector.cpp b/src/parselmouth/Vector.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2019  Yannick Jadoul
+ * Copyright (C) 2017-2020  Yannick Jadoul
  *
  * This file is part of Parselmouth.
  *
diff --git a/src/parselmouth/praat.cpp b/src/parselmouth/praat.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2019  Yannick Jadoul
+ * Copyright (C) 2018-2020  Yannick Jadoul
  *
  * This file is part of Parselmouth.
  *
diff --git a/src/utils/SignatureCast.h b/src/utils/SignatureCast.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2019  Yannick Jadoul
+ * Copyright (C) 2017-2020  Yannick Jadoul
  *
  * This file is part of Parselmouth.
  *
diff --git a/src/utils/StringUtils.h b/src/utils/StringUtils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2017  Yannick Jadoul
+ * Copyright (C) 2016-2020  Yannick Jadoul
  *
  * This file is part of Parselmouth.
  *
diff --git a/src/utils/praat/MelderUtils.h b/src/utils/praat/MelderUtils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2019  Yannick Jadoul
+ * Copyright (C) 2017-2020  Yannick Jadoul
  *
  * This file is part of Parselmouth.
  *
diff --git a/src/utils/praat/UndefPraatMacros.h b/src/utils/praat/UndefPraatMacros.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2019  Yannick Jadoul
+ * Copyright (C) 2016-2020  Yannick Jadoul
  *
  * This file is part of Parselmouth.
  *
diff --git a/src/utils/pybind11/ImplicitStringToEnumConversion.h b/src/utils/pybind11/ImplicitStringToEnumConversion.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2019  Yannick Jadoul
+ * Copyright (C) 2017-2020  Yannick Jadoul
  *
  * This file is part of Parselmouth.
  *
diff --git a/src/utils/pybind11/NumericPredicates.h b/src/utils/pybind11/NumericPredicates.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2019  Yannick Jadoul
+ * Copyright (C) 2017-2020  Yannick Jadoul
  *
  * This file is part of Parselmouth.
  *
diff --git a/src/utils/pybind11/Predicate.h b/src/utils/pybind11/Predicate.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2019  Yannick Jadoul
+ * Copyright (C) 2017-2020  Yannick Jadoul
  *
  * This file is part of Parselmouth.
  *
diff --git a/src/version.h b/src/version.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2019  Yannick Jadoul
+ * Copyright (C) 2017-2020  Yannick Jadoul
  *
  * This file is part of Parselmouth.
  *
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2019  Yannick Jadoul
+# Copyright (C) 2018-2020  Yannick Jadoul
 #
 # This file is part of Parselmouth.
 #
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -1,3 +1,20 @@
+# Copyright (C) 2018-2020  Yannick Jadoul
+#
+# This file is part of Parselmouth.
+#
+# Parselmouth is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Parselmouth is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Parselmouth.  If not, see <http://www.gnu.org/licenses/>
+
 import pytest
 
 import os
diff --git a/tests/resource_fixtures.py b/tests/resource_fixtures.py
@@ -1,3 +1,20 @@
+# Copyright (C) 2018-2020  Yannick Jadoul
+#
+# This file is part of Parselmouth.
+#
+# Parselmouth is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Parselmouth is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Parselmouth.  If not, see <http://www.gnu.org/licenses/>
+
 import pytest
 import pytest_lazyfixture
 
diff --git a/tests/test_data.py b/tests/test_data.py
@@ -1,3 +1,20 @@
+# Copyright (C) 2018-2020  Yannick Jadoul
+#
+# This file is part of Parselmouth.
+#
+# Parselmouth is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Parselmouth is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Parselmouth.  If not, see <http://www.gnu.org/licenses/>
+
 from __future__ import unicode_literals  # Python 2 compatibility
 
 import pytest
diff --git a/tests/test_praat.py b/tests/test_praat.py
@@ -1,3 +1,20 @@
+# Copyright (C) 2018-2020  Yannick Jadoul
+#
+# This file is part of Parselmouth.
+#
+# Parselmouth is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Parselmouth is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Parselmouth.  If not, see <http://www.gnu.org/licenses/>
+
 import pytest
 
 import parselmouth
diff --git a/tests/test_sampled.py b/tests/test_sampled.py
@@ -1,3 +1,20 @@
+# Copyright (C) 2018-2020  Yannick Jadoul
+#
+# This file is part of Parselmouth.
+#
+# Parselmouth is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Parselmouth is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Parselmouth.  If not, see <http://www.gnu.org/licenses/>
+
 import pytest
 
 import numpy as np
diff --git a/tests/test_sound.py b/tests/test_sound.py
diff --git a/tests/test_sound_conversions.py b/tests/test_sound_conversions.py

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# Copyright (C) 2016-2019 Yannick Jadoul`
	`1`	`+# Copyright (C) 2016-2020 Yannick Jadoul`
`2`	`2`	`#`
`3`	`3`	`# This file is part of Parselmouth.`
`4`	`4`	`#`