Fix tox factor matching

Fixes open-telemetry#2128

Author: ocelotl

tox.ini

@@ -58,7 +58,7 @@ envlist =
     py3{7,8,9}-test-instrumentation-django2
     py3{7,8,9,10,11}-test-instrumentation-django3
     py3{8,9,10,11}-test-instrumentation-django4
-    pypy3-test-instrumentation-django{1,2,3}
+    pypy3-test-instrumentation-django-{1,2,3}
 
     ; opentelemetry-instrumentation-dbapi
     py3{7,8,9,10,11}-test-instrumentation-dbapi
@@ -70,8 +70,8 @@ envlist =
     ; pypy3-test-instrumentation-boto
 
     ; opentelemetry-instrumentation-elasticsearch
-    py3{7,8,9,10,11}-test-instrumentation-elasticsearch{2,6}
-    pypy3-test-instrumentation-elasticsearch{2,6}
+    py3{7,8,9,10,11}-test-instrumentation-elasticsearch-{2,6}
+    pypy3-test-instrumentation-elasticsearch-{2,6}
 
     ; opentelemetry-instrumentation-elasticsearch5
     py3{7,8,9}-test-instrumentation-elasticsearch5
@@ -80,25 +80,25 @@ envlist =
     ; opentelemetry-instrumentation-falcon
     ; py310 does not work with falcon 1
     py3{7,8,9}-test-instrumentation-falcon1
-    py3{7,8,9,10,11}-test-instrumentation-falcon{2,3}
-    pypy3-test-instrumentation-falcon{1,2,3}
+    py3{7,8,9,10,11}-test-instrumentation-falcon-{2,3}
+    pypy3-test-instrumentation-falcon-{1,2,3}
 
     ; opentelemetry-instrumentation-fastapi
     py3{7,8,9,10,11}-test-instrumentation-fastapi
     pypy3-test-instrumentation-fastapi
 
     ; opentelemetry-instrumentation-flask
-    py3{7,8,9,10,11}-test-instrumentation-flask{213,220}
-    py3{8,9,10,11}-test-instrumentation-flask{300}
-    pypy3-test-instrumentation-flask{213,220}
+    py3{7,8,9,10,11}-test-instrumentation-flask-{213,220}
+    py3{8,9,10,11}-test-instrumentation-flask-{300}
+    pypy3-test-instrumentation-flask-{213,220}
 
     ; opentelemetry-instrumentation-urllib
     py3{7,8,9,10,11}-test-instrumentation-urllib
     pypy3-test-instrumentation-urllib
 
     ; opentelemetry-instrumentation-urllib3
-    py3{7,8,9,10,11}-test-instrumentation-urllib3v{1,2}
-    ;pypy3-test-instrumentation-urllib3v{1,2}
+    py3{7,8,9,10,11}-test-instrumentation-urllib3v-{1,2}
+    ;pypy3-test-instrumentation-urllib3v-{1,2}
 
     ; opentelemetry-instrumentation-requests
     py3{7,8,9,10,11}-test-instrumentation-requests
@@ -135,8 +135,8 @@ envlist =
     ; ext-psycopg2 intentionally excluded from pypy3
 
     ; opentelemetry-instrumentation-pymemcache
-    py3{7,8,9,10,11}-test-instrumentation-pymemcache{135,200,300,342,400}
-    pypy3-test-instrumentation-pymemcache{135,200,300,342,400}
+    py3{7,8,9,10,11}-test-instrumentation-pymemcache-{135,200,300,342,400}
+    pypy3-test-instrumentation-pymemcache-{135,200,300,342,400}
 
     ; opentelemetry-instrumentation-pymongo
     py3{7,8,9,10,11}-test-instrumentation-pymongo
@@ -170,9 +170,9 @@ envlist =
     py3{7,8,9,10,11}-test-instrumentation-grpc
 
     ; opentelemetry-instrumentation-sqlalchemy
