Merge pull request #271 from jacebrowning/drop-3.7

Drop support for Python 3.7

Author: jacebrowning

.verchew.ini

@@ -6,7 +6,7 @@ version = GNU Make
 [Python]
 
 cli = python
-version = 3.7 || 3.8 || 3.9 || 3.10
+version = 3.8 || 3.9 || 3.10
 
 [Poetry]
 

CHANGELOG.md

@@ -1,8 +1,12 @@
 # Release Notes
 
+## 2.0 (alpha)
+
+- Dropped support for Python 3.7.
+
 ## 1.4.3 (2022-08-19)
 
-- Fixed handling of unparseable YAML files in manager methods.
+- Fixed handling of invalid YAML files in manager methods.
 
 ## 1.4.2 (2022-07-29)
 

README.md

@@ -101,7 +101,7 @@ Objects can also be restored from the filesystem:
 
 ## Installation
 
-Because datafiles relies on dataclasses and type annotations, Python 3.7+ is required. Install this library directly into an activated virtual environment:
+Install this library directly into an activated virtual environment:
 
 ```
 $ pip install datafiles

datafiles/manager.py

@@ -13,6 +13,7 @@
 import log
 from parse import parse
 from ruamel.yaml.parser import ParserError
+from ruamel.yaml.scanner import ScannerError
 
 from . import hooks
 
@@ -43,8 +44,10 @@ def get(self, *args, **kwargs) -> Model:
             instance = self.model(*args, **kwargs)
             try:
                 instance.datafile.load()
-            except ParserError:
-                log.critical(f"Deleting unparseable YAML: {instance.datafile.path}")
+            except (ParserError, ScannerError) as e:
+                log.critical(
+                    f"Deleting invalid YAML: {instance.datafile.path} ({e.problem})"
+                )
                 instance.datafile.path.unlink()
                 instance.datafile.load()
 

datafiles/tests/test_converters.py

@@ -2,11 +2,10 @@
 
 from dataclasses import dataclass
 from enum import Enum
-from typing import ByteString, Dict, List, Mapping, Optional, Set, Union
+from typing import ByteString, Dict, List, Mapping, Optional, Set, TypedDict, Union
 
 import pytest
 from ruamel.yaml.scalarstring import LiteralScalarString
-from typing_extensions import TypedDict
 
 from datafiles import converters, settings
 

datafiles/tests/test_manager.py

@@ -52,8 +52,9 @@ def when_file_missing(expect, manager):
         def when_file_corrupt(expect, manager):
             instance = manager.get_or_create(foo=2, bar=1)
             instance.datafile.path.write_text("{")
-            instance = manager.get_or_none(foo=2, bar=2)
-            expect(instance).is_(None)
+            instance2 = manager.get_or_none(foo=2, bar=2)
+            expect(instance2).is_(None)
+            expect(instance.datafile.path.is_file()).is_(False)
 
     def describe_get_or_create():
         @patch("datafiles.mapper.Mapper.save")
@@ -76,8 +77,8 @@ def when_file_missing(mock_save, mock_load, expect, manager):
         def when_file_corrupt(expect, manager):
             instance = manager.get_or_create(foo=2, bar=1)
             instance.datafile.path.write_text("{")
-            instance = manager.get_or_create(foo=2, bar=2)
-            expect(instance.bar) == 2
+            instance2 = manager.get_or_create(foo=2, bar=2)
+            expect(instance2.bar) == 2
 
     def describe_all():
         @patch("datafiles.mapper.Mapper.exists", False)