Merge pull request #58 from jwodder/pyup

Support Python 3.14; drop support for Python 3.8 & 3.9

Author: jwodder

.github/workflows/test.yml

@@ -19,21 +19,18 @@ jobs:
       fail-fast: false
       matrix:
         python-version:
-          - '3.8'
-          - '3.9'
           - '3.10'
           - '3.11'
           - '3.12'
           - '3.13'
-          - 'pypy-3.8'
-          - 'pypy-3.9'
+          - '3.14'
           - 'pypy-3.10'
           - 'pypy-3.11'
         toxenv: [py]
         include:
-          - python-version: '3.8'
+          - python-version: '3.10'
             toxenv: lint
-          - python-version: '3.8'
+          - python-version: '3.10'
             toxenv: typing
     steps:
       - name: Check out repository

CHANGELOG.md

@@ -1,3 +1,8 @@
+v0.9.0 (in development)
+-----------------------
+- Support Python 3.14
+- Drop support for Python 3.8 and 3.9
+
 v0.8.2 (2024-12-01)
 -------------------
 - Drop support for Python 3.6 and 3.7

README.rst

@@ -38,7 +38,7 @@ programs have been split off into a separate package, |clipkg|_.
 
 Installation
 ============
-``javaproperties`` requires Python 3.8 or higher.  Just use `pip
+``javaproperties`` requires Python 3.10 or higher.  Just use `pip
 <https://pip.pypa.io>`_ for Python 3 (You have pip, right?) to install it::
 
     python3 -m pip install javaproperties

docs/changelog.rst

@@ -3,6 +3,12 @@
 Changelog
 =========
 
+v0.9.0 (in development)
+-----------------------
+- Support Python 3.14
+- Drop support for Python 3.8 and 3.9
+
+
 v0.8.2 (2024-12-01)
 -------------------
 - Drop support for Python 3.6 and 3.7

docs/index.rst

@@ -33,7 +33,7 @@ programs have been split off into a separate package, |clipkg|_.
 
 Installation
 ============
-``javaproperties`` requires Python 3.8 or higher.  Just use `pip
+``javaproperties`` requires Python 3.10 or higher.  Just use `pip
 <https://pip.pypa.io>`_ for Python 3 (You have pip, right?) to install it::
 
     python3 -m pip install javaproperties

pyproject.toml

@@ -7,7 +7,7 @@ name = "javaproperties"
 dynamic = ["version"]
 description = "Read & write Java .properties files"
 readme = "README.rst"
