Add excludes

open-telemetry · Feb 14, 2024 · a34f196 · a34f196
1 parent c477d94
commit a34f196
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 9 deletions.
diff --git a/.github/workflows/instrumentations_0.yml b/.github/workflows/instrumentations_0.yml
@@ -73,6 +73,35 @@ jobs:
           - "tornado"
           - "tortoiseorm"
         os: [ubuntu-20.04]
+        exclude:
+          - python-version: py39
+            package: "sklearn"
+          - python-version: py310
+            package: "sklearn"
+          - python-version: py311
+            package: "sklearn"
+          - python-version: pypy3
+            package: "aiopg"
+          - python-version: pypy3
+            package: "asyncpg"
+          - python-version: pypy3
+            package: "boto"
+          - python-version: pypy3
+            package: "boto3sqs"
+          - python-version: pypy3
+            package: "botocore"
+          - python-version: pypy3
+            package: "psycopg2"
+          - python-version: pypy3
+            package: "remoulade"
+          - python-version: pypy3
+            package: "requests"
+          - python-version: pypy3
+            package: "sklearn"
+          - python-version: pypy3
+            package: "confluent-kafka"
+          - python-version: pypy3
+            package: "grpc"
     steps:
       - name: Checkout Contrib Repo @ SHA - ${{ github.sha }}
         uses: actions/checkout@v2

diff --git a/.github/workflows/instrumentations_1.yml b/.github/workflows/instrumentations_1.yml
@@ -35,6 +35,11 @@ jobs:
           - "propagator-ot-trace"
           - "resource-detector-container"
         os: [ubuntu-20.04]
+        exclude:
+          - python-version: py311
+            package: "prometheus-remote-write"
+          - python-version: pypy3
+            package: "prometheus-remote-write"
     steps:
       - name: Checkout Contrib Repo @ SHA - ${{ github.sha }}
         uses: actions/checkout@v2

diff --git a/instrumentation/opentelemetry-instrumentation-confluent-kafka/pyproject.toml b/instrumentation/opentelemetry-instrumentation-confluent-kafka/pyproject.toml
@@ -19,9 +19,6 @@ classifiers = [
   "Programming Language :: Python",
   "Programming Language :: Python :: 3",
   "Programming Language :: Python :: 3.8",
-  "Programming Language :: Python :: 3.9",
-  "Programming Language :: Python :: 3.10",
-  "Programming Language :: Python :: 3.11",
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",

diff --git a/tox.ini b/tox.ini
@@ -35,7 +35,8 @@ envlist =
     ; instrumentation-aiopg intentionally excluded from pypy3
 
     ; opentelemetry-instrumentation-aws-lambda
-    py3{8,9}-test-instrumentation-aws-lambda
+    py3{8,9,10,11}-test-instrumentation-aws-lambda
+    pypy3-test-instrumentation-aws-lambda
 
     ; opentelemetry-instrumentation-botocore
     py3{8,9,10,11}-test-instrumentation-botocore
@@ -92,7 +93,7 @@ envlist =
 
     ; opentelemetry-instrumentation-urllib3
     py3{8,9,10,11}-test-instrumentation-urllib3v-{1,2}
-    ;pypy3-test-instrumentation-urllib3v-{1,2}
+    pypy3-test-instrumentation-urllib3v-{1,2}
 
     ; opentelemetry-instrumentation-requests
     py3{8,9,10,11}-test-instrumentation-requests
@@ -112,9 +113,11 @@ envlist =
 
     ; opentelemetry-exporter-richconsole
     py3{8,9,10,11}-test-exporter-richconsole
+    pypy3-test-exporter-richconsole
 
     ; opentelemetry-exporter-prometheus-remote-write
-    py3{6,8,9,10}-test-exporter-prometheus-remote-write
+    py3{6,8,9,10,11}-test-exporter-prometheus-remote-write
+    pypy3-test-exporter-prometheus-remote-write
 
     ; opentelemetry-instrumentation-mysql
     py3{8,9,10,11}-test-instrumentation-mysql
@@ -162,6 +165,7 @@ envlist =
 
     ; opentelemetry-instrumentation-grpc
     py3{8,9,10,11}-test-instrumentation-grpc
+    pypy3-test-instrumentation-grpc
 
     ; opentelemetry-instrumentation-sqlalchemy
     py3{8,9,10,11}-test-instrumentation-sqlalchemy-{14}
@@ -177,7 +181,7 @@ envlist =
 
     ; opentelemetry-instrumentation-celery
     py3{8,9,10,11}-test-instrumentation-celery
-    ; pypy3-test-instrumentation-celery
+    pypy3-test-instrumentation-celery
 
     ; opentelemetry-instrumentation-sklearn
     py3{8}-test-instrumentation-sklearn
@@ -223,8 +227,8 @@ envlist =
     pypy3-test-instrumentation-kafka-python
 
     ; opentelemetry-instrumentation-confluent-kafka
-    ; // FIXME: Enable support for python 3.11 when https://github.com/confluentinc/confluent-kafka-python/issues/1452 is fixed
-    py3{8,9,10}-test-instrumentation-confluent-kafka
+    py3{8,9,10,11}-test-instrumentation-confluent-kafka
+    pypy3-test-instrumentation-confluent-kafka
 
     ; opentelemetry-instrumentation-cassandra
     py3{8,9,10,11}-test-instrumentation-cassandra