Import certain types from collections.abc

Import of these from `typing` is deprecated from Python 3.9.

message_ix/core.py

@@ -1,8 +1,9 @@
 import logging
 import os
+from collections.abc import Iterable, Mapping, Sequence
 from functools import lru_cache, partial
 from itertools import chain, product, zip_longest
-from typing import Iterable, Mapping, Optional, Sequence, Union
+from typing import Optional, Union
 from warnings import warn
 
 import ixmp

message_ix/macro.py

@@ -1,19 +1,11 @@
 import logging
 import os
+from collections.abc import Collection, Hashable, Iterable, Mapping, MutableMapping
 from dataclasses import dataclass
 from functools import partial
 from operator import itemgetter, mul
 from pathlib import Path
-from typing import (
-    TYPE_CHECKING,
-    Collection,
-    Hashable,
-    Iterable,
-    Mapping,
-    MutableMapping,
-    Optional,
-    Union,
-)
+from typing import TYPE_CHECKING, Optional, Union
 
 import numpy as np
 import pandas as pd

message_ix/models.py

@@ -1,10 +1,11 @@
 import logging
 from collections import ChainMap
+from collections.abc import Mapping, MutableMapping
 from copy import copy
 from dataclasses import InitVar, dataclass, field
 from functools import partial
 from pathlib import Path
-from typing import Mapping, MutableMapping, Optional
+from typing import Optional
 from warnings import warn
 
 import ixmp.model.gams

message_ix/report/__init__.py

@@ -1,7 +1,8 @@
 import logging
+from collections.abc import Mapping
 from functools import lru_cache, partial
 from operator import itemgetter
-from typing import TYPE_CHECKING, Mapping, Union, cast
+from typing import TYPE_CHECKING, Union, cast
 
 from genno.operator import broadcast_map
 from ixmp.report import (

message_ix/report/operator.py

@@ -1,9 +1,5 @@
-from typing import (
-    TYPE_CHECKING,
-    Literal,
-    Mapping,
-    overload,
-)
+from collections.abc import Mapping
+from typing import TYPE_CHECKING, Literal, overload
 
 import pandas as pd
 

message_ix/testing/__init__.py

@@ -1,8 +1,9 @@
 import io
 import os
+from collections.abc import Generator
 from itertools import product
 from pathlib import Path
-from typing import TYPE_CHECKING, Generator, Optional, Union
+from typing import TYPE_CHECKING, Optional, Union
 
 import numpy as np
 import pandas as pd

message_ix/tests/report/test_operator.py

@@ -1,5 +1,6 @@
+from collections.abc import Mapping
 from functools import partial
-from typing import Any, Mapping
+from typing import Any
 
 import matplotlib
 import pandas as pd

message_ix/tests/test_feature_vintage_and_active_years.py

@@ -1,5 +1,6 @@
+from collections.abc import Sequence
 from functools import lru_cache
-from typing import Optional, Sequence
+from typing import Optional
 
 import numpy as np
 import pandas as pd