Merge 71ed4a6 into master

Author: github-actions[bot]

.github/workflows/ci.yml

@@ -21,7 +21,7 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-latest, macos-latest, windows-latest ]
-        python-version: [ 3.8, 3.9, 3.10.0-beta.1 ]
+        python-version: [ 3.8, 3.9, '3.10' ]
 
     steps:
       - uses: actions/checkout@v2

.gitignore

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020 Artёm IG <github.com/rtmigo>
+Copyright (c) 2020-2022 Artёm IG <github.com/rtmigo>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

LICENSE

@@ -3,7 +3,8 @@
 File-based **memoization** decorator. Caches the results of expensive function
 calls. Retains the cached results between program restarts.
 
-CI tests are done in Python 3.8, 3.9 and 3.10-beta.1 on macOS, Ubuntu and Windows.
+CI tests are done in Python 3.8, 3.9 and 3.10 on macOS, Ubuntu and
+Windows.
 
 ---
 
@@ -217,15 +218,14 @@ from filememo import memoize
 
 @lru_cache
 @memoize
-def too_expensive(x):
-    return compute(x)
+def too_expensive():
+    return compute()
 ```
 
 In this example, the `filememo` disk cache will be used to store the results
 between program runs, while the `functools` RAM cache will store the results
 between function calls.
 
 If the data is already in disk cache, and the program is just started, then
-calling `too_expensive(33)` for the first time will read the result for
-argument `33` from disk. Further calls to `too_expensive(33)` will return
-the result from memory.
+calling `too_expensive()` for the first time will read the result from disk.
+Further calls to `too_expensive()` will return the result from memory.

README.md

@@ -1,5 +1,5 @@
-# SPDX-FileCopyrightText: (c) 2020 Artёm IG <github.com/rtmigo>
+# SPDX-FileCopyrightText: (c) 2020-2022 Artёm IG <github.com/rtmigo>
 # SPDX-License-Identifier: MIT
 
 
-from ._deco import memoize
+from ._deco import memoize, FunctionException

filememo/__init__.py

@@ -1 +1,2 @@
-__version__ = '0.3.2'
+__version__ = '0.3.3'
+

filememo/_constants.py

@@ -34,15 +34,16 @@ def _max_to_none(delta: dt.timedelta) -> Optional[dt.timedelta]:
         return delta
 
 
-def _outdated_exc(created: dt.datetime, max_age: Optional[dt.timedelta]):
+def _is_outdated_exception(created: dt.datetime,
+                           max_age: Optional[dt.timedelta]) -> bool:
     if max_age == dt.timedelta.max:
         return False
     if max_age is None:  # means zero
         return True
     return (_utc() - created) > max_age
 
 
-def _outdated_result(created: dt.datetime, max_age: dt.timedelta):
+def _is_outdated_result(created: dt.datetime, max_age: dt.timedelta) -> bool:
     assert max_age is not None
     if max_age == dt.timedelta.max:
         return False
@@ -83,12 +84,13 @@ def f(*args, **kwargs):
             old_exception, old_result = record.data
 
             if old_exception is not None:
-                if not _outdated_exc(record.created, exceptions_max_age):
+                if not _is_outdated_exception(record.created,
+                                              exceptions_max_age):
                     raise FunctionException(old_exception)
             else:
                 assert old_exception is None
                 # we don't need to delete anything on reading
-                if not _outdated_result(record.created, max_age):
+                if not _is_outdated_result(record.created, max_age):
                     return old_result
 
             # we did not return result and did not raise exception.

filememo/_deco.py

@@ -7,7 +7,7 @@
 from typing import Optional, Callable
 
 
-def _md5(s: str):
+def _md5(s: str) -> str:
     return hashlib.md5(s.encode('utf-8')).hexdigest()
 
 

filememo/_dir_for_func.py

@@ -1,2 +1,3 @@
 neatest
-pickledir
+pickledir
+chkpkg

filememo/_indirect_caller.py

@@ -44,6 +44,7 @@ def load_module_dict(filename: str) -> dict:
         # python 3.8 is required by pickledir
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
         "Operating System :: POSIX",
         "Operating System :: Microsoft :: Windows",
     ],

requirements.txt

@@ -5,4 +5,3 @@
         pkg.run_python_code('from filememo import memoize')
 
     print("\nPackage is OK!")
-