Skip to content

Commit 72fa9ba

Browse files
committed
**Description**
Upgrade Apache Airflow to 3.0.4 This commit: 1. Update Apache Airflow from 3.0.1 to 3.0.4 in test_requirements.txt 2. Update Apache Airflow providers to 8.30.0 3. Add Flask-Limiter 2.9.2 to resolve dependency conflicts 4. Modify tox.ini to use development mode installation for sphinx These changes allow the documentation to build successfully while using the latest Apache Airflow version. **Testing Done** Test the command ```tox -e sphinx --parallel all``` and it succeeded.
1 parent e0198b6 commit 72fa9ba

File tree

7 files changed

+49
-12
lines changed

7 files changed

+49
-12
lines changed

doc/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
sphinx==7.2.6
22
sphinx-rtd-theme==3.0.0
33
docutils>=0.18.1,<0.21
4-
packaging>=23.0,<25
4+
packaging>=24.0,<25
55
jinja2==3.1.6
66
schema==0.7.5
77
accelerate>=0.24.1,<=0.27.0

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ dependencies = [
4949
"psutil",
5050
"PyYAML>=6.0.1",
5151
"requests",
52-
"sagemaker-core>=1.0.17,<2.0.0",
52+
"sagemaker-core>=1.0.42,<2.0.0",
5353
"schema",
5454
"smdebug_rulesconfig==1.0.1",
5555
"tblib>=1.7.0,<4",

requirements/constraints.txt

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# Constraints file to resolve dependency conflicts
2+
# This forces specific versions to be used regardless of what other packages require
3+
4+
# Core conflicts
5+
importlib-metadata<7.0
6+
rich>=13.6.0,<14.0.0
7+
Flask-Limiter==2.9.2
8+
9+
# Additional constraints to ensure compatibility
10+
sagemaker-core==1.0.42
11+
apache-airflow==3.0.4
12+
apache-airflow-providers-amazon==8.30.0
13+
14+
# Sphinx dependencies
15+
sphinx==7.2.6
16+
sphinx-rtd-theme==3.0.0
17+
docutils>=0.18.1,<0.21
18+
packaging>=23.0,<25
19+
jinja2==3.1.6
20+
schema==0.7.5
21+
accelerate>=0.24.1,<=0.27.0
22+
graphene<4.0

requirements/extras/test_requirements.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ awslogs==0.14.0
1414
black==24.3.0
1515
stopit==1.1.2
1616
# Update tox.ini to have correct version of airflow constraints file
17-
apache-airflow==3.0.2
18-
apache-airflow-providers-amazon==7.2.1
19-
Flask-Limiter==3.12
17+
apache-airflow==3.0.4
18+
apache-airflow-providers-amazon==8.30.0
19+
Flask-Limiter==2.9.2
2020
attrs>=24,<26
2121
fabric==3.2.2
2222
requests==2.32.2

src/sagemaker/serve/utils/conda_in_process.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ dependencies:
1515
- numpy==1.26.4
1616
- protobuf>=3.12,<5.0
1717
- smdebug_rulesconfig==1.0.1
18-
- importlib-metadata>=1.4.0,<9.0
18+
- importlib-metadata>=1.4.0,<7.0
1919
- packaging>=23.0,<25
2020
- pandas
2121
- pathos
@@ -85,7 +85,8 @@ dependencies:
8585
- pyyaml>=6.0.1
8686
- regex>=2023.3.23
8787
- requests>=2.28.2
88-
- rich>=13.3.4
88+
- rich>=13.3.4,<14.0.0
89+
- safetensors>=0.4.0
8990
- rsa>=4.7.2
9091
- s3transfer>=0.6.0
9192
- sagemaker>=2.148.0

src/sagemaker/serve/utils/in_process_requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ pytz-deprecation-shim>=0.1.0.post0
5353
pyyaml>=6.0.1
5454
regex>=2023.3.23
5555
requests>=2.28.2
56-
rich>=13.3.4
56+
rich>=13.3.4,<14.0.0
5757
rsa>=4.7.2
5858
s3transfer>=0.6.0
5959
sagemaker>=2.148.0

tox.ini

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,14 +82,16 @@ passenv =
8282
# Can be used to specify which tests to run, e.g.: tox -- -s
8383
commands =
8484
python -c "import os; os.system('install-custom-pkgs --install-boto-wheels')"
85-
pip install 'apache-airflow==3.0.2' --constraint "https://raw.githubusercontent.com/apache/airflow/constraints-3.0.2/constraints-3.9.txt"
85+
pip install 'apache-airflow==3.0.4' --constraint "https://raw.githubusercontent.com/apache/airflow/constraints-3.0.4/constraints-3.9.txt"
8686
pip install 'torch==2.3.1+cpu' -f 'https://download.pytorch.org/whl/torch_stable.html'
8787
pip install 'torchvision==0.18.1+cpu' -f 'https://download.pytorch.org/whl/torch_stable.html'
8888
pip install 'dill>=0.3.9'
8989
pip install 'altair>=5.3' # needed for amtviz
9090

9191
pytest {posargs}
92-
deps = .[test]
92+
deps =
93+
-c {toxinidir}/requirements/constraints.txt
94+
.[test]
9395
depends =
9496
{py39,py310,py311,py312}: clean
9597

@@ -138,12 +140,22 @@ commands =
138140

139141
[testenv:sphinx]
140142
pip_version = pip==24.3
143+
skip_install = true
141144
changedir = doc
142145
# pip install requirements.txt is separate as RTD does it in separate steps
143146
# having the requirements.txt installed in deps above results in Double Requirement exception
144147
# https://github.com/pypa/pip/issues/988
148+
deps =
149+
sphinx==7.2.6
150+
sphinx-rtd-theme==3.0.0
151+
docutils>=0.18.1,<0.21
152+
packaging>=23.0,<25
153+
jinja2==3.1.6
154+
schema==0.7.5
155+
accelerate>=0.24.1,<=0.27.0
156+
graphene<4.0
145157
commands =
146-
pip install --exists-action=w -r requirements.txt
158+
pip install -e {toxinidir}
147159
sphinx-build -T -b html -d _build/doctrees-readthedocs -D language=en . _build/html
148160

149161
[testenv:doc8]
@@ -198,6 +210,8 @@ commands =
198210

199211
[testenv:collect-tests]
200212
# this needs to succeed for tests to display in some IDEs
201-
deps = .[test]
213+
skip_install = true
214+
deps =
215+
pytest==6.2.5
202216
commands =
203217
pytest --collect-only

0 commit comments

Comments
 (0)