Merge pull request #7 from radaron/social/HSS-29596-upgrade-python-ve…

…rsion-in-elasticmock

[HSS-29596] Add python 3.9 and 3.10 support

Makefile

@@ -1,4 +1,4 @@
-ELASTICMOCK_VERSION='2.3.0'
+ELASTICMOCK_VERSION='3.0.0'
 
 install:
 	pip install -r requirements.txt

elasticmock/fake_elasticsearch.py

@@ -671,7 +671,7 @@ def search(self, index=None, doc_type=None, body=None, params=None, headers=None
                 else:
                     hits = sorted(hits, key=lambda k: k['_source'][key])
 
-        if 'from' in body and 'size' in body and body['from'] + body['size'] > 0:
+        if body is not None and 'from' in body and 'size' in body and body['from'] + body['size'] > 0:
             hits = hits[body['from']:body['from'] + body['size']]
 
         if 'scroll' in params:

setup.py

@@ -2,7 +2,7 @@
 
 import setuptools
 
-__version__ = '2.3.0'
+__version__ = '3.0.0'
 
 # read the contents of your readme file
 from os import path

tox.ini

@@ -1,14 +1,14 @@
 # content of: tox.ini , put in same dir as setup.py
 [tox]
 envlist =
-    py36-elasticsearch{1,2,5,6,7}
-    py37-elasticsearch{1,2,5,6,7}
     py38-elasticsearch{1,2,5,6,7}
+    py39-elasticsearch{1,2,5,6,7}
+    py310-elasticsearch{1,2,5,6,7}
 
 [testenv]
 deps =
     parameterized
-    pytest==4.6.9
+    pytest==6.2.5
     pytest-cov==2.8.1
     elasticsearch1: elasticsearch ==1.9.0
     elasticsearch2: elasticsearch >=2.0.0, <5.0.0