-    py3{7}-test-instrumentation-sqlalchemy{11}
-    py3{7,8,9,10,11}-test-instrumentation-sqlalchemy{14}
-    pypy3-test-instrumentation-sqlalchemy{11,14}
+    py3{7}-test-instrumentation-sqlalchemy-{11}
+    py3{7,8,9,10,11}-test-instrumentation-sqlalchemy-{14}
+    pypy3-test-instrumentation-sqlalchemy-{11,14}
 
     ; opentelemetry-instrumentation-redis
     py3{7,8,9,10,11}-test-instrumentation-redis
@@ -206,8 +206,8 @@ envlist =
     pypy3-test-instrumentation-tortoiseorm
 
     ; opentelemetry-instrumentation-httpx
-    py3{7,8,9,10,11}-test-instrumentation-httpx{18,21}
-    pypy3-test-instrumentation-httpx{18,21}
+    py3{7,8,9,10,11}-test-instrumentation-httpx-{18,21}
+    pypy3-test-instrumentation-httpx-{18,21}
 
     ; opentelemetry-util-http
     py3{7,8,9,10,11}-test-util-http
@@ -222,12 +222,12 @@ envlist =
     pypy3-test-propagator-ot-trace
 
     ; opentelemetry-instrumentation-pika
-    py3{7,8,9,10,11}-test-instrumentation-pika{0,1}
-    pypy3-test-instrumentation-pika{0,1}
+    py3{7,8,9,10,11}-test-instrumentation-pika-{0,1}
+    pypy3-test-instrumentation-pika-{0,1}
 
     ; opentelemetry-instrumentation-aio-pika
-    py3{7,8,9,10,11}-test-instrumentation-aio-pika{7,8,9}
-    pypy3-test-instrumentation-aio-pika{7,8,9}
+    py3{7,8,9,10,11}-test-instrumentation-aio-pika-{7,8,9}
+    pypy3-test-instrumentation-aio-pika-{7,8,9}
 
     ; opentelemetry-instrumentation-kafka-python
     py3{7,8,9,10,11}-test-instrumentation-kafka-python
@@ -285,9 +285,9 @@ deps =
   sqlalchemy14: sqlalchemy~=1.4
   pika0: pika>=0.12.0,<1.0.0
   pika1: pika>=1.0.0
-  aio-pika7: aio_pika~=7.2.0
-  aio-pika8: aio_pika>=8.0.0,<9.0.0
-  aio-pika9: aio_pika>=9.0.0,<10.0.0
+  aio-pika-7: aio_pika~=7.2.0
+  aio-pika-8: aio_pika>=8.0.0,<9.0.0
+  aio-pika-9: aio_pika>=9.0.0,<10.0.0
   pymemcache135: pymemcache ==1.3.5
   pymemcache200: pymemcache >2.0.0,<3.0.0
   pymemcache300: pymemcache >3.0.0,<3.4.2
@@ -325,39 +325,39 @@ changedir =
   test-instrumentation-cassandra: instrumentation/opentelemetry-instrumentation-cassandra/tests
   test-instrumentation-celery: instrumentation/opentelemetry-instrumentation-celery/tests
   test-instrumentation-dbapi: instrumentation/opentelemetry-instrumentation-dbapi/tests
-  test-instrumentation-django{1,2,3,4}: instrumentation/opentelemetry-instrumentation-django/tests
-  test-instrumentation-elasticsearch{2,5,6}: instrumentation/opentelemetry-instrumentation-elasticsearch/tests
-  test-instrumentation-falcon{1,2,3}: instrumentation/opentelemetry-instrumentation-falcon/tests
+  test-instrumentation-django-{1,2,3,4}: instrumentation/opentelemetry-instrumentation-django/tests
+  test-instrumentation-elasticsearch-{2,5,6}: instrumentation/opentelemetry-instrumentation-elasticsearch/tests
+  test-instrumentation-falcon-{1,2,3}: instrumentation/opentelemetry-instrumentation-falcon/tests
   test-instrumentation-fastapi: instrumentation/opentelemetry-instrumentation-fastapi/tests
