Upgrade actions and code to python 3.11

inspirehep · Jul 24, 2024 · 8ccd7d6 · 8ccd7d6
1 parent f8eb6ea
commit 8ccd7d6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/inspire_json_merger/postprocess.py b/inspire_json_merger/postprocess.py
@@ -23,7 +23,11 @@
 
 import itertools
 import json
-from collections import Iterable
+
+try:
+    from collections.abc import Iterable
+except ImportError:
+    from collections import Iterable
 
 from json_merger.conflict import Conflict
 from pyrsistent import thaw

diff --git a/setup.py b/setup.py
@@ -50,8 +50,9 @@
     'decorator~=4.0,>=4.1.2',
     'flake8-future-import~=0.0,>=0.4.3',
     'mock~=2.0,>=2.0.0',
-    'pytest-cov~=2.0,>=2.6.1',
-    'pytest~=3.0,>=3.6.0',
+    'pytest-cov~=2.0,>=2.5.1',
+    'pytest~=4.0,>=4.6.0;python_version <= "2.7"',
+    'pytest~=8.0,>=8.0.2;python_version >= "3.6"',
 ]
 
 extras_require = {