Merge branch 'fix-requirements-conflicts' of github.com:claui/aider into claui-fix-requirements-conflicts

requirements/requirements-dev.txt

@@ -2,234 +2,310 @@
 # This file is autogenerated by pip-compile with Python 3.12
 # by the following command:
 #
-#    pip-compile --allow-unsafe --constraint=requirements.txt --output-file=requirements/requirements-dev.txt requirements/requirements-dev.in
+#    pip-compile --allow-unsafe --constraint=requirements/common-constraints.txt --output-file=requirements/requirements-dev.txt requirements/requirements-dev.in
 #
 alabaster==1.0.0
-    # via sphinx
+    # via
+    #   -c requirements/common-constraints.txt
+    #   sphinx
 babel==2.17.0
-    # via sphinx
+    # via
+    #   -c requirements/common-constraints.txt
+    #   sphinx
 build==1.2.2.post1
-    # via pip-tools
+    # via
+    #   -c requirements/common-constraints.txt
+    #   pip-tools
 certifi==2025.1.31
     # via
-    #   -c /Users/gauthier/Projects/aider/requirements.txt
-    #   -c requirements.txt
+    #   -c requirements/common-constraints.txt
     #   requests
 cfgv==3.4.0
-    # via pre-commit
+    # via
+    #   -c requirements/common-constraints.txt
+    #   pre-commit
 charset-normalizer==3.4.1
     # via
-    #   -c /Users/gauthier/Projects/aider/requirements.txt
-    #   -c requirements.txt
+    #   -c requirements/common-constraints.txt
     #   requests
 click==8.1.8
     # via
-    #   -c /Users/gauthier/Projects/aider/requirements.txt
-    #   -c requirements.txt
+    #   -c requirements/common-constraints.txt
     #   pip-tools
     #   typer
 codespell==2.4.1
-    # via -r requirements/requirements-dev.in
+    # via
+    #   -c requirements/common-constraints.txt
+    #   -r requirements/requirements-dev.in
 cogapp==3.4.1
-    # via -r requirements/requirements-dev.in
+    # via
+    #   -c requirements/common-constraints.txt
+    #   -r requirements/requirements-dev.in
 contourpy==1.3.1
-    # via matplotlib
+    # via
+    #   -c requirements/common-constraints.txt
+    #   matplotlib
 cycler==0.12.1
-    # via matplotlib
+    # via
+    #   -c requirements/common-constraints.txt
+    #   matplotlib
 dill==0.3.9
     # via
+    #   -c requirements/common-constraints.txt
     #   multiprocess
     #   pathos
 distlib==0.3.9
-    # via virtualenv
+    # via
+    #   -c requirements/common-constraints.txt
+    #   virtualenv
 docutils==0.21.2
     # via
+    #   -c requirements/common-constraints.txt
     #   sphinx
     #   sphinx-rtd-theme
 filelock==3.17.0
     # via
-    #   -c /Users/gauthier/Projects/aider/requirements.txt
-    #   -c requirements.txt
+    #   -c requirements/common-constraints.txt
     #   virtualenv
 fonttools==4.56.0
-    # via matplotlib
+    # via
+    #   -c requirements/common-constraints.txt
+    #   matplotlib
 identify==2.6.8
-    # via pre-commit
+    # via
+    #   -c requirements/common-constraints.txt
+    #   pre-commit
 idna==3.10
     # via
-    #   -c /Users/gauthier/Projects/aider/requirements.txt
-    #   -c requirements.txt
+    #   -c requirements/common-constraints.txt
     #   requests
 imagesize==1.4.1
-    # via sphinx
+    # via
+    #   -c requirements/common-constraints.txt
+    #   sphinx
 imgcat==0.6.0
-    # via -r requirements/requirements-dev.in
+    # via
+    #   -c requirements/common-constraints.txt
+    #   -r requirements/requirements-dev.in
 iniconfig==2.0.0
-    # via pytest
+    # via
+    #   -c requirements/common-constraints.txt
+    #   pytest
 jinja2==3.1.5
     # via
-    #   -c /Users/gauthier/Projects/aider/requirements.txt
-    #   -c requirements.txt
+    #   -c requirements/common-constraints.txt
     #   sphinx
 kiwisolver==1.4.8
