Pre-commit whitespace fixes etc

YannickJadoul · Aug 3, 2023 · 198f6de · 198f6de
1 parent 142249b
commit 198f6de
Show file tree

Hide file tree

Showing 13 changed files with 6 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -30,7 +30,7 @@ _Nothing yet_
 ### Fixed
 - Fixed a memory leak in `PraatEnvironment::retrieveSelectedObjects` (see #33).
 - Changed default value of the `very_accurate` parameter of `Sound.to_pitch_ac` and `Sound.to_pitch_cc` to `False`, matching Praat's default.
-- Added a `Sound` copy constructor from another `Sound` object, making sure `sampling_frequency` also gets copied. 
+- Added a `Sound` copy constructor from another `Sound` object, making sure `sampling_frequency` also gets copied.
 ### Changed
 - Updated Praat to version 6.1.38.
 - Updated pybind11 to version v2.6.2.

diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
@@ -74,4 +74,3 @@ available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.ht
 
 For answers to common questions about this code of conduct, see
 https://www.contributor-covenant.org/faq
-
diff --git a/README.md b/README.md
@@ -136,7 +136,7 @@ Briefly summarized, Parselmouth is built using [`cmake`](https://cmake.org/). Ne
 * Parselmouth is released under the GNU General Public License, version 3 or later. See [the `LICENSE` file](LICENSE) for details.
 
   A [manuscript introducing Parselmouth](https://ai.vub.ac.be/~yajadoul/jadoul_introducing-parselmouth_a-python-interface-to-praat.pdf) (and [supplementary material](https://ai.vub.ac.be/~yajadoul/jadoul_introducing-parselmouth_a-python-interface-to-praat_supplementary-material.zip)) has been [published in the Journal of Phonetics](https://www.sciencedirect.com/science/article/abs/pii/S0095447017301389). Scientific research using Parselmouth's functionality can [*cite Parselmouth*](https://parselmouth.readthedocs.io/en/stable/#citing-parselmouth) as follows:
-  
+
   > Jadoul, Y., Thompson, B., & de Boer, B. (2018). Introducing Parselmouth: A Python interface to Praat. *Journal of Phonetics*, *71*, 1-15. https://doi.org/10.1016/j.wocn.2018.07.001
 
 * [Praat](https://github.com/praat/praat) is released under [the GNU General Public License, version 2 or later](praat/main/GNU_General_Public_License.txt). Small changes to this code base, made in the context of Parselmouth, can be found within the `git` history.

diff --git a/docs/api_reference.rst b/docs/api_reference.rst
@@ -15,4 +15,3 @@ API Reference
     :undoc-members:
     :show-inheritance:
     :exclude-members: __weakref__, __doc__, __module__, __dict__, __members__, __getstate__, __setstate__
-
diff --git a/docs/conf.py b/docs/conf.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 #
 # Parselmouth documentation build configuration file, created by
 # sphinx-quickstart on Tue Sep 12 00:08:01 2017.
@@ -292,5 +291,3 @@ def setup(app):
 
 # A list of files that should not be packed into the epub file.
 epub_exclude_files = ['search.html']
-
-
diff --git a/docs/examples/requirements.txt b/docs/examples/requirements.txt
@@ -3,4 +3,3 @@ matplotlib
 pandas
 requests
 seaborn
-
diff --git a/docs/installation.rst b/docs/installation.rst
@@ -135,4 +135,3 @@ The "Microsoft Visual C++ Redistributable for Visual Studio 2019" installer can
 - For a 32-bit Python installation: https://aka.ms/vs/16/release/VC_redist.x86.exe
 
 To check which Python version you are using, you can look at the first line of output when starting a Python shell. The version information should contain ``[MSC v.xxxx 64 bit (AMD64)]`` in a 64-bit installation, or ``[MSC v.xxxx 32 bit (Intel)]`` in a 32-bit installation.
-
diff --git a/docs/psychopy_installation.py b/docs/psychopy_installation.py
@@ -77,4 +77,3 @@
 
 
 print("Done! Restart PsychoPy to use Parselmouth.")
-
diff --git a/res/etc/locale_regex_diff.sh b/res/etc/locale_regex_diff.sh
@@ -17,7 +17,7 @@
 
 # git diff --color=always "$@" | grep -E --color=always -f "$(dirname "$(readlink -f "$0")")/locale_regexes" -B 5 -A 5 | less -R
 # git diff "$@" | grepdiff -f "$(dirname "$(readlink -f "$0")")/locale_regexes" -E --output=hunk | colordiff | grep --color=always -f locale_regexes -e '' | less -R
-# git diff "$@" | grepdiff -f "$(dirname "$(readlink -f "$0")")/locale_regexes" -E --output=hunk | grep --color=always -f locale_regexes -e '' | ydiff -s -w 0 --wrap 
+# git diff "$@" | grepdiff -f "$(dirname "$(readlink -f "$0")")/locale_regexes" -E --output=hunk | grep --color=always -f locale_regexes -e '' | ydiff -s -w 0 --wrap
 
 trap "exit" INT
 

diff --git a/res/praat_update_guide.md b/res/praat_update_guide.md
@@ -9,4 +9,3 @@ Guide to update the Praat version of the git subtree in `praat/`:
 - Compile and run tests (with `--run-praat-tests`) and hope nothing broke.
 - Commit, push, and hope nothing breaks in CI.
 - Update the Praat version in the docs and README (Praat citations).
-
diff --git a/setup.py b/setup.py
@@ -29,7 +29,7 @@
 
 
 def find_version(*file_paths):
-	with io.open(os.path.join(os.path.dirname(__file__), "src", "version.h"), encoding='utf8') as f:
+	with open(os.path.join(os.path.dirname(__file__), "src", "version.h"), encoding='utf8') as f:
 		version_file = f.read()
 	version_match = re.search(r"^#define PARSELMOUTH_VERSION ([0-9a-z.]+)$", version_file, re.M)
 	if version_match:

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -40,7 +40,7 @@ def pytest_collection_modifyitems(config, items):
 class Resources:
 	def __init__(self, base_path):
 		self.base_path = base_path
-	
+
 	def __getitem__(self, file_name):
 		return os.path.join(self.base_path, "data", file_name)
 

diff --git a/tests/test_praat.py b/tests/test_praat.py
@@ -168,7 +168,7 @@ def test_run_with_parameters(sound_path):
 		real timeStep 0.0
 		boolean subtractMean "yes"
 	endform
-	
+
 	Read from file: "{}"
 	To Intensity: minPitch, timeStep, subtractMean
 	selectObject: 1