Merge pull request #648 from bashtage/pyupgrade-310

Pyupgrade 310

Author: bashtage

README.md

@@ -131,11 +131,11 @@ regression. Currently only the single variable IV estimators are polished.
 
 ### Running
 
--   Python 3.9+
+-   Python 3.10+
 -   NumPy (1.22+)
 -   SciPy (1.8+)
 -   pandas (1.4+)
--   statsmodels (0.12+)
+-   statsmodels (0.13.1+)
 -   formulaic (1.0.0+)
 -   xarray (0.16+, optional)
 -   Cython (3.0.10+, optional)

ci/azure_template_posix.yml

@@ -16,49 +16,42 @@ jobs:
     vmImage: ${{ parameters.vmImage }}
   strategy:
     matrix:
-      python39_minimums:
-        python.version: '3.9'
+      python310_minimums:
+        python.version: '3.10'
         NUMPY: 1.22.3
         SCIPY: 1.8.0
         PANDAS: 1.3.0
-        STATSMODELS: 0.12.0
+        STATSMODELS: 0.13.1
         XARRAY: 0.21.0
-        FORMULAIC: 0.6.5
+        FORMULAIC: 1.0.2
         test.install: true
-      python39_mid:
-        python.version: '3.9'
+      python310_mid:
+        python.version: '3.10'
         NUMPY: 1.23.0
         SCIPY: 1.9.0
         PANDAS: 1.4.0
-        STATSMODELS: 0.13.0
+        STATSMODELS: 0.13.1
         XARRAY: 2022.6.0
         XXHASH: true
-        FORMULAIC: 0.6.5
-        test.install: true
-      python39_recent:
-        python.version: '3.9'
-        NUMPY: 1.24.0
-        SCIPY: 1.10.0
-        PANDAS: 1.5.0
-        STATSMODELS: 0.13.0
-        XARRAY: 2022.12.0
-        FORMULAIC: 0.6.5
+        FORMULAIC: 1.0.2
         test.install: true
-      python310_no_cython:
-        python.version: '3.10'
-        LM_NO_BINARY: 1
       python310_recent:
         python.version: '3.10'
         NUMPY: 1.24.0
         SCIPY: 1.12.0
         PANDAS: 2.0.0
         STATSMODELS: 0.14.0
         XARRAY: 2023.4.0
+        FORMULAIC: 1.1.0
+        test.install: true
       python310_latest:
         python.version: '3.10'
-        FORMULAIC: 1.0.1
+        FORMULAIC: 1.2.0
         XXHASH: true
         PYARROW: true
+      python310_no_cython:
+        python.version: '3.10'
+        LM_NO_BINARY: 1
       python311_latest:
         python.version: '3.11'
         XXHASH: true
@@ -71,7 +64,7 @@ jobs:
         python.version: '3.13'
         XXHASH: true
         PYARROW: true
-      python312_copy_on_write:
+      python313_copy_on_write:
         python.version: '3.12'
         XXHASH: true
         LM_TEST_COPY_ON_WRITE: 1

ci/azure_template_windows.yml

@@ -16,8 +16,6 @@ jobs:
     vmImage: ${{ parameters.vmImage }}
   strategy:
     matrix:
-      python39_win_latest:
-        python.version: '3.9'
       python310_win_latest:
         python.version: '3.10'
       python311_win_latest:
@@ -45,7 +43,7 @@ jobs:
       python -m pip install -r requirements-dev.txt
       jupyter kernelspec list
     displayName: 'Install complete dependencies'
-    condition: ne(variables['python.version'], '3.9')
+    condition: ne(variables['python.version'], '3.10')
 
   - script: |
       python -m pip list

doc/source/changes.rst

@@ -1,7 +1,7 @@
 Change Log
 ==========
 
-.. include:: changes/6.0.rst
+.. include:: changes/7.0.rst
 
 =============
 Past Releases
@@ -10,6 +10,7 @@ Past Releases
 .. toctree::
    :maxdepth: 1
 
+   changes/6.0
    changes/5.0
    changes/4.0
    changes/3.0-2.0-1.0

doc/source/changes/6.0.rst

@@ -4,7 +4,7 @@ Version 6.0
 * Small doc fixes
 * Support Python 3.13
 
-Version 6.0
+Version 6.1
 -----------
 
 * Increased minimums:

doc/source/changes/7.0.rst

@@ -0,0 +1,11 @@
+Version 7.0
+-----------
+
+* Increased minimums:
+
+  - Python: 3.10
+  - formulaic: 1.0.0
+  - NumPy: 1.22.3
+  - SciPy: 1.8.0
+  - pandas: 1.4.0
+  - statsmodels: 0.13.0

linearmodels/asset_pricing/model.py

@@ -4,7 +4,8 @@
 
 from __future__ import annotations
 
-from typing import Any, Callable, cast
+from collections.abc import Callable
+from typing import Any, cast
 
 from formulaic import model_matrix
 from formulaic.materializers.types import NAAction

linearmodels/iv/covariance.py

@@ -4,7 +4,8 @@
 
 from __future__ import annotations
 
-from typing import Any, Callable, Union, cast
+from collections.abc import Callable
+from typing import Any, Union, cast
 
 from mypy_extensions import VarArg
 from numpy import (

linearmodels/iv/model.py

@@ -4,7 +4,8 @@
 
 from __future__ import annotations
 
-from typing import Any, Callable, TypeVar, Union, cast
+from collections.abc import Callable
+from typing import Any, TypeVar, Union, cast
 import warnings
 
 from numpy import (

linearmodels/shared/utility.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 from collections.abc import (
+    Callable,
     ItemsView,
     Iterable,
     Iterator,
@@ -10,7 +11,7 @@
     Sequence,
     ValuesView,
 )
-from typing import Any, Callable, Protocol, TypeVar, cast
+from typing import Any, Protocol, TypeVar, cast
 
 import numpy as np
 import pandas