Merge branch 'master' into remove-elasticsearch-async

beniwohli · web-flow · commit e8ce548e7817 · 2020-10-27T08:36:17.000+01:00
diff --git a/tests/docker-compose.yml b/tests/docker-compose.yml
@@ -78,7 +78,7 @@ services:
       - pyesdata6:/usr/share/elasticsearch/data
 
   elasticsearch7:
-    image: docker.elastic.co/elasticsearch/elasticsearch:7.1.0
+    image: docker.elastic.co/elasticsearch/elasticsearch:7.9.0
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:9200"]
     environment:
diff --git a/tests/instrumentation/asyncio_tests/elasticsearch_async_client_tests.py b/tests/instrumentation/asyncio_tests/elasticsearch_async_client_tests.py
diff --git a/tests/requirements/reqs-elasticsearch-6.txt b/tests/requirements/reqs-elasticsearch-6.txt
@@ -1,3 +1,2 @@
 elasticsearch>=6.0,<7.0
-elasticsearch-async ; python_version >= '3.7'
 -r reqs-base.txt
diff --git a/tests/requirements/reqs-elasticsearch-7.txt b/tests/requirements/reqs-elasticsearch-7.txt
@@ -1,4 +1,3 @@
 elasticsearch>=7.0,<8.0
-elasticsearch-async ; python_version >= '3.7'
 aiohttp ; python_version >= '3.6'
 -r reqs-base.txt

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,2 @@`
`1`	`1`	`elasticsearch>=6.0,<7.0`
`2`		`-elasticsearch-async ; python_version >= '3.7'`
`3`	`2`	`-r reqs-base.txt`