testing

.github/workflows/test-python-2.yml

@@ -24,7 +24,8 @@ jobs:
           ${{ matrix.python }} get-pip.py
           ${{ matrix.python }} -m ${{ matrix.pip }} install --user --upgrade pip
           ${{ matrix.python }} -m ${{ matrix.pip }} --no-cache-dir install --user setuptools wheel "urllib3==1.25.11"
-          ${{ matrix.python }} -m ${{ matrix.pip }} --no-cache-dir install --user -e .[tests,elasticsearch5]
+          ${{ matrix.python }} -m ${{ matrix.pip }} --no-cache-dir install git+https://github.com/inspirehep/dictdiffer.git#egg=dictdiffer
+          ${{ matrix.python }} -m ${{ matrix.pip }} --no-cache-dir install --user -e .[tests]
 
       - name: Show python dependencies
         run: |

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

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 = {