-  test-instrumentation-flask{213,220,300}: instrumentation/opentelemetry-instrumentation-flask/tests
+  test-instrumentation-flask-{213,220,300}: instrumentation/opentelemetry-instrumentation-flask/tests
   test-instrumentation-urllib: instrumentation/opentelemetry-instrumentation-urllib/tests
-  test-instrumentation-urllib3v{1,2}: instrumentation/opentelemetry-instrumentation-urllib3/tests
+  test-instrumentation-urllib3v-{1,2}: instrumentation/opentelemetry-instrumentation-urllib3/tests
   test-instrumentation-grpc: instrumentation/opentelemetry-instrumentation-grpc/tests
   test-instrumentation-jinja2: instrumentation/opentelemetry-instrumentation-jinja2/tests
   test-instrumentation-kafka-python: instrumentation/opentelemetry-instrumentation-kafka-python/tests
   test-instrumentation-confluent-kafka: instrumentation/opentelemetry-instrumentation-confluent-kafka/tests
   test-instrumentation-logging: instrumentation/opentelemetry-instrumentation-logging/tests
   test-instrumentation-mysql: instrumentation/opentelemetry-instrumentation-mysql/tests
   test-instrumentation-mysqlclient: instrumentation/opentelemetry-instrumentation-mysqlclient/tests
-  test-instrumentation-pika{0,1}: instrumentation/opentelemetry-instrumentation-pika/tests
-  test-instrumentation-aio-pika{7,8,9}: instrumentation/opentelemetry-instrumentation-aio-pika/tests
+  test-instrumentation-pika-{0,1}: instrumentation/opentelemetry-instrumentation-pika/tests
+  test-instrumentation-aio-pika-{7,8,9}: instrumentation/opentelemetry-instrumentation-aio-pika/tests
   test-instrumentation-psycopg2: instrumentation/opentelemetry-instrumentation-psycopg2/tests
-  test-instrumentation-pymemcache{135,200,300,342,400}: instrumentation/opentelemetry-instrumentation-pymemcache/tests
+  test-instrumentation-pymemcache-{135,200,300,342,400}: instrumentation/opentelemetry-instrumentation-pymemcache/tests
   test-instrumentation-pymongo: instrumentation/opentelemetry-instrumentation-pymongo/tests
   test-instrumentation-pymysql: instrumentation/opentelemetry-instrumentation-pymysql/tests
   test-instrumentation-pyramid: instrumentation/opentelemetry-instrumentation-pyramid/tests
   test-instrumentation-redis: instrumentation/opentelemetry-instrumentation-redis/tests
   test-instrumentation-remoulade: instrumentation/opentelemetry-instrumentation-remoulade/tests
   test-instrumentation-requests: instrumentation/opentelemetry-instrumentation-requests/tests
   test-instrumentation-sklearn: instrumentation/opentelemetry-instrumentation-sklearn/tests
-  test-instrumentation-sqlalchemy{11,14}: instrumentation/opentelemetry-instrumentation-sqlalchemy/tests
+  test-instrumentation-sqlalchemy-{11,14}: instrumentation/opentelemetry-instrumentation-sqlalchemy/tests
   test-instrumentation-sqlite3: instrumentation/opentelemetry-instrumentation-sqlite3/tests
   test-instrumentation-starlette: instrumentation/opentelemetry-instrumentation-starlette/tests
   test-instrumentation-system-metrics: instrumentation/opentelemetry-instrumentation-system-metrics/tests
   test-instrumentation-tornado: instrumentation/opentelemetry-instrumentation-tornado/tests
   test-instrumentation-tortoiseorm: instrumentation/opentelemetry-instrumentation-tortoiseorm/tests
   test-instrumentation-wsgi: instrumentation/opentelemetry-instrumentation-wsgi/tests