-    # via matplotlib
+    # via
+    #   -c requirements/common-constraints.txt
+    #   matplotlib
 lox==0.12.0
-    # via -r requirements/requirements-dev.in
+    # via
+    #   -c requirements/common-constraints.txt
+    #   -r requirements/requirements-dev.in
 markdown-it-py==3.0.0
     # via
-    #   -c /Users/gauthier/Projects/aider/requirements.txt
-    #   -c requirements.txt
+    #   -c requirements/common-constraints.txt
     #   rich
 markupsafe==3.0.2
     # via
-    #   -c /Users/gauthier/Projects/aider/requirements.txt
-    #   -c requirements.txt
+    #   -c requirements/common-constraints.txt
     #   jinja2
 matplotlib==3.10.1
     # via -r requirements/requirements-dev.in
 mdurl==0.1.2
     # via
-    #   -c /Users/gauthier/Projects/aider/requirements.txt
-    #   -c requirements.txt
+    #   -c requirements/common-constraints.txt
     #   markdown-it-py
 multiprocess==0.70.17
-    # via pathos
+    # via
+    #   -c requirements/common-constraints.txt
+    #   pathos
 nodeenv==1.9.1
-    # via pre-commit
+    # via
+    #   -c requirements/common-constraints.txt
+    #   pre-commit
 numpy==1.26.4
     # via
-    #   -c /Users/gauthier/Projects/aider/requirements.txt
-    #   -c requirements.txt
+    #   -c requirements/common-constraints.txt
     #   contourpy
     #   matplotlib
     #   pandas
 packaging==24.2
     # via
-    #   -c /Users/gauthier/Projects/aider/requirements.txt
-    #   -c requirements.txt
+    #   -c requirements/common-constraints.txt
     #   build
     #   matplotlib
     #   pytest
     #   sphinx
 pandas==2.2.3
-    # via -r requirements/requirements-dev.in
+    # via
+    #   -c requirements/common-constraints.txt
+    #   -r requirements/requirements-dev.in
 pathos==0.3.3
-    # via lox
+    # via
+    #   -c requirements/common-constraints.txt
+    #   lox
 pillow==10.4.0
     # via
-    #   -c /Users/gauthier/Projects/aider/requirements.txt
-    #   -c requirements.txt
+    #   -c requirements/common-constraints.txt
     #   matplotlib
 pip-tools==7.4.1
-    # via -r requirements/requirements-dev.in
+    # via
+    #   -c requirements/common-constraints.txt
+    #   -r requirements/requirements-dev.in
 platformdirs==4.3.6
-    # via virtualenv
+    # via
+    #   -c requirements/common-constraints.txt
+    #   virtualenv
 pluggy==1.5.0
-    # via pytest
+    # via
+    #   -c requirements/common-constraints.txt
+    #   pytest
 pox==0.3.5
-    # via pathos
+    # via
+    #   -c requirements/common-constraints.txt
+    #   pathos
 ppft==1.7.6.9
-    # via pathos
+    # via
+    #   -c requirements/common-constraints.txt
+    #   pathos
 pre-commit==4.1.0
-    # via -r requirements/requirements-dev.in
+    # via
+    #   -c requirements/common-constraints.txt
+    #   -r requirements/requirements-dev.in
 pygments==2.19.1
     # via
-    #   -c /Users/gauthier/Projects/aider/requirements.txt
-    #   -c requirements.txt
+    #   -c requirements/common-constraints.txt
     #   rich
     #   sphinx
 pyparsing==3.2.1
-    # via matplotlib
+    # via
+    #   -c requirements/common-constraints.txt
+    #   matplotlib
 pyproject-hooks==1.2.0
     # via
+    #   -c requirements/common-constraints.txt
     #   build
     #   pip-tools
 pytest==8.3.5
     # via
+    #   -c requirements/common-constraints.txt
     #   -r requirements/requirements-dev.in
     #   pytest-env
 pytest-env==1.1.5
-    # via -r requirements/requirements-dev.in
+    # via
+    #   -c requirements/common-constraints.txt
+    #   -r requirements/requirements-dev.in
 python-dateutil==2.9.0.post0
     # via
-    #   -c /Users/gauthier/Projects/aider/requirements.txt
-    #   -c requirements.txt
+    #   -c requirements/common-constraints.txt
     #   matplotlib
     #   pandas
 pytz==2025.1
-    # via pandas
+    # via
+    #   -c requirements/common-constraints.txt
+    #   pandas
 pyyaml==6.0.2
     # via
-    #   -c /Users/gauthier/Projects/aider/requirements.txt
-    #   -c requirements.txt
+    #   -c requirements/common-constraints.txt
     #   pre-commit
 requests==2.32.3
     # via
-    #   -c /Users/gauthier/Projects/aider/requirements.txt
-    #   -c requirements.txt
+    #   -c requirements/common-constraints.txt
     #   sphinx
 rich==13.9.4
     # via
-    #   -c /Users/gauthier/Projects/aider/requirements.txt
-    #   -c requirements.txt
+    #   -c requirements/common-constraints.txt
     #   typer
 roman-numerals-py==3.1.0
-    # via sphinx
+    # via
+    #   -c requirements/common-constraints.txt
+    #   sphinx
 semver==3.0.4
-    # via -r requirements/requirements-dev.in
+    # via
+    #   -c requirements/common-constraints.txt
+    #   -r requirements/requirements-dev.in
 shellingham==1.5.4
-    # via typer
+    # via
+    #   -c requirements/common-constraints.txt
+    #   typer
 six==1.17.0
     # via
-    #   -c /Users/gauthier/Projects/aider/requirements.txt
-    #   -c requirements.txt
+    #   -c requirements/common-constraints.txt
     #   python-dateutil
 snowballstemmer==2.2.0
     # via sphinx
 sphinx==8.2.3
     # via
+    #   -c requirements/common-constraints.txt
+    #   sphinx
+sphinx==8.2.3
+    # via
+    #   -c requirements/common-constraints.txt
     #   sphinx-rtd-theme
     #   sphinxcontrib-jquery
 sphinx-rtd-theme==3.0.2
-    # via lox
+    # via
+    #   -c requirements/common-constraints.txt
+    #   lox
 sphinxcontrib-applehelp==2.0.0
-    # via sphinx
+    # via
+    #   -c requirements/common-constraints.txt
+    #   sphinx
 sphinxcontrib-devhelp==2.0.0
-    # via sphinx
+    # via
+    #   -c requirements/common-constraints.txt
+    #   sphinx
 sphinxcontrib-htmlhelp==2.1.0
-    # via sphinx
+    # via
+    #   -c requirements/common-constraints.txt
+    #   sphinx
 sphinxcontrib-jquery==4.1
-    # via sphinx-rtd-theme
+    # via
+    #   -c requirements/common-constraints.txt
+    #   sphinx-rtd-theme
 sphinxcontrib-jsmath==1.0.1
-    # via sphinx
+    # via
+    #   -c requirements/common-constraints.txt
+    #   sphinx
 sphinxcontrib-qthelp==2.0.0
-    # via sphinx
+    # via
+    #   -c requirements/common-constraints.txt
+    #   sphinx
 sphinxcontrib-serializinghtml==2.0.0
     # via sphinx
 typer==0.15.2
     # via -r requirements/requirements-dev.in
 typing-extensions==4.12.2
     # via
-    #   -c /Users/gauthier/Projects/aider/requirements.txt
-    #   -c requirements.txt
+    #   -c requirements/common-constraints.txt
     #   typer
 tzdata==2025.1
-    # via pandas
+    # via
+    #   -c requirements/common-constraints.txt
+    #   pandas
 urllib3==2.3.0
     # via
-    #   -c /Users/gauthier/Projects/aider/requirements.txt
-    #   -c requirements.txt
+    #   -c requirements/common-constraints.txt
     #   requests
 virtualenv==20.29.2
-    # via pre-commit
+    # via
+    #   -c requirements/common-constraints.txt
+    #   pre-commit
 wheel==0.45.1
-    # via pip-tools
+    # via
+    #   -c requirements/common-constraints.txt
+    #   pip-tools
 
 # The following packages are considered to be unsafe in a requirements file:
 pip==25.0.1
     # via
-    #   -c /Users/gauthier/Projects/aider/requirements.txt
-    #   -c requirements.txt
+    #   -c requirements/common-constraints.txt
+    #   pip-tools
+setuptools==75.8.2
+    # via
+    #   -c requirements/common-constraints.txt
     #   pip-tools
 setuptools==75.8.2
     # via pip-tools