Merge branch 'master' into cmanallen/remove-python-warning

Author: cmanallen

.github/workflows/test-integrations-ai.yml

@@ -29,7 +29,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.7","3.9","3.11","3.12","3.13"]
+        python-version: ["3.7","3.9","3.11","3.12"]
         # python3.6 reached EOL and is no longer being supported on
         # new versions of hosted runners on Github Actions
         # ubuntu-20.04 is the last version that supported python3.6
@@ -101,7 +101,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.8","3.9","3.11","3.12","3.13"]
+        python-version: ["3.8","3.9","3.11","3.12"]
         # python3.6 reached EOL and is no longer being supported on
         # new versions of hosted runners on Github Actions
         # ubuntu-20.04 is the last version that supported python3.6

.github/workflows/test-integrations-network.yml

@@ -29,7 +29,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.8","3.9","3.11","3.12","3.13"]
+        python-version: ["3.9","3.12","3.13"]
         # python3.6 reached EOL and is no longer being supported on
         # new versions of hosted runners on Github Actions
         # ubuntu-20.04 is the last version that supported python3.6

.github/workflows/test-integrations-tasks.yml

@@ -29,7 +29,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.6","3.7","3.8","3.10","3.11","3.12","3.13"]
+        python-version: ["3.7","3.8","3.10","3.11","3.12","3.13"]
         # python3.6 reached EOL and is no longer being supported on
         # new versions of hosted runners on Github Actions
         # ubuntu-20.04 is the last version that supported python3.6
@@ -115,7 +115,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.6","3.7","3.8","3.9","3.10","3.11","3.12"]
+        python-version: ["3.6","3.7","3.8","3.9","3.10","3.11","3.12","3.13"]
         # python3.6 reached EOL and is no longer being supported on
         # new versions of hosted runners on Github Actions
         # ubuntu-20.04 is the last version that supported python3.6

.github/workflows/test-integrations-web-2.yml

@@ -29,7 +29,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.6","3.7","3.8","3.9","3.11","3.12","3.13"]
+        python-version: ["3.8","3.9","3.11","3.12","3.13"]
         # python3.6 reached EOL and is no longer being supported on
         # new versions of hosted runners on Github Actions
         # ubuntu-20.04 is the last version that supported python3.6
@@ -121,7 +121,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.6","3.7","3.8","3.9","3.11","3.12","3.13"]
+        python-version: ["3.6","3.7","3.8","3.9","3.10","3.11","3.12","3.13"]
         # python3.6 reached EOL and is no longer being supported on
         # new versions of hosted runners on Github Actions
         # ubuntu-20.04 is the last version that supported python3.6

scripts/populate_tox/config.py

@@ -13,9 +13,29 @@
         },
         "python": ">=3.8",
     },
+    "bottle": {
+        "package": "bottle",
+        "deps": {
+            "*": ["werkzeug<2.1.0"],
+        },
+    },
+    "celery": {
+        "package": "celery",
+        "deps": {
+            "*": ["newrelic", "redis"],
+            "py3.7": ["importlib-metadata<5.0"],
+        },
+    },
     "clickhouse_driver": {
         "package": "clickhouse-driver",
     },
+    "dramatiq": {
+        "package": "dramatiq",
+    },
+    "falcon": {
+        "package": "falcon",
+        "python": "<3.13",
+    },
     "flask": {
         "package": "flask",
         "deps": {
@@ -33,6 +53,19 @@
             "py3.6": ["aiocontextvars"],
         },
     },
+    "grpc": {
+        "package": "grpcio",
+        "deps": {
+            "*": ["protobuf", "mypy-protobuf", "types-protobuf", "pytest-asyncio"],
+        },
+        "python": ">=3.7",
+    },
+    "huey": {
+        "package": "huey",
+    },
+    "huggingface_hub": {
+        "package": "huggingface_hub",
+    },
     "launchdarkly": {
         "package": "launchdarkly-server-sdk",
     },
@@ -48,9 +81,22 @@
             "*": ["mockupdb"],
         },
     },
+    "pyramid": {
+        "package": "pyramid",
+        "deps": {
+            "*": ["werkzeug<2.1.0"],
+        },
+    },
     "redis_py_cluster_legacy": {
         "package": "redis-py-cluster",
     },
+    "requests": {
+        "package": "requests",
+    },
+    "spark": {
+        "package": "pyspark",
+        "python": ">=3.8",
+    },
     "sqlalchemy": {
         "package": "sqlalchemy",
     },
@@ -70,6 +116,20 @@
             "py3.6": ["aiocontextvars"],
         },
     },
+    "starlite": {
+        "package": "starlite",
+        "deps": {
+            "*": [
+                "pytest-asyncio",
+                "python-multipart",
+                "requests",
+                "cryptography",
+                "pydantic<2.0.0",
+                "httpx<0.28",
+            ],
+        },
+        "python": "<=3.11",
+    },
     "statsig": {
         "package": "statsig",
         "deps": {
@@ -82,6 +142,16 @@
             "*": ["httpx"],
         },
     },
+    "tornado": {
+        "package": "tornado",
+        "deps": {
+            "*": ["pytest"],
+            "<=6.4.1": [
+                "pytest<8.2"
+            ],  # https://github.com/tornadoweb/tornado/pull/3382
+            "py3.6": ["aiocontextvars"],
+        },
+    },
     "trytond": {
         "package": "trytond",
         "deps": {

scripts/populate_tox/populate_tox.py

@@ -58,18 +58,13 @@
     "aws_lambda",
     "beam",
     "boto3",
-    "bottle",
-    "celery",
     "chalice",
     "cohere",
     "cloud_resource_context",
     "cohere",
     "django",
-    "dramatiq",
-    "falcon",
     "fastapi",
     "gcp",
-    "grpc",
     "httpx",
     "huey",
     "huggingface_hub",
@@ -79,16 +74,12 @@
     "openai",
     "openai_notiktoken",
     "pure_eval",
-    "pyramid",
     "quart",
     "ray",
     "redis",
     "requests",
     "rq",
     "sanic",
-    "spark",
-    "starlite",
-    "tornado",
 }