mirror of
https://github.com/Aider-AI/aider.git
synced 2025-06-01 10:14:59 +00:00
Workaround uv bug to allow more updates
This commit is contained in:
parent
05076c3f40
commit
d555e2c71f
7 changed files with 25 additions and 19 deletions
|
@ -463,6 +463,9 @@ tqdm==4.67.1
|
||||||
# google-generativeai
|
# google-generativeai
|
||||||
# huggingface-hub
|
# huggingface-hub
|
||||||
# openai
|
# openai
|
||||||
|
# via
|
||||||
|
# -c requirements/common-constraints.txt
|
||||||
|
# tree-sitter-language-pack
|
||||||
tree-sitter-c-sharp==0.23.1
|
tree-sitter-c-sharp==0.23.1
|
||||||
# via
|
# via
|
||||||
# -c requirements/common-constraints.txt
|
# -c requirements/common-constraints.txt
|
||||||
|
@ -519,8 +522,7 @@ zipp==3.21.0
|
||||||
# -c requirements/common-constraints.txt
|
# -c requirements/common-constraints.txt
|
||||||
# importlib-metadata
|
# importlib-metadata
|
||||||
|
|
||||||
tree-sitter==0.23.2; python_version < "3.10"
|
tree-sitter>=0.24.0
|
||||||
tree-sitter==0.24.0; python_version >= "3.10"
|
|
||||||
|
|
||||||
# Remove if Python 3.13 support https://github.com/jiaaro/pydub/pull/816 gets released
|
# Remove if Python 3.13 support https://github.com/jiaaro/pydub/pull/816 gets released
|
||||||
audioop-lts>=0.2.1; python_version >= "3.13"
|
audioop-lts>=0.2.1; python_version >= "3.13"
|
||||||
|
|
|
@ -235,7 +235,7 @@ kiwisolver==1.4.8
|
||||||
# via matplotlib
|
# via matplotlib
|
||||||
litellm==1.68.1
|
litellm==1.68.1
|
||||||
# via -r requirements/requirements.in
|
# via -r requirements/requirements.in
|
||||||
llama-index-core==0.12.26
|
llama-index-core==0.12.31
|
||||||
# via
|
# via
|
||||||
# -r requirements/requirements-help.in
|
# -r requirements/requirements-help.in
|
||||||
# llama-index-embeddings-huggingface
|
# llama-index-embeddings-huggingface
|
||||||
|
@ -608,7 +608,3 @@ yarl==1.20.0
|
||||||
# via aiohttp
|
# via aiohttp
|
||||||
zipp==3.21.0
|
zipp==3.21.0
|
||||||
# via importlib-metadata
|
# via importlib-metadata
|
||||||
|
|
||||||
# The following packages are considered to be unsafe in a requirements file:
|
|
||||||
# pip
|
|
||||||
# setuptools
|
|
||||||
|
|
|
@ -309,7 +309,3 @@ wheel==0.45.1
|
||||||
# via
|
# via
|
||||||
# -c requirements/common-constraints.txt
|
# -c requirements/common-constraints.txt
|
||||||
# pip-tools
|
# pip-tools
|
||||||
|
|
||||||
# The following packages are considered to be unsafe in a requirements file:
|
|
||||||
# pip
|
|
||||||
# setuptools
|
|
||||||
|
|
|
@ -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
|
# 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
|
torch>2.2.2
|
||||||
|
|
||||||
# Later versions break test_help in GitHub Actions on Windows and Ubuntu
|
# Some llama-index-core versions > 0.12.26 broke test_help in GitHub Actions on Windows and Ubuntu
|
||||||
llama-index-core==0.12.26
|
llama-index-core>=0.12.31
|
||||||
|
|
|
@ -129,7 +129,7 @@ joblib==1.5.0
|
||||||
# -c requirements/common-constraints.txt
|
# -c requirements/common-constraints.txt
|
||||||
# nltk
|
# nltk
|
||||||
# scikit-learn
|
# scikit-learn
|
||||||
llama-index-core==0.12.26
|
llama-index-core==0.12.31
|
||||||
# via
|
# via
|
||||||
# -c requirements/common-constraints.txt
|
# -c requirements/common-constraints.txt
|
||||||
# -r requirements/requirements-help.in
|
# -r requirements/requirements-help.in
|
||||||
|
@ -245,6 +245,10 @@ sentence-transformers==4.1.0
|
||||||
# via
|
# via
|
||||||
# -c requirements/common-constraints.txt
|
# -c requirements/common-constraints.txt
|
||||||
# llama-index-embeddings-huggingface
|
# llama-index-embeddings-huggingface
|
||||||
|
setuptools==78.1.0
|
||||||
|
# via
|
||||||
|
# -c requirements/common-constraints.txt
|
||||||
|
# torch
|
||||||
sniffio==1.3.1
|
sniffio==1.3.1
|
||||||
# via
|
# via
|
||||||
# -c requirements/common-constraints.txt
|
# -c requirements/common-constraints.txt
|
||||||
|
@ -324,6 +328,3 @@ yarl==1.20.0
|
||||||
# via
|
# via
|
||||||
# -c requirements/common-constraints.txt
|
# -c requirements/common-constraints.txt
|
||||||
# aiohttp
|
# aiohttp
|
||||||
|
|
||||||
# The following packages are considered to be unsafe in a requirements file:
|
|
||||||
# setuptools
|
|
||||||
|
|
|
@ -1,2 +1 @@
|
||||||
tree-sitter==0.23.2; python_version < "3.10"
|
tree-sitter>=0.24.0
|
||||||
tree-sitter==0.24.0; python_version >= "3.10"
|
|
||||||
|
|
|
@ -6,8 +6,11 @@ set -e
|
||||||
# Add verbosity flag to see more details about dependency resolution
|
# Add verbosity flag to see more details about dependency resolution
|
||||||
VERBOSITY="-v" # Use -v for less detail, -vvv for even more detail
|
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
|
# First compile the common constraints of the full requirement suite
|
||||||
# to make sure that all versions are mutually consistent across files
|
# to make sure that all versions are mutually consistent across files
|
||||||
|
rm requirements/common-constraints.txt
|
||||||
uv pip compile \
|
uv pip compile \
|
||||||
$VERBOSITY \
|
$VERBOSITY \
|
||||||
--no-strip-extras \
|
--no-strip-extras \
|
||||||
|
@ -17,6 +20,7 @@ uv pip compile \
|
||||||
$1
|
$1
|
||||||
|
|
||||||
# Compile the base requirements
|
# Compile the base requirements
|
||||||
|
rm tmp.requirements.txt
|
||||||
uv pip compile \
|
uv pip compile \
|
||||||
$VERBOSITY \
|
$VERBOSITY \
|
||||||
--no-strip-extras \
|
--no-strip-extras \
|
||||||
|
@ -35,6 +39,7 @@ uv pip compile \
|
||||||
SUFFIXES=(dev help browser playwright)
|
SUFFIXES=(dev help browser playwright)
|
||||||
|
|
||||||
for SUFFIX in "${SUFFIXES[@]}"; do
|
for SUFFIX in "${SUFFIXES[@]}"; do
|
||||||
|
rm requirements/requirements-${SUFFIX}.txt
|
||||||
uv pip compile \
|
uv pip compile \
|
||||||
$VERBOSITY \
|
$VERBOSITY \
|
||||||
--no-strip-extras \
|
--no-strip-extras \
|
||||||
|
@ -43,3 +48,10 @@ for SUFFIX in "${SUFFIXES[@]}"; do
|
||||||
requirements/requirements-${SUFFIX}.in \
|
requirements/requirements-${SUFFIX}.in \
|
||||||
$1
|
$1
|
||||||
done
|
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
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue