Merge branch 'master' into fix/encoding-detection

Author: weibullguy

.github/workflows/ci.yml

@@ -14,19 +14,18 @@ jobs:
       matrix:
         python-version:
           - "pypy-3.8-v7.3.10"
+          - "3.12"
           - "3.11"
           - "3.10"
           - "3.9"
-          - "3.8"
-          - "3.7"
         os: [ubuntu-latest]
     runs-on: ${{ matrix.os }}
     name: "${{ matrix.os }} Python: ${{ matrix.python-version }}"
     steps:
       - name: Setup Python for tox
         uses: actions/setup-python@v4
         with:
-          python-version: "3.11"
+          python-version: "3.12"
       - name: Install tox
         run: python -m pip install tox tox-gh-actions
       - uses: actions/checkout@v3

.github/workflows/do-lint.yml

@@ -15,7 +15,7 @@ jobs:
       - name: Setup Python for linting
         uses: actions/setup-python@v4
         with:
-          python-version: "3.11"
+          python-version: "3.12"
       - name: Install tox
         run: python -m pip install tox tox-gh-actions
       - uses: actions/checkout@v3

CHANGELOG.md

@@ -1,5 +1,24 @@
 # Changelog
 
+## [v1.7.6](https://github.com/PyCQA/docformatter/tree/v1.7.6) (2025-05-07)
+
+[Full Changelog](https://github.com/PyCQA/docformatter/compare/v1.7.5...v1.7.6)
+
+Features
+
+- prefer new unittest.mock from the standard library [\#280](https://github.com/PyCQA/docformatter/pull/280) ([a-detiste](https://github.com/a-detiste))
+- Handle abbreviation 'etc.' \(et cetera\) [\#273](https://github.com/PyCQA/docformatter/pull/273) ([knedlsepp](https://github.com/knedlsepp))
+
+Bug Fixes
+
+- Do not double-process urls [\#284](https://github.com/PyCQA/docformatter/pull/284) ([lilatomic](https://github.com/lilatomic))
+
+**Merged pull requests:**
+
+- Fix pre-commit syntax [\#266](https://github.com/PyCQA/docformatter/pull/266) ([jonashaag](https://github.com/jonashaag))
+- Update version listed in documentation's Pre-Commit example [\#262](https://github.com/PyCQA/docformatter/pull/262) ([korverdev](https://github.com/korverdev))
+- Add missing comma in requirements table [\#261](https://github.com/PyCQA/docformatter/pull/261) ([EFord36](https://github.com/EFord36))
+
 ## [v1.7.5](https://github.com/PyCQA/docformatter/tree/v1.7.5) (2023-07-12)
 
 [Full Changelog](https://github.com/PyCQA/docformatter/compare/v1.7.4...v1.7.5)
@@ -122,27 +141,10 @@ Bug Fixes
 
 [Full Changelog](https://github.com/PyCQA/docformatter/compare/v1.6.0...v1.6.1)
 
-Bug Fixes
-
-- fix: remove blank lines after line beginning with 'def' [\#171](https://github.com/PyCQA/docformatter/pull/171) ([weibullguy](https://github.com/weibullguy))
-
 ## [v1.6.0](https://github.com/PyCQA/docformatter/tree/v1.6.0) (2023-04-04)
 
 [Full Changelog](https://github.com/PyCQA/docformatter/compare/v1.5.1...v1.6.0)
 
-Features
-
-- \(🎁\) Support python 3.11 [\#164](https://github.com/PyCQA/docformatter/pull/164) ([KotlinIsland](https://github.com/KotlinIsland))
-
-Bug Fixes
-
-- fix: update URL handling functions [\#152](https://github.com/PyCQA/docformatter/pull/152) ([weibullguy](https://github.com/weibullguy))
-
-**Merged pull requests:**
-
-- docs: clarify future arguments [\#168](https://github.com/PyCQA/docformatter/pull/168) ([weibullguy](https://github.com/weibullguy))
-- chore: update GitHub action workflows [\#153](https://github.com/PyCQA/docformatter/pull/153) ([weibullguy](https://github.com/weibullguy))
-
 ## [v1.5.1](https://github.com/PyCQA/docformatter/tree/v1.5.1) (2022-12-16)
 
 [Full Changelog](https://github.com/PyCQA/docformatter/compare/v1.5.0...v1.5.1)

docs/source/conf.py

@@ -11,7 +11,7 @@
 project = "docformatter"
 copyright = "2022-2023, Steven Myint"
 author = "Steven Myint"
-release = "1.7.5"
+release = "1.7.6"
 
 # -- General configuration ---------------------------------------------------
 # https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "docformatter"
-version = "1.7.5"
+version = "1.7.6"
 description = "Formats docstrings to follow PEP 257"
 authors = ["Steven Myint"]
 maintainers = [
@@ -18,11 +18,10 @@ classifiers=[
           'Intended Audience :: Developers',
           'Environment :: Console',
           'Programming Language :: Python :: 3',
-          'Programming Language :: Python :: 3.7',
-          'Programming Language :: Python :: 3.8',
           'Programming Language :: Python :: 3.9',
           'Programming Language :: Python :: 3.10',
           'Programming Language :: Python :: 3.11',
+          'Programming Language :: Python :: 3.12',
           'Programming Language :: Python :: Implementation',
           'Programming Language :: Python :: Implementation :: PyPy',
           'Programming Language :: Python :: Implementation :: CPython',
@@ -37,7 +36,7 @@ charset_normalizer = "^3.0.0"
 tomli = {version = "^2.0.0", python = "<3.11", optional = true}
 untokenize = "^0.1.1"
 
-[tool.poetry.dev-dependencies]
+[poetry.group.dev-dependencies]
 autopep8 = "^2.0.0"
 black = "^22.0.0"
 coverage = {extras = ["toml"], version = "^6.4.0"}
@@ -145,7 +144,7 @@ output = 'coverage.xml'
 
 [tool.black]
 line-length = 88
-target-version = ['py37', 'py38', 'py39', 'py310', 'py311']
+target-version = ['py38', 'py39', 'py310', 'py311']
 include = '\.pyi?$'
 exclude = '''
 /(
@@ -191,11 +190,10 @@ ignore_roles = [
 legacy_tox_ini = """
 [tox]
 envlist =
-    py37
-    py38
     py39
     py310
     py311
+    py312
     pypy3
     coverage
     style
@@ -205,12 +203,11 @@ skipsdist = true
 
 [gh-actions]
 python =
-    3.7: py37
-    3.8: py38
     3.9: py39
     3.10: py310
     3.11: py311
-    pypy-3.8: pypy3
+    3.12: py312
+    pypy-3.10: pypy3
 
 [testenv]
 description = run the test suite using pytest under {basepython}
@@ -255,7 +252,7 @@ commands =
     coverage combine
     coverage report -m
     coverage xml -o {toxworkdir}/coverage.xml
-depends = py37, py38, py39, py310, py311, pypy3
+depends = py39, py310, py311, py312, pypy3
 
 [testenv:style]
 description = run autoformatters and style checkers

src/docformatter/__pkginfo__.py

@@ -23,4 +23,4 @@
 # SOFTWARE.
 """Package information for docformatter."""
 
-__version__ = "1.7.5"
+__version__ = "1.7.6"

src/docformatter/format.py

@@ -334,7 +334,7 @@ def _do_format_code(self, source):
 
             return _strings.normalize_line_endings(
                 _code.splitlines(True), _original_newline
-            )
+            ).rstrip(" ")
         except (tokenize.TokenError, IndentationError):
             return source
 

src/docformatter/strings.py

@@ -101,6 +101,7 @@ def normalize_line(line: str, newline: str) -> str:
         The supplied line with line endings replaced by the newline.
     """
     stripped = line.rstrip("\n\r")
+
     return stripped + newline if stripped != line else line
 
 

tests/_data/string_files/do_format_code.toml

@@ -151,14 +151,14 @@ outstring='''def pytest_addoption(parser: pytest.Parser) -> "
 '''
 
 [issue_97_2]
-instring='''def pytest_addoption(parser: pytest.Parser) -> 
+instring='''def pytest_addoption(parser: pytest.Parser) ->
             None:    # pragma: no cover
-    
+
             register_toggle.pytest_addoption(parser)
 '''
-outstring='''def pytest_addoption(parser: pytest.Parser) -> 
+outstring='''def pytest_addoption(parser: pytest.Parser) ->
             None:    # pragma: no cover
-    
+
             register_toggle.pytest_addoption(parser)
 '''