Merge branch '2.x' into docker-step-cache-key-2.x

PrefectHQ · Sep 6, 2024 · 59f6d35 · 59f6d35
2 parents d606357 + 905bef9
commit 59f6d35
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 18 deletions.
diff --git a/.github/workflows/docker-images.yaml b/.github/workflows/docker-images.yaml
@@ -112,7 +112,7 @@ jobs:
           build-args: |
             PYTHON_VERSION=${{ matrix.python-version }}
             ${{ ( endsWith(matrix.flavor, 'conda') && 'BASE_IMAGE=prefect-conda' ) || '' }}
-            ${{ ( endsWith(matrix.flavor, 'kubernetes') && 'EXTRA_PIP_PACKAGES=prefect-kubernetes' ) || '' }}
+            ${{ ( endsWith(matrix.flavor, 'kubernetes') && 'PREFECT_EXTRAS=[kubernetes]' ) || '' }}
           tags: ${{ join(steps.metadata-dev.outputs.tags) }},${{ join(steps.metadata-prod.outputs.tags) }}
           labels: ${{ steps.metadata-dev.outputs.labels }}
           push: true

diff --git a/setup.py b/setup.py
@@ -43,27 +43,27 @@
     extras_require={
         "dev": dev_requires,
         # Infrastructure extras
-        "aws": "prefect-aws",
-        "azure": "prefect-azure",
-        "gcp": "prefect-gcp",
-        "docker": "prefect-docker",
-        "kubernetes": "prefect-kubernetes",
-        "shell": "prefect-shell",
+        "aws": "prefect-aws<0.5.0",
+        "azure": "prefect-azure<0.4.0",
+        "gcp": "prefect-gcp<0.6.0",
+        "docker": "prefect-docker<0.6.0",
+        "kubernetes": "prefect-kubernetes<0.5.0",
+        "shell": "prefect-shell<0.3.0",
         # Distributed task execution extras
-        "dask": "prefect-dask",
-        "ray": "prefect-ray",
+        "dask": "prefect-dask<0.3.0",
+        "ray": "prefect-ray<0.4.0",
         # Version control extras
-        "bitbucket": "prefect-bitbucket",
-        "github": "prefect-github",
-        "gitlab": "prefect-gitlab",
+        "bitbucket": "prefect-bitbucket<0.3.0",
+        "github": "prefect-github<0.3.0",
+        "gitlab": "prefect-gitlab<0.3.0",
         # Database extras
-        "databricks": "prefect-databricks",
-        "dbt": "prefect-dbt",
-        "snowflake": "prefect-snowflake",
-        "sqlalchemy": "prefect-sqlalchemy",
+        "databricks": "prefect-databricks<0.3.0",
+        "dbt": "prefect-dbt<0.6.0",
+        "snowflake": "prefect-snowflake<0.28.0",
+        "sqlalchemy": "prefect-sqlalchemy<0.5.0",
         # Monitoring extras
-        "email": "prefect-email",
-        "slack": "prefect-slack",
+        "email": "prefect-email<0.4.0",
+        "slack": "prefect-slack<0.3.0",
     },
     classifiers=[
         "Natural Language :: English",