From 78f89e34a400617023cffe256b8fbf616ceacf78 Mon Sep 17 00:00:00 2001 From: Bouwe Andela Date: Tue, 7 May 2024 08:54:03 +0200 Subject: [PATCH 1/4] Set line-length to 79 characters according to PEP-8 --- {{cookiecutter.directory_name}}/pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/{{cookiecutter.directory_name}}/pyproject.toml b/{{cookiecutter.directory_name}}/pyproject.toml index 9dd96e77..bf64fa64 100644 --- a/{{cookiecutter.directory_name}}/pyproject.toml +++ b/{{cookiecutter.directory_name}}/pyproject.toml @@ -81,7 +81,7 @@ force_single_line = 1 no_lines_before = ["FUTURE", "STDLIB", "THIRDPARTY", "FIRSTPARTY", "LOCALFOLDER"] known_first_party = "{{ cookiecutter.package_name }}" src_paths = ["{{ cookiecutter.package_name }}", "tests"] -line_length = 120 +line_length = 79 # For completeness, until we move to an src-based layout [tool.setuptools.packages.find] @@ -166,7 +166,7 @@ per-file-ignores = {} dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$" target-version = "py39" -line-length = 120 +line-length = 79 [tool.ruff.isort] known-first-party = ["{{ cookiecutter.package_name }}"] From 5b91cb42a38ef87b38f599e0388efd1fd1171a7b Mon Sep 17 00:00:00 2001 From: Bouwe Andela Date: Tue, 7 May 2024 08:57:12 +0200 Subject: [PATCH 2/4] Add changelog entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 949c3856..60d8f9d6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ ### Changed +* Restored default line-length of 79 characters, as recommended by [PEP-8](https://peps.python.org/pep-0008/#maximum-line-length) [#389](https://github.com/NLeSC/python-template/pull/389) * Moved from setup.cfg/.py to pyproject.toml [#351](https://github.com/NLeSC/python-template/issues/351) * Moved from prospector to ruff [#336](https://github.com/NLeSC/python-template/issues/336) * Renamed `project_name` to `directory_name` in cookiecutter questionnaire From 84e2f2291726db48af4f08229595c3341196ec68 Mon Sep 17 00:00:00 2001 From: Bouwe Andela Date: Tue, 7 May 2024 09:05:29 +0200 Subject: [PATCH 3/4] Fix line-length --- {{cookiecutter.directory_name}}/docs/conf.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/{{cookiecutter.directory_name}}/docs/conf.py b/{{cookiecutter.directory_name}}/docs/conf.py index e0f32f0b..caff2b0c 100644 --- a/{{cookiecutter.directory_name}}/docs/conf.py +++ b/{{cookiecutter.directory_name}}/docs/conf.py @@ -78,11 +78,12 @@ # -- Options for Intersphinx -intersphinx_mapping = {'python': ('https://docs.python.org/3', None), - # Commonly used libraries, uncomment when used in package - # 'numpy': ('http://docs.scipy.org/doc/numpy/', None), - # 'scipy': ('http://docs.scipy.org/doc/scipy/reference/', None), - # 'scikit-learn': ('https://scikit-learn.org/stable/', None), - # 'matplotlib': ('https://matplotlib.org/stable/', None), - # 'pandas': ('http://pandas.pydata.org/docs/', None), - } +intersphinx_mapping = { + 'python': ('https://docs.python.org/3', None), + # Commonly used libraries, uncomment when used in package + # 'numpy': ('http://docs.scipy.org/doc/numpy/', None), + # 'scipy': ('http://docs.scipy.org/doc/scipy/reference/', None), + # 'scikit-learn': ('https://scikit-learn.org/stable/', None), + # 'matplotlib': ('https://matplotlib.org/stable/', None), + # 'pandas': ('http://pandas.pydata.org/docs/', None), +} From 57016e4ce84deb7a49467121d9d0b1ac97533c52 Mon Sep 17 00:00:00 2001 From: Bouwe Andela Date: Thu, 16 May 2024 19:19:57 +0200 Subject: [PATCH 4/4] Undo change to unused configuration --- {{cookiecutter.directory_name}}/pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.directory_name}}/pyproject.toml b/{{cookiecutter.directory_name}}/pyproject.toml index bf64fa64..7af1d1a4 100644 --- a/{{cookiecutter.directory_name}}/pyproject.toml +++ b/{{cookiecutter.directory_name}}/pyproject.toml @@ -81,7 +81,7 @@ force_single_line = 1 no_lines_before = ["FUTURE", "STDLIB", "THIRDPARTY", "FIRSTPARTY", "LOCALFOLDER"] known_first_party = "{{ cookiecutter.package_name }}" src_paths = ["{{ cookiecutter.package_name }}", "tests"] -line_length = 79 +line_length = 120 # For completeness, until we move to an src-based layout [tool.setuptools.packages.find]