diff --git a/requirements.txt b/requirements.txt index 90b1da5b1..c8f7757a0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -463,6 +463,9 @@ tqdm==4.67.1 # google-generativeai # huggingface-hub # openai + # via + # -c requirements/common-constraints.txt + # tree-sitter-language-pack tree-sitter-c-sharp==0.23.1 # via # -c requirements/common-constraints.txt @@ -519,8 +522,7 @@ zipp==3.21.0 # -c requirements/common-constraints.txt # importlib-metadata -tree-sitter==0.23.2; python_version < "3.10" -tree-sitter==0.24.0; python_version >= "3.10" +tree-sitter>=0.24.0 # Remove if Python 3.13 support https://github.com/jiaaro/pydub/pull/816 gets released audioop-lts>=0.2.1; python_version >= "3.13" diff --git a/requirements/common-constraints.txt b/requirements/common-constraints.txt index 8e13c8d73..40a023aba 100644 --- a/requirements/common-constraints.txt +++ b/requirements/common-constraints.txt @@ -235,7 +235,7 @@ kiwisolver==1.4.8 # via matplotlib litellm==1.68.1 # via -r requirements/requirements.in -llama-index-core==0.12.26 +llama-index-core==0.12.31 # via # -r requirements/requirements-help.in # llama-index-embeddings-huggingface @@ -608,7 +608,3 @@ yarl==1.20.0 # via aiohttp zipp==3.21.0 # via importlib-metadata - -# The following packages are considered to be unsafe in a requirements file: -# pip -# setuptools diff --git a/requirements/requirements-dev.txt b/requirements/requirements-dev.txt index 2a5ed21ca..64166e37b 100644 --- a/requirements/requirements-dev.txt +++ b/requirements/requirements-dev.txt @@ -309,7 +309,3 @@ wheel==0.45.1 # via # -c requirements/common-constraints.txt # pip-tools - -# The following packages are considered to be unsafe in a requirements file: -# pip -# setuptools diff --git a/requirements/requirements-help.in b/requirements/requirements-help.in index 1bddc8d02..a294fc25d 100644 --- a/requirements/requirements-help.in +++ b/requirements/requirements-help.in @@ -7,5 +7,5 @@ numpy>=2 # https://discuss.pytorch.org/t/why-no-macosx-x86-64-build-after-torch-2-2-2-cp39-none-macosx-10-9-x86-64-whl/204546/2 torch>2.2.2 -# Later versions break test_help in GitHub Actions on Windows and Ubuntu -llama-index-core==0.12.26 +# Some llama-index-core versions > 0.12.26 broke test_help in GitHub Actions on Windows and Ubuntu +llama-index-core>=0.12.31 diff --git a/requirements/requirements-help.txt b/requirements/requirements-help.txt index 3fd49588b..9ac79b635 100644 --- a/requirements/requirements-help.txt +++ b/requirements/requirements-help.txt @@ -129,7 +129,7 @@ joblib==1.5.0 # -c requirements/common-constraints.txt # nltk # scikit-learn -llama-index-core==0.12.26 +llama-index-core==0.12.31 # via # -c requirements/common-constraints.txt # -r requirements/requirements-help.in @@ -245,6 +245,10 @@ sentence-transformers==4.1.0 # via # -c requirements/common-constraints.txt # llama-index-embeddings-huggingface +setuptools==78.1.0 + # via + # -c requirements/common-constraints.txt + # torch sniffio==1.3.1 # via # -c requirements/common-constraints.txt @@ -324,6 +328,3 @@ yarl==1.20.0 # via # -c requirements/common-constraints.txt # aiohttp - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/requirements/tree-sitter.in b/requirements/tree-sitter.in index 9ba57296a..32c5c8159 100644 --- a/requirements/tree-sitter.in +++ b/requirements/tree-sitter.in @@ -1,2 +1 @@ -tree-sitter==0.23.2; python_version < "3.10" -tree-sitter==0.24.0; python_version >= "3.10" +tree-sitter>=0.24.0 diff --git a/scripts/pip-compile.sh b/scripts/pip-compile.sh index 5255afc15..5181bcb39 100755 --- a/scripts/pip-compile.sh +++ b/scripts/pip-compile.sh @@ -6,8 +6,11 @@ set -e # Add verbosity flag to see more details about dependency resolution VERBOSITY="-v" # Use -v for less detail, -vvv for even more detail +# Attention: uv doesn't update to minor releases when output-file exists! + # First compile the common constraints of the full requirement suite # to make sure that all versions are mutually consistent across files +rm requirements/common-constraints.txt uv pip compile \ $VERBOSITY \ --no-strip-extras \ @@ -17,6 +20,7 @@ uv pip compile \ $1 # Compile the base requirements +rm tmp.requirements.txt uv pip compile \ $VERBOSITY \ --no-strip-extras \ @@ -35,6 +39,7 @@ uv pip compile \ SUFFIXES=(dev help browser playwright) for SUFFIX in "${SUFFIXES[@]}"; do + rm requirements/requirements-${SUFFIX}.txt uv pip compile \ $VERBOSITY \ --no-strip-extras \ @@ -43,3 +48,10 @@ for SUFFIX in "${SUFFIXES[@]}"; do requirements/requirements-${SUFFIX}.in \ $1 done + +# There were too many different versions required in torch +# https://github.com/pytorch/pytorch/issues/145225 +# https://github.com/pytorch/pytorch/pull/147197 +# https://github.com/pytorch/pytorch/issues/151312 +sed -i '' 's/^sympy==1.13.1$/sympy==1.13.3/g' requirements/common-constraints.txt requirements/requirements-help.txt +