Merge branch 'materialsvirtuallab:master' into master

materialsvirtuallab · May 24, 2024 · e860e29 · e860e29
2 parents b8f3726 + 7568d6a
commit e860e29
Show file tree

Hide file tree

Showing 14 changed files with 349 additions and 96 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -8,14 +8,14 @@ ci:
 
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.3.5
+    rev: v0.4.3
     hooks:
       - id: ruff
         args: [--fix]
       - id: ruff-format
 
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.5.0
+    rev: v4.6.0
     hooks:
       - id: check-yaml
       - id: end-of-file-fixer
@@ -24,7 +24,7 @@ repos:
         exclude: ^tests
 
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.9.0
+    rev: v1.10.0
     hooks:
       - id: mypy
 
@@ -37,7 +37,7 @@ repos:
         additional_dependencies: [tomli] # needed to read pyproject.toml below py3.11
 
   - repo: https://github.com/MarcoGorelli/cython-lint
-    rev: v0.16.0
+    rev: v0.16.2
     hooks:
       - id: cython-lint
         args: [--no-pycodestyle]
@@ -49,7 +49,7 @@ repos:
       - id: blacken-docs
 
   - repo: https://github.com/igorshubovych/markdownlint-cli
-    rev: v0.39.0
+    rev: v0.40.0
     hooks:
       - id: markdownlint
         # MD013: line too long

diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock
@@ -210,9 +210,9 @@ GEM
       jekyll-feed (~> 0.9)
       jekyll-seo-tag (~> 2.1)
     minitest (5.19.0)
-    nokogiri (1.16.2-arm64-darwin)
+    nokogiri (1.16.5-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.2-x86_64-linux)
+    nokogiri (1.16.5-x86_64-linux)
       racc (~> 1.4)
     octokit (4.25.1)
       faraday (>= 1, < 3)

diff --git a/docs/changelog.md b/docs/changelog.md
@@ -1,5 +1,8 @@
 # Change log
 
+## 2024.5.15
+- Reimplemented support for pickle in MSONAble. (@matthewcarbone)
+
 ## 2024.4.17
 - Revert changes to json.py for now.
 

diff --git a/docs/monty.functools.md b/docs/monty.functools.md
@@ -73,13 +73,10 @@ becomes
 The decorated main accepts two new arguments:
 
 > prof_file: Name of the output file with profiling data
-
 > ```none
 > If not given, a temporary file is created.
 > ```
-
 > sortby: Profiling data are sorted according to this value.
-
 > ```none
 > default is “time”. See sort_stats.
 > ```

diff --git a/docs/monty.os.md b/docs/monty.os.md
@@ -15,7 +15,6 @@ performing some tasks, and returns to the original working directory
 afterwards. E.g.,
 
 > with cd(“/my/path/”):
-
 > ```none
 > do_something()
 > ```

diff --git a/docs/monty.re.md b/docs/monty.re.md
@@ -25,11 +25,9 @@ A powerful regular expression version of grep.
 * **Returns**
 
 > {key1: [[[matches…], lineno], [[matches…], lineno],
-
 > ```none
 > [[matches…], lineno], …],
 > ```
-
 > key2: …}
 
 For reverse reads, the lineno is given as a -ve number. Please note

diff --git a/monty/__init__.py b/monty/__init__.py
@@ -9,7 +9,7 @@
 
 __author__ = "Shyue Ping Ong"
 __copyright__ = "Copyright 2014, The Materials Virtual Lab"
-__version__ = "2024.4.17"
+__version__ = "2024.5.15"
 __maintainer__ = "Shyue Ping Ong"
 __email__ = "ongsp@ucsd.edu"
 __date__ = "Oct 12 2020"
diff --git a/monty/functools.py b/monty/functools.py
@@ -84,7 +84,7 @@ def __init__(self, func: Callable) -> None:
             func: Function to decorate.
         """
         self.__func = func
-        wraps(self.__func)(self)
+        wraps(self.__func)(self)  # type: ignore
 
     def __get__(self, inst: Any, inst_cls) -> Any:
         if inst is None: