Skip to content

More correctly work around uv sync issue with python 3.10+ only dep #43227

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ashb merged 2 commits into from
Oct 21, 2024
Merged

More correctly work around uv sync issue with python 3.10+ only dep #43227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
23d001c
More correctly work around `uv sync` issue with python 3.10+ only dep
ashb Oct 21, 2024
e099fa4
Apply suggestions from code review
ashb Oct 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions generated/provider_dependencies.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,6 +353,7 @@
"cloudant": {
"deps": [
"apache-airflow>=2.8.0",
"ibmcloudant==0.7.0 ; python_version < \"3.10\"",
"ibmcloudant==0.9.1 ; python_version >= \"3.10\""
],
"devel-deps": [],
Expand Down
7 changes: 5 additions & 2 deletions providers/src/airflow/providers/cloudant/provider.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,12 @@ versions:

dependencies:
- apache-airflow>=2.8.0
# Even though 3.9 is excluded below, we need to make this python_version aware so that `uv` can generate a
# full lock file when building lock file from provider sources
# Even though 3.9 is excluded below, we need to make this python_version aware so that `uv` (at least as of
# 0.4.25) can generate a full lock file when building lock file from provider sources. Seeing the duplicate
# dep makes the UV resolver correctly "fork" and try to come up with alternative solutions.
# https://github.com/astral-sh/uv/issues/4668
- 'ibmcloudant==0.9.1 ; python_version >= "3.10"'
- 'ibmcloudant==0.7.0 ; python_version < "3.10"'

excluded-python-versions:
# ibmcloudant transitively brings in urllib3 2.x, but the snowflake provider has a dependency that pins
Expand Down