You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by "potiuk (via GitHub)" <gi...@apache.org> on 2024/03/02 08:32:04 UTC
[PR] Fix constraints use in CI image after uv change [airflow]
potiuk opened a new pull request, #37845:
URL: https://github.com/apache/airflow/pull/37845
With the change to switch to uv, we skipped constraints being used in CI image - in effect all PR were not using constraints, but they were using not constraint dependencues but lowest-direct mode of installation so direct dependencies would not be upgraded in such case, only the transitive ones, so the risk of failure was anyhow small even if someone released a new, breakong dependency.
The reason is that `uv` currently does not support installing constraints from URL. We had been silently failing back to the "no-constraints" way in such case (this is default mode if for any reason constraint build fail in such case.
It introduced the risk that in case 3rd-party breaking dependency was released it would also start breaking regular PRs, not only the "canary" build.
We fix it by downloading constraints locally when they are remote and using them from there.
While this is being worked on in https://github.com/astral-sh/uv/pull/2081 and likely to land in uv 0.1.14, it's also a good idea to actually download the constraints and keep them around - this might be handy if you want to later use constraints to install "golden" set of dependencies wihtout necessity to build the right URL - you can always use `${HOME}/constraints.txt`.
This PR fixes it and also changes the fallback mechanism to perform the lowest-direct upgrade only in case the constraint build fails, rather than always run the lowest-dirct upgrade even if constraints install works fine - this will make sure that most PRs are using exactly the constraint version of the dependencies (at least the version of constraints that were generated last time when pyproject.toml changed).
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
regarding copyright ownership. The ASF licenses this file
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
<!--
Thank you for contributing! Please make sure that your code changes
are covered with tests. And in case of new features or big changes
remember to adjust the documentation.
Feel free to ping committers for the review!
In case of an existing issue, reference it using one of the following:
closes: #ISSUE
related: #ISSUE
How to write a good git commit message:
http://chris.beams.io/posts/git-commit/
-->
<!-- Please keep an empty line above the dashes. -->
---
**^ Add meaningful description above**
Read the **[Pull Request Guidelines](https://github.com/apache/airflow/blob/main/contributing-docs/05_pull_requests.rst#pull-request-guidelines)** for more information.
In case of fundamental code changes, an Airflow Improvement Proposal ([AIP](https://cwiki.apache.org/confluence/display/AIRFLOW/Airflow+Improvement+Proposals)) is needed.
In case of a new dependency, check compliance with the [ASF 3rd Party License Policy](https://www.apache.org/legal/resolved.html#category-x).
In case of backwards incompatible changes please leave a note in a newsfragment file, named `{pr_number}.significant.rst` or `{issue_number}.significant.rst`, in [newsfragments](https://github.com/apache/airflow/tree/main/newsfragments).
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Fix constraints use in CI image after uv change [airflow]
Posted by "Taragolis (via GitHub)" <gi...@apache.org>.
Taragolis commented on code in PR #37845:
URL: https://github.com/apache/airflow/pull/37845#discussion_r1509922170
##########
scripts/docker/common.sh:
##########
@@ -95,6 +95,18 @@ function common::get_constraints_location() {
python_version="$(python --version 2>/dev/stdout | cut -d " " -f 2 | cut -d "." -f 1-2)"
AIRFLOW_CONSTRAINTS_LOCATION="${constraints_base}/${AIRFLOW_CONSTRAINTS_MODE}-${python_version}.txt"
fi
+
+ if [[ ${AIRFLOW_CONSTRAINTS_LOCATION} =~ http.* ]]; then
+ echo
+ echo "${COLOR_BLUE}Downloading constraints from ${AIRFLOW_CONSTRAINTS_LOCATION} to ${HOME}/constraints.txt ${COLOR_RESET}"
+ echo
+ curl -o "${HOME}/constraints.txt" "${AIRFLOW_CONSTRAINTS_LOCATION}" >/dev/null
Review Comment:
small nit
```suggestion
curl -s -o "${HOME}/constraints.txt" "${AIRFLOW_CONSTRAINTS_LOCATION}"
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Fix constraints use in CI image after uv change [airflow]
Posted by "potiuk (via GitHub)" <gi...@apache.org>.
potiuk commented on code in PR #37845:
URL: https://github.com/apache/airflow/pull/37845#discussion_r1509938914
##########
scripts/docker/common.sh:
##########
@@ -95,6 +95,18 @@ function common::get_constraints_location() {
python_version="$(python --version 2>/dev/stdout | cut -d " " -f 2 | cut -d "." -f 1-2)"
AIRFLOW_CONSTRAINTS_LOCATION="${constraints_base}/${AIRFLOW_CONSTRAINTS_MODE}-${python_version}.txt"
fi
+
+ if [[ ${AIRFLOW_CONSTRAINTS_LOCATION} =~ http.* ]]; then
+ echo
+ echo "${COLOR_BLUE}Downloading constraints from ${AIRFLOW_CONSTRAINTS_LOCATION} to ${HOME}/constraints.txt ${COLOR_RESET}"
+ echo
+ curl -o "${HOME}/constraints.txt" "${AIRFLOW_CONSTRAINTS_LOCATION}" >/dev/null
Review Comment:
yep. Actually `-sf` is best.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Fix constraints use in CI image after uv change [airflow]
Posted by "potiuk (via GitHub)" <gi...@apache.org>.
potiuk commented on code in PR #37845:
URL: https://github.com/apache/airflow/pull/37845#discussion_r1509940666
##########
scripts/docker/common.sh:
##########
@@ -95,6 +95,18 @@ function common::get_constraints_location() {
python_version="$(python --version 2>/dev/stdout | cut -d " " -f 2 | cut -d "." -f 1-2)"
AIRFLOW_CONSTRAINTS_LOCATION="${constraints_base}/${AIRFLOW_CONSTRAINTS_MODE}-${python_version}.txt"
fi
+
+ if [[ ${AIRFLOW_CONSTRAINTS_LOCATION} =~ http.* ]]; then
+ echo
+ echo "${COLOR_BLUE}Downloading constraints from ${AIRFLOW_CONSTRAINTS_LOCATION} to ${HOME}/constraints.txt ${COLOR_RESET}"
+ echo
+ curl -o "${HOME}/constraints.txt" "${AIRFLOW_CONSTRAINTS_LOCATION}" >/dev/null
Review Comment:
`curl --help all` shows it :)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Fix constraints use in CI image after uv change [airflow]
Posted by "potiuk (via GitHub)" <gi...@apache.org>.
potiuk commented on PR #37845:
URL: https://github.com/apache/airflow/pull/37845#issuecomment-1974752995
Also added a bit nicer diagnostics output for case where initial constraints installation fails because of conflicts (for example when in pyproject.toml we have `fab==4.3.1` and constraints have `fab==4.3.0`
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Fix constraints use in CI image after uv change [airflow]
Posted by "potiuk (via GitHub)" <gi...@apache.org>.
potiuk merged PR #37845:
URL: https://github.com/apache/airflow/pull/37845
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Fix constraints use in CI image after uv change [airflow]
Posted by "Taragolis (via GitHub)" <gi...@apache.org>.
Taragolis commented on code in PR #37845:
URL: https://github.com/apache/airflow/pull/37845#discussion_r1509922790
##########
scripts/docker/common.sh:
##########
@@ -95,6 +95,18 @@ function common::get_constraints_location() {
python_version="$(python --version 2>/dev/stdout | cut -d " " -f 2 | cut -d "." -f 1-2)"
AIRFLOW_CONSTRAINTS_LOCATION="${constraints_base}/${AIRFLOW_CONSTRAINTS_MODE}-${python_version}.txt"
fi
+
+ if [[ ${AIRFLOW_CONSTRAINTS_LOCATION} =~ http.* ]]; then
+ echo
+ echo "${COLOR_BLUE}Downloading constraints from ${AIRFLOW_CONSTRAINTS_LOCATION} to ${HOME}/constraints.txt ${COLOR_RESET}"
+ echo
+ curl -o "${HOME}/constraints.txt" "${AIRFLOW_CONSTRAINTS_LOCATION}" >/dev/null
Review Comment:
Or silent + show error
```suggestion
curl -Ss -o "${HOME}/constraints.txt" "${AIRFLOW_CONSTRAINTS_LOCATION}"
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Fix constraints use in CI image after uv change [airflow]
Posted by "potiuk (via GitHub)" <gi...@apache.org>.
potiuk commented on PR #37845:
URL: https://github.com/apache/airflow/pull/37845#issuecomment-1974711810
Small fix to improve constraints usage with `uv` in our CI / PROD builds.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Fix constraints use in CI image after uv change [airflow]
Posted by "Taragolis (via GitHub)" <gi...@apache.org>.
Taragolis commented on code in PR #37845:
URL: https://github.com/apache/airflow/pull/37845#discussion_r1509940796
##########
scripts/docker/common.sh:
##########
@@ -95,6 +95,18 @@ function common::get_constraints_location() {
python_version="$(python --version 2>/dev/stdout | cut -d " " -f 2 | cut -d "." -f 1-2)"
AIRFLOW_CONSTRAINTS_LOCATION="${constraints_base}/${AIRFLOW_CONSTRAINTS_MODE}-${python_version}.txt"
fi
+
+ if [[ ${AIRFLOW_CONSTRAINTS_LOCATION} =~ http.* ]]; then
+ echo
+ echo "${COLOR_BLUE}Downloading constraints from ${AIRFLOW_CONSTRAINTS_LOCATION} to ${HOME}/constraints.txt ${COLOR_RESET}"
+ echo
+ curl -o "${HOME}/constraints.txt" "${AIRFLOW_CONSTRAINTS_LOCATION}" >/dev/null
Review Comment:
I've always thought that curl has a over 9000 different keys 🤣
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Fix constraints use in CI image after uv change [airflow]
Posted by "potiuk (via GitHub)" <gi...@apache.org>.
potiuk commented on code in PR #37845:
URL: https://github.com/apache/airflow/pull/37845#discussion_r1509940236
##########
scripts/docker/common.sh:
##########
@@ -95,6 +95,18 @@ function common::get_constraints_location() {
python_version="$(python --version 2>/dev/stdout | cut -d " " -f 2 | cut -d "." -f 1-2)"
AIRFLOW_CONSTRAINTS_LOCATION="${constraints_base}/${AIRFLOW_CONSTRAINTS_MODE}-${python_version}.txt"
fi
+
+ if [[ ${AIRFLOW_CONSTRAINTS_LOCATION} =~ http.* ]]; then
+ echo
+ echo "${COLOR_BLUE}Downloading constraints from ${AIRFLOW_CONSTRAINTS_LOCATION} to ${HOME}/constraints.txt ${COLOR_RESET}"
+ echo
+ curl -o "${HOME}/constraints.txt" "${AIRFLOW_CONSTRAINTS_LOCATION}" >/dev/null
Review Comment:
Interesting :
```
root@8d95a3223a2c:/opt/airflow# curl --help
Usage: curl [options...] <url>
-d, --data <data> HTTP POST data
-f, --fail Fail fast with no output on HTTP errors
-h, --help <category> Get help for commands
-i, --include Include protocol response headers in the output
-o, --output <file> Write to file instead of stdout
-O, --remote-name Write output to a file named as the remote file
-s, --silent Silent mode
-T, --upload-file <file> Transfer local FILE to destination
-u, --user <user:password> Server user and password
-A, --user-agent <name> Send User-Agent <name> to server
-v, --verbose Make the operation more talkative
-V, --version Show version number and quit
This is not the full help, this menu is stripped into categories.
Use "--help category" to get an overview of all categories.
For all options use the manual or "--help all".
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Fix constraints use in CI image after uv change [airflow]
Posted by "Taragolis (via GitHub)" <gi...@apache.org>.
Taragolis commented on code in PR #37845:
URL: https://github.com/apache/airflow/pull/37845#discussion_r1509939945
##########
scripts/docker/common.sh:
##########
@@ -95,6 +95,18 @@ function common::get_constraints_location() {
python_version="$(python --version 2>/dev/stdout | cut -d " " -f 2 | cut -d "." -f 1-2)"
AIRFLOW_CONSTRAINTS_LOCATION="${constraints_base}/${AIRFLOW_CONSTRAINTS_MODE}-${python_version}.txt"
fi
+
+ if [[ ${AIRFLOW_CONSTRAINTS_LOCATION} =~ http.* ]]; then
+ echo
+ echo "${COLOR_BLUE}Downloading constraints from ${AIRFLOW_CONSTRAINTS_LOCATION} to ${HOME}/constraints.txt ${COLOR_RESET}"
+ echo
+ curl -o "${HOME}/constraints.txt" "${AIRFLOW_CONSTRAINTS_LOCATION}" >/dev/null
Review Comment:
`-sSf` ???
-S will show an error, e.g.
```console
❯ curl -sSf https2://raw.githubusercontent.com/apache/airflow/constraints-main/constraints-source-providers-3.9.txt
curl: (1) Protocol "https2" not supported or disabled in libcurl
❯ curl -sSf https://raw.githubusercontent.com/apache/airflow/constraints-main/constraints-source-providers-3.13.txt
curl: (22) The requested URL returned error: 404
```
```console
❯ curl -sf https://raw.githubusercontent.com/apache/airflow/constraints-main/constraints-source-providers-3.13.txt
❯ curl -sf https2://raw.githubusercontent.com/apache/airflow/constraints-main/constraints-source-providers-3.9.txt
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Fix constraints use in CI image after uv change [airflow]
Posted by "potiuk (via GitHub)" <gi...@apache.org>.
potiuk commented on code in PR #37845:
URL: https://github.com/apache/airflow/pull/37845#discussion_r1509940462
##########
scripts/docker/common.sh:
##########
@@ -95,6 +95,18 @@ function common::get_constraints_location() {
python_version="$(python --version 2>/dev/stdout | cut -d " " -f 2 | cut -d "." -f 1-2)"
AIRFLOW_CONSTRAINTS_LOCATION="${constraints_base}/${AIRFLOW_CONSTRAINTS_MODE}-${python_version}.txt"
fi
+
+ if [[ ${AIRFLOW_CONSTRAINTS_LOCATION} =~ http.* ]]; then
+ echo
+ echo "${COLOR_BLUE}Downloading constraints from ${AIRFLOW_CONSTRAINTS_LOCATION} to ${HOME}/constraints.txt ${COLOR_RESET}"
+ echo
+ curl -o "${HOME}/constraints.txt" "${AIRFLOW_CONSTRAINTS_LOCATION}" >/dev/null
Review Comment:
Byt yeah. It works like you wrote :)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org