From 6d58f37016f8e41b173d4cf0c2a4e2c9c74fd37f Mon Sep 17 00:00:00 2001 From: Alexander Streed Date: Thu, 5 Sep 2024 21:52:00 -0500 Subject: [PATCH 1/2] Add upper bounds to extras in `setup.py` (#15256) --- setup.py | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/setup.py b/setup.py index 50cf23a465eb7..780986af518d3 100644 --- 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", From 905bef9ff8c34f2baae874938b051d2d81f5facf Mon Sep 17 00:00:00 2001 From: Alexander Streed Date: Thu, 5 Sep 2024 22:08:16 -0500 Subject: [PATCH 2/2] Use `kubernetes` extra when building Docker image (#15257) --- .github/workflows/docker-images.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-images.yaml b/.github/workflows/docker-images.yaml index a53924e12884f..4747edcf8b208 100644 --- 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