Fix test requirements file name

open-telemetry · Apr 17, 2024 · b5a2b6d · b5a2b6d
1 parent fa36331
commit b5a2b6d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/...ion-elasticsearch/test-requirements-6.txt → ...ation-elasticsearch/test-requirements.txt b/...ion-elasticsearch/test-requirements-6.txt → ...ation-elasticsearch/test-requirements.txt
diff --git a/tox.ini b/tox.ini
@@ -76,11 +76,8 @@ envlist =
 
     ; opentelemetry-instrumentation-elasticsearch
     ; FIXME: Elasticsearch >=7 causes CI workflow tests to hang, see open-telemetry/opentelemetry-python-contrib#620
-    ; The numbers at the end of the environment names
-    ; below mean these dependencies are being used:
-    ; 6: elasticsearch-dsl>=6.0,<7.0 elasticsearch>=6.0,<7.0
-    py3{8,9,10,11}-test-instrumentation-elasticsearch-6
-    pypy3-test-instrumentation-elasticsearch-6
+    py3{8,9,10,11}-test-instrumentation-elasticsearch
+    pypy3-test-instrumentation-elasticsearch
 
     ; opentelemetry-instrumentation-falcon
     ; py310 does not work with falcon 1
@@ -448,7 +445,7 @@ commands_pre =
   sqlalchemy-0: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlalchemy/test-requirements-0.txt
   sqlalchemy-1: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlalchemy/test-requirements-1.txt
 
-  elasticsearch-6: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-elasticsearch/test-requirements-6.txt
+  elasticsearch: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-elasticsearch/test-requirements.txt
 
   asyncio: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-asyncio/test-requirements.txt
 
@@ -611,7 +608,7 @@ commands_pre =
   # prerequisite: follow the instructions here https://github.com/PyMySQL/mysqlclient#install
   # for your OS to install the required dependencies
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-mysqlclient/test-requirements.txt
-  pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-elasticsearch/test-requirements-2.txt
+  pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-elasticsearch/test-requirements.txt
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-tornado/test-requirements.txt
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-asyncpg/test-requirements.txt
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pymongo/test-requirements.txt