-  test-instrumentation-httpx{18,21}: instrumentation/opentelemetry-instrumentation-httpx/tests
+  test-instrumentation-httpx-{18,21}: instrumentation/opentelemetry-instrumentation-httpx/tests
   test-util-http: util/opentelemetry-util-http/tests
   test-sdkextension-aws: sdk-extension/opentelemetry-sdk-extension-aws/tests
   test-resource-detector-container: resource/opentelemetry-resource-detector-container/tests
@@ -391,9 +391,9 @@ commands_pre =
 
   grpc: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-grpc[test]
 
-  falcon{1,2,3},flask{213,220,300},django{1,2,3,4},pyramid,tornado,starlette,fastapi,aiohttp,asgi,httpx{18,21},requests,urllib,urllib3v{1,2},wsgi: pip install {toxinidir}/util/opentelemetry-util-http[test]
-  wsgi,falcon{1,2,3},flask{213,220,300},django{1,2,3,4},pyramid: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-wsgi[test]
-  asgi,django{3,4},starlette,fastapi: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-asgi[test]
+  falcon-{1,2,3},flask-{213,220,300},django-{1,2,3,4},pyramid,tornado,starlette,fastapi,aiohttp,asgi,httpx-{18,21},requests,urllib,urllib3v-{1,2},wsgi: pip install {toxinidir}/util/opentelemetry-util-http[test]
+  wsgi,falcon-{1,2,3},flask-{213,220,300},django-{1,2,3,4},pyramid: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-wsgi[test]
+  asgi,django-{3,4},starlette,fastapi: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-asgi[test]
 
   asyncpg: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-asyncpg[test]
 
@@ -404,29 +404,29 @@ commands_pre =
 
   boto3sqs: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-boto3sqs[test]
 
-  falcon{1,2,3}: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-falcon[test]
+  falcon-{1,2,3}: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-falcon[test]
 
-  flask{213,220,300}: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-flask[test]
+  flask-{213,220,300}: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-flask[test]
 
   urllib: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-urllib[test]
 
-  urllib3v{1,2}: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-urllib3[test]
+  urllib3v{-1,2}: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-urllib3[test]
 
   botocore: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-botocore[test]
 
   cassandra: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-cassandra[test]
 
   dbapi: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-dbapi[test]
 
-  django{1,2,3,4}: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-django[test]
+  django-{1,2,3,4}: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-django[test]
 
   fastapi: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-fastapi[test]
 
   mysql: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-dbapi {toxinidir}/instrumentation/opentelemetry-instrumentation-mysql[test]
 
   mysqlclient: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-dbapi {toxinidir}/instrumentation/opentelemetry-instrumentation-mysqlclient[test]
 
-  pymemcache{135,200,300,342,400}: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-pymemcache[test]
+  pymemcache-{135,200,300,342,400}: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-pymemcache[test]
 
   pymongo: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-pymongo[test]
 
@@ -470,11 +470,11 @@ commands_pre =
 
   sklearn: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-sklearn[test]
 
-  sqlalchemy{11,14}: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlalchemy[test]
+  sqlalchemy-{11,14}: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlalchemy[test]
 
-  elasticsearch{2,5,6}: pip install {toxinidir}/opentelemetry-instrumentation[test] {toxinidir}/instrumentation/opentelemetry-instrumentation-elasticsearch[test]
+  elasticsearch-{2,5,6}: pip install {toxinidir}/opentelemetry-instrumentation[test] {toxinidir}/instrumentation/opentelemetry-instrumentation-elasticsearch[test]
 
-  httpx{18,21}: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-httpx[test]
+  httpx-{18,21}: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-httpx[test]
 
   sdkextension-aws: pip install {toxinidir}/sdk-extension/opentelemetry-sdk-extension-aws[test]