-requires-python = ">=3.8"
+requires-python = ">=3.10"
 license = "MIT"
 license-files = ["LICENSE"]
 authors = [
@@ -26,12 +26,11 @@ keywords = [
 classifiers = [
     "Programming Language :: Python :: 3 :: Only",
     "Programming Language :: Python :: 3",
-    "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 :: 3.13",
+    "Programming Language :: Python :: 3.14",
     "Programming Language :: Python :: Implementation :: CPython",
     "Programming Language :: Python :: Implementation :: PyPy",
     "Intended Audience :: Developers",

src/javaproperties/__init__.py

@@ -36,7 +36,7 @@
 )
 from .xmlprops import dump_xml, dumps_xml, load_xml, loads_xml
 
-__version__ = "0.8.2"
+__version__ = "0.9.0.dev1"
 __author__ = "John Thorvald Wodder II"
 __author_email__ = "javaproperties@varonathe.org"
 __license__ = "MIT"

src/javaproperties/propclass.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
-from collections.abc import Iterable, Iterator, Mapping
-from typing import Any, BinaryIO, IO, MutableMapping, Optional, TextIO, TypeVar
+from collections.abc import Iterable, Iterator, Mapping, MutableMapping
+from typing import Any, BinaryIO, IO, TextIO, TypeVar
 from .reading import load
 from .writing import dump
 from .xmlprops import dump_xml, load_xml
@@ -39,7 +39,7 @@ class Properties(MutableMapping[str, str]):
     def __init__(
         self,
         data: None | Mapping[str, str] | Iterable[tuple[str, str]] = None,
-        defaults: Optional["Properties"] = None,
+        defaults: Properties | None = None,
     ) -> None:
         self.data: dict[str, str] = {}
         #: A `Properties` subobject used as fallback for `getProperty`.  Only
@@ -80,7 +80,7 @@ def __eq__(self, other: Any) -> bool:
         else:
             return NotImplemented
 
-    def getProperty(self, key: str, defaultValue: Optional[T] = None) -> str | T | None:
+    def getProperty(self, key: str, defaultValue: T | None = None) -> str | T | None:
         """
         Fetch the value associated with the key ``key`` in the `Properties`
         instance.  If the key is not present, `defaults` is checked, and then
@@ -141,7 +141,7 @@ def setProperty(self, key: str, value: str) -> None:
         """Equivalent to ``self[key] = value``"""
         self[key] = value
 
-    def store(self, out: TextIO, comments: Optional[str] = None) -> None:
+    def store(self, out: TextIO, comments: str | None = None) -> None:
         """
         Write the `Properties` instance's entries (in unspecified order) in
         ``.properties`` format to ``out``, including the current timestamp.
@@ -188,7 +188,7 @@ def loadFromXML(self, inStream: IO) -> None:
     def storeToXML(
         self,
         out: BinaryIO,
-        comment: Optional[str] = None,
+        comment: str | None = None,
         encoding: str = "UTF-8",
     ) -> None:
         """

src/javaproperties/propfile.py

@@ -1,9 +1,9 @@
 from __future__ import annotations
 from collections import OrderedDict
-from collections.abc import Iterable, Iterator, Mapping
+from collections.abc import Iterable, Iterator, Mapping, MutableMapping, Reversible
 from datetime import datetime
 from io import BytesIO, StringIO
-from typing import Any, AnyStr, IO, MutableMapping, Optional, Reversible, TextIO, cast
+from typing import Any, AnyStr, IO, TextIO, cast
 from .reading import Comment, KeyValue, PropertiesElement, Whitespace, loads, parse
 from .util import CONTINUED_RGX, LinkedList, LinkedListNode, ascii_splitlines
 from .writing import java_timestamp, join_key_value, to_comment
@@ -144,7 +144,7 @@ def __reversed__(self) -> Iterator[str]:
     def __len__(self) -> int:
         return len(self._key2nodes)
 
-    def _comparable(self) -> list[tuple[Optional[str], str]]:
+    def _comparable(self) -> list[tuple[str | None, str]]:
         return [
             (p.key, p.value) if isinstance(p, KeyValue) else (None, p.source)
             for n in self._lines.iternodes()
@@ -312,7 +312,7 @@ def copy(self) -> PropertiesFile:
         return dup
 
     @property
-    def timestamp(self) -> Optional[str]:
+    def timestamp(self) -> str | None:
         """
         .. versionadded:: 0.7.0
 
@@ -397,7 +397,7 @@ def timestamp(self) -> None:
                 return
 
     @property
-    def header_comment(self) -> Optional[str]:
+    def header_comment(self) -> str | None:
         """
         .. versionadded:: 0.7.0
 
@@ -455,7 +455,7 @@ def header_comment(self) -> Optional[str]:
             return None
 
     @header_comment.setter
-    def header_comment(self, value: Optional[str]) -> None:
+    def header_comment(self, value: str | None) -> None:
         if value is None:
             comments = []
         else:

src/javaproperties/reading.py

@@ -1,8 +1,8 @@
 from __future__ import annotations
-from collections.abc import Callable, Iterator
+from collections.abc import Callable, Iterable, Iterator
 from io import BytesIO, StringIO
 import re
-from typing import Any, IO, Iterable, TypeVar, overload
+from typing import Any, IO, TypeVar, overload
 from .util import CONTINUED_RGX, ascii_splitlines
 
 T = TypeVar("T")
@@ -274,8 +274,7 @@ def lineiter() -> Iterator[str]:
                     ll = line
                 if ll == "":
                     return
-                for ln in ascii_splitlines(ll):
-                    yield ln
+                yield from ascii_splitlines(ll)
 
         liter = lineiter()
     for source in liter: