From 05076c3f402521e12ad8b714f5b2317f54ed6ea6 Mon Sep 17 00:00:00 2001 From: Rene Leonhardt <65483435+reneleonhardt@users.noreply.github.com> Date: Mon, 7 Apr 2025 13:46:49 +0200 Subject: [PATCH 1/5] chore(deps): Support Python 3.13 and drop 3.9 Closes #3037 --- .github/workflows/check_pypi_version.yml | 2 +- .github/workflows/ubuntu-tests.yml | 2 +- .github/workflows/windows-tests.yml | 3 +-- .github/workflows/windows_check_pypi_version.yml | 2 +- CONTRIBUTING.md | 6 +++--- aider/website/docs/install.md | 5 ++--- pyproject.toml | 3 ++- requirements.txt | 12 +++++------- requirements/common-constraints.txt | 12 +++++++----- requirements/pydub.in | 2 ++ requirements/requirements-browser.txt | 3 +-- requirements/requirements-dev.txt | 6 +++++- requirements/requirements-help.in | 10 +++++----- requirements/requirements-help.txt | 8 +++++--- requirements/tree-sitter.in | 1 - scripts/pip-compile.sh | 8 +++++--- 16 files changed, 46 insertions(+), 39 deletions(-) create mode 100644 requirements/pydub.in diff --git a/.github/workflows/check_pypi_version.yml b/.github/workflows/check_pypi_version.yml index b383e87be..7fadeba54 100644 --- a/.github/workflows/check_pypi_version.yml +++ b/.github/workflows/check_pypi_version.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ["3.10", "3.11", "3.12"] + python-version: ["3.10", "3.11", "3.12", "3.13"] steps: - name: Set up Python ${{ matrix.python-version }} diff --git a/.github/workflows/ubuntu-tests.yml b/.github/workflows/ubuntu-tests.yml index 753470af0..a849af008 100644 --- a/.github/workflows/ubuntu-tests.yml +++ b/.github/workflows/ubuntu-tests.yml @@ -25,7 +25,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ["3.10", "3.11", "3.12"] + python-version: ["3.10", "3.11", "3.12", "3.13"] steps: - name: Check out repository diff --git a/.github/workflows/windows-tests.yml b/.github/workflows/windows-tests.yml index f79f84b66..a4dee9e0f 100644 --- a/.github/workflows/windows-tests.yml +++ b/.github/workflows/windows-tests.yml @@ -25,7 +25,7 @@ jobs: runs-on: windows-latest strategy: matrix: - python-version: ["3.10", "3.11", "3.12"] + python-version: ["3.10", "3.11", "3.12", "3.13"] steps: - name: Check out repository @@ -49,4 +49,3 @@ jobs: AIDER_ANALYTICS: false run: | pytest - diff --git a/.github/workflows/windows_check_pypi_version.yml b/.github/workflows/windows_check_pypi_version.yml index 6bd48fdf6..00867282f 100644 --- a/.github/workflows/windows_check_pypi_version.yml +++ b/.github/workflows/windows_check_pypi_version.yml @@ -15,7 +15,7 @@ jobs: runs-on: windows-latest strategy: matrix: - python-version: ["3.10", "3.11", "3.12"] + python-version: ["3.10", "3.11", "3.12", "3.13"] defaults: run: shell: pwsh # Use PowerShell for all run steps diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index abe35a1c0..ea08cd610 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -50,7 +50,7 @@ cd aider It is recommended to create a virtual environment outside of the repository to keep your development environment isolated. -#### Using `venv` (Python 3.9 and later) +#### Using `venv` (Python 3.10 and later) ``` python -m venv /path/to/venv @@ -155,7 +155,7 @@ The built documentation will be available in the `aider/website/_site` directory ### Python Compatibility -Aider supports Python versions 3.9, 3.10, 3.11, and 3.12. When contributing code, ensure compatibility with these supported Python versions. +Aider supports Python versions 3.10, 3.11, 3.12, and 3.13. When contributing code, ensure compatibility with these supported Python versions. ### Code Style @@ -188,7 +188,7 @@ pytest tests/basic/test_coder.py::TestCoder::test_specific_case The project uses GitHub Actions for continuous integration. The testing workflows are defined in the following files: -- `.github/workflows/ubuntu-tests.yml`: Runs tests on Ubuntu for Python versions 3.9 through 3.12. +- `.github/workflows/ubuntu-tests.yml`: Runs tests on Ubuntu for Python versions 3.10 through 3.13. - `.github/workflows/windows-tests.yml`: Runs that on Windows These workflows are triggered on push and pull request events to the `main` branch, ignoring changes to the `aider/website/**` and `README.md` files. diff --git a/aider/website/docs/install.md b/aider/website/docs/install.md index 0ebf1d2e2..5d52a2524 100644 --- a/aider/website/docs/install.md +++ b/aider/website/docs/install.md @@ -75,7 +75,7 @@ python -m pip install pipx # If you need to install pipx pipx install aider-chat ``` -You can use pipx to install aider with python versions 3.9-3.12. +You can use pipx to install aider with python versions 3.10-3.13. Also see the [docs on other methods for installing pipx itself](https://pipx.pypa.io/stable/installation/). @@ -93,7 +93,7 @@ using a to keep aider's dependencies separated. -You can use pip to install aider with python versions 3.9-3.12. +You can use pip to install aider with python versions 3.10-3.13. ```bash python -m pip install -U --upgrade-strategy only-if-needed aider-chat @@ -112,4 +112,3 @@ they often install aider with incorrect dependencies. There are some [optional install steps](/docs/install/optional.html) you could consider. See the [usage instructions](https://aider.chat/docs/usage.html) to start coding with aider. - diff --git a/pyproject.toml b/pyproject.toml index e92d278d4..5569bf2b7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -12,10 +12,11 @@ classifiers = [ "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", + "Programming Language :: Python :: 3.13", "Programming Language :: Python", "Topic :: Software Development", ] -requires-python = ">=3.10,<3.13" +requires-python = ">=3.10,<3.14" dynamic = ["dependencies", "optional-dependencies", "version"] [project.urls] diff --git a/requirements.txt b/requirements.txt index d26543ad1..90b1da5b1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -250,7 +250,7 @@ networkx==3.4.2 # via # -c requirements/common-constraints.txt # -r requirements/requirements.in -numpy==1.26.4 +numpy==2.2.4 # via # -c requirements/common-constraints.txt # scipy @@ -463,9 +463,6 @@ 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 @@ -485,14 +482,12 @@ tree-sitter-yaml==0.7.0 typing-extensions==4.13.2 # via # -c requirements/common-constraints.txt - # anyio # beautifulsoup4 # google-generativeai # huggingface-hub # openai # pydantic # pydantic-core - # referencing # typing-inspection typing-inspection==0.4.0 # via @@ -523,6 +518,9 @@ zipp==3.21.0 # via # -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" + +# 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 122473cc7..8e13c8d73 100644 --- a/requirements/common-constraints.txt +++ b/requirements/common-constraints.txt @@ -282,7 +282,7 @@ nltk==3.9.1 # via llama-index-core nodeenv==1.9.1 # via pre-commit -numpy==1.26.4 +numpy==2.2.4 # via # -r requirements/requirements-help.in # contourpy @@ -295,7 +295,7 @@ numpy==1.26.4 # soundfile # streamlit # transformers -openai==1.75.0 +openai==1.76.0 # via litellm oslex==0.1.3 # via -r requirements/requirements.in @@ -529,7 +529,7 @@ tokenizers==0.21.1 # transformers toml==0.10.2 # via streamlit -torch==2.2.2 +torch==2.6.0 # via # -r requirements/requirements-help.in # sentence-transformers @@ -561,7 +561,6 @@ typer==0.15.3 typing-extensions==4.13.2 # via # altair - # anyio # beautifulsoup4 # google-generativeai # huggingface-hub @@ -570,7 +569,6 @@ typing-extensions==4.13.2 # pydantic # pydantic-core # pyee - # referencing # sentence-transformers # sqlalchemy # streamlit @@ -610,3 +608,7 @@ 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/pydub.in b/requirements/pydub.in new file mode 100644 index 000000000..483a11d83 --- /dev/null +++ b/requirements/pydub.in @@ -0,0 +1,2 @@ +# 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/requirements-browser.txt b/requirements/requirements-browser.txt index 3f9dbbbc5..f455fa4bd 100644 --- a/requirements/requirements-browser.txt +++ b/requirements/requirements-browser.txt @@ -62,7 +62,7 @@ narwhals==1.38.2 # via # -c requirements/common-constraints.txt # altair -numpy==1.26.4 +numpy==2.2.4 # via # -c requirements/common-constraints.txt # pandas @@ -143,7 +143,6 @@ typing-extensions==4.13.2 # via # -c requirements/common-constraints.txt # altair - # referencing # streamlit tzdata==2025.2 # via diff --git a/requirements/requirements-dev.txt b/requirements/requirements-dev.txt index 4d49ef191..2a5ed21ca 100644 --- a/requirements/requirements-dev.txt +++ b/requirements/requirements-dev.txt @@ -143,7 +143,7 @@ nodeenv==1.9.1 # via # -c requirements/common-constraints.txt # pre-commit -numpy==1.26.4 +numpy==2.2.4 # via # -c requirements/common-constraints.txt # contourpy @@ -309,3 +309,7 @@ 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 43e302cca..1bddc8d02 100644 --- a/requirements/requirements-help.in +++ b/requirements/requirements-help.in @@ -1,11 +1,11 @@ llama-index-embeddings-huggingface -# Because sentence-transformers doesn't like >=2 -numpy<2 +# sentence-transformers 4 requires numpy 2 (indirectly through scipy 1.14 which dropped Python 3.9 support) +numpy>=2 -# Mac x86 only supports 2.2.2 +# Drop Mac x86 support # 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 -llama-index-core==0.12.26 \ No newline at end of file +llama-index-core==0.12.26 diff --git a/requirements/requirements-help.txt b/requirements/requirements-help.txt index 2559b273f..3fd49588b 100644 --- a/requirements/requirements-help.txt +++ b/requirements/requirements-help.txt @@ -172,7 +172,7 @@ nltk==3.9.1 # via # -c requirements/common-constraints.txt # llama-index-core -numpy==1.26.4 +numpy==2.2.4 # via # -c requirements/common-constraints.txt # -r requirements/requirements-help.in @@ -273,7 +273,7 @@ tokenizers==0.21.1 # via # -c requirements/common-constraints.txt # transformers -torch==2.2.2 +torch==2.6.0 # via # -c requirements/common-constraints.txt # -r requirements/requirements-help.in @@ -293,7 +293,6 @@ transformers==4.51.3 typing-extensions==4.13.2 # via # -c requirements/common-constraints.txt - # anyio # huggingface-hub # llama-index-core # pydantic @@ -325,3 +324,6 @@ 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 eba2e6770..9ba57296a 100644 --- a/requirements/tree-sitter.in +++ b/requirements/tree-sitter.in @@ -1,3 +1,2 @@ - tree-sitter==0.23.2; python_version < "3.10" tree-sitter==0.24.0; python_version >= "3.10" diff --git a/scripts/pip-compile.sh b/scripts/pip-compile.sh index e1e1e512b..5255afc15 100755 --- a/scripts/pip-compile.sh +++ b/scripts/pip-compile.sh @@ -25,9 +25,11 @@ uv pip compile \ requirements/requirements.in \ $1 -grep -v ^tree-sitter= tmp.requirements.txt \ - | cat - requirements/tree-sitter.in \ - > requirements.txt +{ + grep -v ^tree-sitter= tmp.requirements.txt + echo; cat requirements/tree-sitter.in + echo; cat requirements/pydub.in +} > requirements.txt # Compile additional requirements files SUFFIXES=(dev help browser playwright) From d555e2c71f23be56759418864f0dba6962112562 Mon Sep 17 00:00:00 2001 From: Rene Leonhardt <65483435+reneleonhardt@users.noreply.github.com> Date: Fri, 18 Apr 2025 13:04:16 +0200 Subject: [PATCH 2/5] Workaround uv bug to allow more updates --- requirements.txt | 6 ++++-- requirements/common-constraints.txt | 6 +----- requirements/requirements-dev.txt | 4 ---- requirements/requirements-help.in | 4 ++-- requirements/requirements-help.txt | 9 +++++---- requirements/tree-sitter.in | 3 +-- scripts/pip-compile.sh | 12 ++++++++++++ 7 files changed, 25 insertions(+), 19 deletions(-) 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 + From 3c533bf19301ad40d007b46001eb5c20b7f4ce9c Mon Sep 17 00:00:00 2001 From: Rene Leonhardt <65483435+reneleonhardt@users.noreply.github.com> Date: Fri, 18 Apr 2025 13:57:47 +0200 Subject: [PATCH 3/5] Add Python 3.10 requirements --- requirements.txt | 12 ++++++++++++ requirements/common-constraints.txt | 16 ++++++++++++++++ requirements/requirements-browser.txt | 1 + requirements/requirements-dev.txt | 12 ++++++++++++ requirements/requirements-help.txt | 14 ++++++++++---- 5 files changed, 51 insertions(+), 4 deletions(-) diff --git a/requirements.txt b/requirements.txt index c8f7757a0..2450e733d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -22,6 +22,10 @@ anyio==4.9.0 # httpx # openai # watchfiles +async-timeout==5.0.1 + # via + # -c requirements/common-constraints.txt + # aiohttp attrs==25.3.0 # via # -c requirements/common-constraints.txt @@ -77,6 +81,10 @@ distro==1.9.0 # -c requirements/common-constraints.txt # openai # posthog +exceptiongroup==1.2.2 + # via + # -c requirements/common-constraints.txt + # anyio filelock==3.18.0 # via # -c requirements/common-constraints.txt @@ -485,12 +493,16 @@ tree-sitter-yaml==0.7.0 typing-extensions==4.13.2 # via # -c requirements/common-constraints.txt + # anyio # beautifulsoup4 # google-generativeai # huggingface-hub + # multidict # openai # pydantic # pydantic-core + # referencing + # rich # typing-inspection typing-inspection==0.4.0 # via diff --git a/requirements/common-constraints.txt b/requirements/common-constraints.txt index 40a023aba..1b3e3becd 100644 --- a/requirements/common-constraints.txt +++ b/requirements/common-constraints.txt @@ -18,6 +18,8 @@ anyio==4.9.0 # httpx # openai # watchfiles +async-timeout==5.0.1 + # via aiohttp attrs==25.3.0 # via # aiohttp @@ -93,6 +95,10 @@ distro==1.9.0 # via # openai # posthog +exceptiongroup==1.2.2 + # via + # anyio + # pytest filelock==3.18.0 # via # huggingface-hub @@ -529,6 +535,12 @@ tokenizers==0.21.1 # transformers toml==0.10.2 # via streamlit +tomli==2.2.1 + # via + # build + # pip-tools + # pytest + # pytest-env torch==2.6.0 # via # -r requirements/requirements-help.in @@ -561,14 +573,18 @@ typer==0.15.3 typing-extensions==4.13.2 # via # altair + # anyio # beautifulsoup4 # google-generativeai # huggingface-hub # llama-index-core + # multidict # openai # pydantic # pydantic-core # pyee + # referencing + # rich # sentence-transformers # sqlalchemy # streamlit diff --git a/requirements/requirements-browser.txt b/requirements/requirements-browser.txt index f455fa4bd..7a1f20918 100644 --- a/requirements/requirements-browser.txt +++ b/requirements/requirements-browser.txt @@ -143,6 +143,7 @@ typing-extensions==4.13.2 # via # -c requirements/common-constraints.txt # altair + # referencing # streamlit tzdata==2025.2 # via diff --git a/requirements/requirements-dev.txt b/requirements/requirements-dev.txt index 64166e37b..4891107cd 100644 --- a/requirements/requirements-dev.txt +++ b/requirements/requirements-dev.txt @@ -50,6 +50,10 @@ distlib==0.3.9 # via # -c requirements/common-constraints.txt # virtualenv +exceptiongroup==1.2.2 + # via + # -c requirements/common-constraints.txt + # pytest filelock==3.18.0 # via # -c requirements/common-constraints.txt @@ -281,6 +285,13 @@ six==1.17.0 # via # -c requirements/common-constraints.txt # python-dateutil +tomli==2.2.1 + # via + # -c requirements/common-constraints.txt + # build + # pip-tools + # pytest + # pytest-env typer==0.15.3 # via # -c requirements/common-constraints.txt @@ -288,6 +299,7 @@ typer==0.15.3 typing-extensions==4.13.2 # via # -c requirements/common-constraints.txt + # rich # typer tzdata==2025.2 # via diff --git a/requirements/requirements-help.txt b/requirements/requirements-help.txt index 9ac79b635..0c7d73bd1 100644 --- a/requirements/requirements-help.txt +++ b/requirements/requirements-help.txt @@ -21,6 +21,10 @@ anyio==4.9.0 # via # -c requirements/common-constraints.txt # httpx +async-timeout==5.0.1 + # via + # -c requirements/common-constraints.txt + # aiohttp attrs==25.3.0 # via # -c requirements/common-constraints.txt @@ -60,6 +64,10 @@ dirtyjson==1.0.8 # via # -c requirements/common-constraints.txt # llama-index-core +exceptiongroup==1.2.2 + # via + # -c requirements/common-constraints.txt + # anyio filelock==3.18.0 # via # -c requirements/common-constraints.txt @@ -245,10 +253,6 @@ 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 @@ -297,8 +301,10 @@ transformers==4.51.3 typing-extensions==4.13.2 # via # -c requirements/common-constraints.txt + # anyio # huggingface-hub # llama-index-core + # multidict # pydantic # pydantic-core # sentence-transformers From 8a241a1574084485c8636264ff38d860de2c1ee9 Mon Sep 17 00:00:00 2001 From: Rene Leonhardt <65483435+reneleonhardt@users.noreply.github.com> Date: Wed, 30 Apr 2025 20:30:03 +0200 Subject: [PATCH 4/5] More updates --- requirements.txt | 4 ++-- requirements/common-constraints.txt | 8 ++++---- requirements/requirements-browser.txt | 2 +- requirements/requirements-dev.txt | 2 +- requirements/requirements-help.txt | 6 +++--- scripts/pip-compile.sh | 7 ------- 6 files changed, 11 insertions(+), 18 deletions(-) diff --git a/requirements.txt b/requirements.txt index 2450e733d..baaf4b13a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -258,12 +258,12 @@ networkx==3.4.2 # via # -c requirements/common-constraints.txt # -r requirements/requirements.in -numpy==2.2.4 +numpy==2.2.5 # via # -c requirements/common-constraints.txt # scipy # soundfile -openai==1.75.0 +openai==1.76.2 # via # -c requirements/common-constraints.txt # litellm diff --git a/requirements/common-constraints.txt b/requirements/common-constraints.txt index 1b3e3becd..e3b24e265 100644 --- a/requirements/common-constraints.txt +++ b/requirements/common-constraints.txt @@ -241,7 +241,7 @@ kiwisolver==1.4.8 # via matplotlib litellm==1.68.1 # via -r requirements/requirements.in -llama-index-core==0.12.31 +llama-index-core==0.12.33.post1 # via # -r requirements/requirements-help.in # llama-index-embeddings-huggingface @@ -288,7 +288,7 @@ nltk==3.9.1 # via llama-index-core nodeenv==1.9.1 # via pre-commit -numpy==2.2.4 +numpy==2.2.5 # via # -r requirements/requirements-help.in # contourpy @@ -301,7 +301,7 @@ numpy==2.2.4 # soundfile # streamlit # transformers -openai==1.76.0 +openai==1.76.2 # via litellm oslex==0.1.3 # via -r requirements/requirements.in @@ -541,7 +541,7 @@ tomli==2.2.1 # pip-tools # pytest # pytest-env -torch==2.6.0 +torch==2.7.0 # via # -r requirements/requirements-help.in # sentence-transformers diff --git a/requirements/requirements-browser.txt b/requirements/requirements-browser.txt index 7a1f20918..225313d43 100644 --- a/requirements/requirements-browser.txt +++ b/requirements/requirements-browser.txt @@ -62,7 +62,7 @@ narwhals==1.38.2 # via # -c requirements/common-constraints.txt # altair -numpy==2.2.4 +numpy==2.2.5 # via # -c requirements/common-constraints.txt # pandas diff --git a/requirements/requirements-dev.txt b/requirements/requirements-dev.txt index 4891107cd..54ebcea81 100644 --- a/requirements/requirements-dev.txt +++ b/requirements/requirements-dev.txt @@ -147,7 +147,7 @@ nodeenv==1.9.1 # via # -c requirements/common-constraints.txt # pre-commit -numpy==2.2.4 +numpy==2.2.5 # via # -c requirements/common-constraints.txt # contourpy diff --git a/requirements/requirements-help.txt b/requirements/requirements-help.txt index 0c7d73bd1..79bed6013 100644 --- a/requirements/requirements-help.txt +++ b/requirements/requirements-help.txt @@ -137,7 +137,7 @@ joblib==1.5.0 # -c requirements/common-constraints.txt # nltk # scikit-learn -llama-index-core==0.12.31 +llama-index-core==0.12.33.post1 # via # -c requirements/common-constraints.txt # -r requirements/requirements-help.in @@ -180,7 +180,7 @@ nltk==3.9.1 # via # -c requirements/common-constraints.txt # llama-index-core -numpy==2.2.4 +numpy==2.2.5 # via # -c requirements/common-constraints.txt # -r requirements/requirements-help.in @@ -281,7 +281,7 @@ tokenizers==0.21.1 # via # -c requirements/common-constraints.txt # transformers -torch==2.6.0 +torch==2.7.0 # via # -c requirements/common-constraints.txt # -r requirements/requirements-help.in diff --git a/scripts/pip-compile.sh b/scripts/pip-compile.sh index 5181bcb39..464f0ce34 100755 --- a/scripts/pip-compile.sh +++ b/scripts/pip-compile.sh @@ -48,10 +48,3 @@ 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 - From 9829c21003db76c1208a4b3288d3e1321ec334c6 Mon Sep 17 00:00:00 2001 From: Rene Leonhardt <65483435+reneleonhardt@users.noreply.github.com> Date: Wed, 14 May 2025 20:07:30 +0200 Subject: [PATCH 5/5] More updates --- requirements.txt | 22 ++---------- requirements/common-constraints.txt | 49 ++++++++++----------------- requirements/requirements-browser.txt | 5 ++- requirements/requirements-dev.txt | 20 +++-------- requirements/requirements-help.txt | 31 +++++++---------- 5 files changed, 40 insertions(+), 87 deletions(-) diff --git a/requirements.txt b/requirements.txt index baaf4b13a..146ba4ba8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -22,10 +22,6 @@ anyio==4.9.0 # httpx # openai # watchfiles -async-timeout==5.0.1 - # via - # -c requirements/common-constraints.txt - # aiohttp attrs==25.3.0 # via # -c requirements/common-constraints.txt @@ -81,10 +77,6 @@ distro==1.9.0 # -c requirements/common-constraints.txt # openai # posthog -exceptiongroup==1.2.2 - # via - # -c requirements/common-constraints.txt - # anyio filelock==3.18.0 # via # -c requirements/common-constraints.txt @@ -162,10 +154,6 @@ h11==0.16.0 # via # -c requirements/common-constraints.txt # httpcore -hf-xet==1.1.0 - # via - # -c requirements/common-constraints.txt - # huggingface-hub httpcore==1.0.9 # via # -c requirements/common-constraints.txt @@ -180,7 +168,7 @@ httpx==0.28.1 # -c requirements/common-constraints.txt # litellm # openai -huggingface-hub==0.31.1 +huggingface-hub==0.31.2 # via # -c requirements/common-constraints.txt # tokenizers @@ -221,7 +209,7 @@ jsonschema-specifications==2025.4.1 # via # -c requirements/common-constraints.txt # jsonschema -litellm==1.68.1 +litellm==1.69.2 # via # -c requirements/common-constraints.txt # -r requirements/requirements.in @@ -263,7 +251,7 @@ numpy==2.2.5 # -c requirements/common-constraints.txt # scipy # soundfile -openai==1.76.2 +openai==1.75.0 # via # -c requirements/common-constraints.txt # litellm @@ -493,16 +481,12 @@ tree-sitter-yaml==0.7.0 typing-extensions==4.13.2 # via # -c requirements/common-constraints.txt - # anyio # beautifulsoup4 # google-generativeai # huggingface-hub - # multidict # openai # pydantic # pydantic-core - # referencing - # rich # typing-inspection typing-inspection==0.4.0 # via diff --git a/requirements/common-constraints.txt b/requirements/common-constraints.txt index e3b24e265..8ee774907 100644 --- a/requirements/common-constraints.txt +++ b/requirements/common-constraints.txt @@ -9,6 +9,8 @@ aiohttp==3.11.18 # llama-index-core aiosignal==1.3.2 # via aiohttp +aiosqlite==0.21.0 + # via llama-index-core altair==5.5.0 # via streamlit annotated-types==0.7.0 @@ -18,8 +20,6 @@ anyio==4.9.0 # httpx # openai # watchfiles -async-timeout==5.0.1 - # via aiohttp attrs==25.3.0 # via # aiohttp @@ -95,10 +95,6 @@ distro==1.9.0 # via # openai # posthog -exceptiongroup==1.2.2 - # via - # anyio - # pytest filelock==3.18.0 # via # huggingface-hub @@ -109,7 +105,7 @@ filetype==1.2.0 # via llama-index-core flake8==7.2.0 # via -r requirements/requirements.in -fonttools==4.57.0 +fonttools==4.58.0 # via matplotlib frozenlist==1.6.0 # via @@ -148,7 +144,7 @@ google-auth==2.40.1 # google-generativeai google-auth-httplib2==0.2.0 # via google-api-python-client -google-cloud-bigquery==3.31.0 +google-cloud-bigquery==3.32.0 # via -r requirements/requirements-dev.in google-cloud-core==2.4.3 # via google-cloud-bigquery @@ -178,8 +174,6 @@ grpcio-status==1.71.0 # via google-api-core h11==0.16.0 # via httpcore -hf-xet==1.1.0 - # via huggingface-hub httpcore==1.0.9 # via httpx httplib2==0.22.0 @@ -191,7 +185,7 @@ httpx==0.28.1 # litellm # llama-index-core # openai -huggingface-hub[inference]==0.31.1 +huggingface-hub[inference]==0.31.2 # via # llama-index-embeddings-huggingface # sentence-transformers @@ -239,13 +233,13 @@ jsonschema-specifications==2025.4.1 # via jsonschema kiwisolver==1.4.8 # via matplotlib -litellm==1.68.1 +litellm==1.69.2 # via -r requirements/requirements.in -llama-index-core==0.12.33.post1 +llama-index-core==0.12.35 # via # -r requirements/requirements-help.in # llama-index-embeddings-huggingface -llama-index-embeddings-huggingface==0.5.3 +llama-index-embeddings-huggingface==0.5.4 # via -r requirements/requirements-help.in lox==0.13.0 # via -r requirements/requirements-dev.in @@ -275,7 +269,7 @@ multiprocess==0.70.18 # via pathos mypy-extensions==1.1.0 # via typing-inspect -narwhals==1.38.2 +narwhals==1.39.0 # via altair nest-asyncio==1.6.0 # via llama-index-core @@ -301,7 +295,7 @@ numpy==2.2.5 # soundfile # streamlit # transformers -openai==1.76.2 +openai==1.75.0 # via litellm oslex==0.1.3 # via -r requirements/requirements.in @@ -488,8 +482,10 @@ semver==3.0.4 # via -r requirements/requirements-dev.in sentence-transformers==4.1.0 # via llama-index-embeddings-huggingface -setuptools==80.3.1 - # via pip-tools +setuptools==80.4.0 + # via + # pip-tools + # torch shellingham==1.5.4 # via typer shtab==1.7.2 @@ -513,9 +509,9 @@ soundfile==0.13.1 # via -r requirements/requirements.in soupsieve==2.7 # via beautifulsoup4 -sqlalchemy[asyncio]==2.0.40 +sqlalchemy[asyncio]==2.0.41 # via llama-index-core -streamlit==1.45.0 +streamlit==1.45.1 # via -r requirements/requirements-browser.in sympy==1.14.0 # via torch @@ -535,12 +531,6 @@ tokenizers==0.21.1 # transformers toml==0.10.2 # via streamlit -tomli==2.2.1 - # via - # build - # pip-tools - # pytest - # pytest-env torch==2.7.0 # via # -r requirements/requirements-help.in @@ -568,23 +558,20 @@ tree-sitter-language-pack==0.7.3 # via grep-ast tree-sitter-yaml==0.7.0 # via tree-sitter-language-pack -typer==0.15.3 +typer==0.15.4 # via -r requirements/requirements-dev.in typing-extensions==4.13.2 # via + # aiosqlite # altair - # anyio # beautifulsoup4 # google-generativeai # huggingface-hub # llama-index-core - # multidict # openai # pydantic # pydantic-core # pyee - # referencing - # rich # sentence-transformers # sqlalchemy # streamlit diff --git a/requirements/requirements-browser.txt b/requirements/requirements-browser.txt index 225313d43..41faeba54 100644 --- a/requirements/requirements-browser.txt +++ b/requirements/requirements-browser.txt @@ -58,7 +58,7 @@ markupsafe==3.0.2 # via # -c requirements/common-constraints.txt # jinja2 -narwhals==1.38.2 +narwhals==1.39.0 # via # -c requirements/common-constraints.txt # altair @@ -123,7 +123,7 @@ smmap==5.0.2 # via # -c requirements/common-constraints.txt # gitdb -streamlit==1.45.0 +streamlit==1.45.1 # via # -c requirements/common-constraints.txt # -r requirements/requirements-browser.in @@ -143,7 +143,6 @@ typing-extensions==4.13.2 # via # -c requirements/common-constraints.txt # altair - # referencing # streamlit tzdata==2025.2 # via diff --git a/requirements/requirements-dev.txt b/requirements/requirements-dev.txt index 54ebcea81..9f0ec5b95 100644 --- a/requirements/requirements-dev.txt +++ b/requirements/requirements-dev.txt @@ -50,15 +50,11 @@ distlib==0.3.9 # via # -c requirements/common-constraints.txt # virtualenv -exceptiongroup==1.2.2 - # via - # -c requirements/common-constraints.txt - # pytest filelock==3.18.0 # via # -c requirements/common-constraints.txt # virtualenv -fonttools==4.57.0 +fonttools==4.58.0 # via # -c requirements/common-constraints.txt # matplotlib @@ -73,7 +69,7 @@ google-auth==2.40.1 # google-api-core # google-cloud-bigquery # google-cloud-core -google-cloud-bigquery==3.31.0 +google-cloud-bigquery==3.32.0 # via # -c requirements/common-constraints.txt # -r requirements/requirements-dev.in @@ -273,7 +269,7 @@ semver==3.0.4 # via # -c requirements/common-constraints.txt # -r requirements/requirements-dev.in -setuptools==80.3.1 +setuptools==80.4.0 # via # -c requirements/common-constraints.txt # pip-tools @@ -285,21 +281,13 @@ six==1.17.0 # via # -c requirements/common-constraints.txt # python-dateutil -tomli==2.2.1 - # via - # -c requirements/common-constraints.txt - # build - # pip-tools - # pytest - # pytest-env -typer==0.15.3 +typer==0.15.4 # via # -c requirements/common-constraints.txt # -r requirements/requirements-dev.in typing-extensions==4.13.2 # via # -c requirements/common-constraints.txt - # rich # typer tzdata==2025.2 # via diff --git a/requirements/requirements-help.txt b/requirements/requirements-help.txt index 79bed6013..c00c83314 100644 --- a/requirements/requirements-help.txt +++ b/requirements/requirements-help.txt @@ -13,6 +13,10 @@ aiosignal==1.3.2 # via # -c requirements/common-constraints.txt # aiohttp +aiosqlite==0.21.0 + # via + # -c requirements/common-constraints.txt + # llama-index-core annotated-types==0.7.0 # via # -c requirements/common-constraints.txt @@ -21,10 +25,6 @@ anyio==4.9.0 # via # -c requirements/common-constraints.txt # httpx -async-timeout==5.0.1 - # via - # -c requirements/common-constraints.txt - # aiohttp attrs==25.3.0 # via # -c requirements/common-constraints.txt @@ -64,10 +64,6 @@ dirtyjson==1.0.8 # via # -c requirements/common-constraints.txt # llama-index-core -exceptiongroup==1.2.2 - # via - # -c requirements/common-constraints.txt - # anyio filelock==3.18.0 # via # -c requirements/common-constraints.txt @@ -101,10 +97,6 @@ h11==0.16.0 # via # -c requirements/common-constraints.txt # httpcore -hf-xet==1.1.0 - # via - # -c requirements/common-constraints.txt - # huggingface-hub httpcore==1.0.9 # via # -c requirements/common-constraints.txt @@ -113,7 +105,7 @@ httpx==0.28.1 # via # -c requirements/common-constraints.txt # llama-index-core -huggingface-hub[inference]==0.31.1 +huggingface-hub[inference]==0.31.2 # via # -c requirements/common-constraints.txt # llama-index-embeddings-huggingface @@ -137,12 +129,12 @@ joblib==1.5.0 # -c requirements/common-constraints.txt # nltk # scikit-learn -llama-index-core==0.12.33.post1 +llama-index-core==0.12.35 # via # -c requirements/common-constraints.txt # -r requirements/requirements-help.in # llama-index-embeddings-huggingface -llama-index-embeddings-huggingface==0.5.3 +llama-index-embeddings-huggingface==0.5.4 # via # -c requirements/common-constraints.txt # -r requirements/requirements-help.in @@ -253,11 +245,15 @@ sentence-transformers==4.1.0 # via # -c requirements/common-constraints.txt # llama-index-embeddings-huggingface +setuptools==80.4.0 + # via + # -c requirements/common-constraints.txt + # torch sniffio==1.3.1 # via # -c requirements/common-constraints.txt # anyio -sqlalchemy[asyncio]==2.0.40 +sqlalchemy[asyncio]==2.0.41 # via # -c requirements/common-constraints.txt # llama-index-core @@ -301,10 +297,9 @@ transformers==4.51.3 typing-extensions==4.13.2 # via # -c requirements/common-constraints.txt - # anyio + # aiosqlite # huggingface-hub # llama-index-core - # multidict # pydantic # pydantic-core # sentence-transformers