diff --git a/requirements-testing.txt b/requirements-testing.txt index a6041972cd..527ffae7d8 100644 --- a/requirements-testing.txt +++ b/requirements-testing.txt @@ -8,7 +8,6 @@ pytest-timeout pytest-watch jsonschema executing -asttokens responses pysocks socksio diff --git a/scripts/populate_tox/config.py b/scripts/populate_tox/config.py index 317afa53ca..744b009aa9 100644 --- a/scripts/populate_tox/config.py +++ b/scripts/populate_tox/config.py @@ -110,13 +110,14 @@ "Werkzeug", ], ">=2.0": ["channels[daphne]"], - ">=2.2,<3.1": ["six"], ">=3.0": ["pytest-asyncio"], "<3.3": [ "djangorestframework>=3.0,<4.0", "Werkzeug<2.1.0", ], - "<3.1": ["pytest-django<4.0"], + # Import six when pytest-django<4.0 as six was moved out of install_requires in + # https://github.com/pytest-dev/pytest-django/commit/f2ea236a70873fe763a5b6d50678743e2238b297 + "<3.1": ["pytest-django[testing]<4.0", "six"], "py3.14,py3.14t": ["coverage==7.11.0"], }, }, @@ -331,6 +332,9 @@ }, "pure_eval": { "package": "pure_eval", + "deps": { + "*": ["asttokens"], + }, "num_versions": 2, }, "pydantic_ai": { diff --git a/scripts/populate_tox/package_dependencies.jsonl b/scripts/populate_tox/package_dependencies.jsonl index 81ecd14ba1..76146ee0ea 100644 --- a/scripts/populate_tox/package_dependencies.jsonl +++ b/scripts/populate_tox/package_dependencies.jsonl @@ -191,6 +191,8 @@ {"name": "django", "version": "2.2.28", "python_version": "3.9", "dependencies": [{"metadata": {"name": "Django", "version": "2.2.28"}, "download_info": {"url": "https://files.pythonhosted.org/packages/43/69/eaac9a827335898d626066989865974fa48bfc23efd1b34628d64543b2d9/Django-2.2.28-py3-none-any.whl"}}, {"metadata": {"name": "sqlparse", "version": "0.5.5"}, "download_info": {"url": "https://files.pythonhosted.org/packages/49/4b/359f28a903c13438ef59ebeee215fb25da53066db67b305c125f1c6d2a25/sqlparse-0.5.5-py3-none-any.whl"}}, {"metadata": {"name": "pytz", "version": "2026.2"}, "download_info": {"url": "https://files.pythonhosted.org/packages/ec/dd/96da98f892250475bdf2328112d7468abdd4acc7b902b6af23f4ed958ea0/pytz-2026.2-py2.py3-none-any.whl"}}], "constraints_hash": "1f963beb3f726d2a4e2276fd6aafe488"} {"name": "django", "version": "2.2.28", "python_version": "3.8", "dependencies": [{"metadata": {"name": "Django", "version": "2.2.28"}, "download_info": {"url": "https://files.pythonhosted.org/packages/43/69/eaac9a827335898d626066989865974fa48bfc23efd1b34628d64543b2d9/Django-2.2.28-py3-none-any.whl"}}, {"metadata": {"name": "sqlparse", "version": "0.5.5"}, "download_info": {"url": "https://files.pythonhosted.org/packages/49/4b/359f28a903c13438ef59ebeee215fb25da53066db67b305c125f1c6d2a25/sqlparse-0.5.5-py3-none-any.whl"}}, {"metadata": {"name": "pytz", "version": "2026.2"}, "download_info": {"url": "https://files.pythonhosted.org/packages/ec/dd/96da98f892250475bdf2328112d7468abdd4acc7b902b6af23f4ed958ea0/pytz-2026.2-py2.py3-none-any.whl"}}], "constraints_hash": "d3804ca2593221efe2b0b815fcfe8bf5"} {"name": "django", "version": "2.2.28", "python_version": "3.9", "dependencies": [{"metadata": {"name": "Django", "version": "2.2.28"}, "download_info": {"url": "https://files.pythonhosted.org/packages/43/69/eaac9a827335898d626066989865974fa48bfc23efd1b34628d64543b2d9/Django-2.2.28-py3-none-any.whl"}}, {"metadata": {"name": "sqlparse", "version": "0.5.5"}, "download_info": {"url": "https://files.pythonhosted.org/packages/49/4b/359f28a903c13438ef59ebeee215fb25da53066db67b305c125f1c6d2a25/sqlparse-0.5.5-py3-none-any.whl"}}, {"metadata": {"name": "pytz", "version": "2026.2"}, "download_info": {"url": "https://files.pythonhosted.org/packages/ec/dd/96da98f892250475bdf2328112d7468abdd4acc7b902b6af23f4ed958ea0/pytz-2026.2-py2.py3-none-any.whl"}}], "constraints_hash": "d3804ca2593221efe2b0b815fcfe8bf5"} +{"name": "django", "version": "2.2.28", "python_version": "3.8", "dependencies": [{"metadata": {"name": "Django", "version": "2.2.28"}, "download_info": {"url": "https://files.pythonhosted.org/packages/43/69/eaac9a827335898d626066989865974fa48bfc23efd1b34628d64543b2d9/Django-2.2.28-py3-none-any.whl"}}, {"metadata": {"name": "sqlparse", "version": "0.5.5"}, "download_info": {"url": "https://files.pythonhosted.org/packages/49/4b/359f28a903c13438ef59ebeee215fb25da53066db67b305c125f1c6d2a25/sqlparse-0.5.5-py3-none-any.whl"}}, {"metadata": {"name": "pytz", "version": "2026.2"}, "download_info": {"url": "https://files.pythonhosted.org/packages/ec/dd/96da98f892250475bdf2328112d7468abdd4acc7b902b6af23f4ed958ea0/pytz-2026.2-py2.py3-none-any.whl"}}], "constraints_hash": "9986a80b5dc5edc58a8ad36062b338c1"} +{"name": "django", "version": "2.2.28", "python_version": "3.9", "dependencies": [{"metadata": {"name": "Django", "version": "2.2.28"}, "download_info": {"url": "https://files.pythonhosted.org/packages/43/69/eaac9a827335898d626066989865974fa48bfc23efd1b34628d64543b2d9/Django-2.2.28-py3-none-any.whl"}}, {"metadata": {"name": "sqlparse", "version": "0.5.5"}, "download_info": {"url": "https://files.pythonhosted.org/packages/49/4b/359f28a903c13438ef59ebeee215fb25da53066db67b305c125f1c6d2a25/sqlparse-0.5.5-py3-none-any.whl"}}, {"metadata": {"name": "pytz", "version": "2026.2"}, "download_info": {"url": "https://files.pythonhosted.org/packages/ec/dd/96da98f892250475bdf2328112d7468abdd4acc7b902b6af23f4ed958ea0/pytz-2026.2-py2.py3-none-any.whl"}}], "constraints_hash": "9986a80b5dc5edc58a8ad36062b338c1"} {"name": "django", "version": "3.2.25", "python_version": "3.9", "dependencies": [{"metadata": {"name": "Django", "version": "3.2.25"}, "download_info": {"url": "https://files.pythonhosted.org/packages/30/8e/cc23c762c5dcd1d367d73cf006a326e0df2bd0e785cba18b658b39904c1e/Django-3.2.25-py3-none-any.whl"}}, {"metadata": {"name": "asgiref", "version": "3.11.1"}, "download_info": {"url": "https://files.pythonhosted.org/packages/5c/0a/a72d10ed65068e115044937873362e6e32fab1b7dce0046aeb224682c989/asgiref-3.11.1-py3-none-any.whl"}}, {"metadata": {"name": "sqlparse", "version": "0.5.5"}, "download_info": {"url": "https://files.pythonhosted.org/packages/49/4b/359f28a903c13438ef59ebeee215fb25da53066db67b305c125f1c6d2a25/sqlparse-0.5.5-py3-none-any.whl"}}, {"metadata": {"name": "typing_extensions", "version": "4.15.0"}, "download_info": {"url": "https://files.pythonhosted.org/packages/18/67/36e9267722cc04a6b9f15c7f3441c2363321a3ea07da7ae0c0707beb2a9c/typing_extensions-4.15.0-py3-none-any.whl"}}, {"metadata": {"name": "pytz", "version": "2026.2"}, "download_info": {"url": "https://files.pythonhosted.org/packages/ec/dd/96da98f892250475bdf2328112d7468abdd4acc7b902b6af23f4ed958ea0/pytz-2026.2-py2.py3-none-any.whl"}}], "constraints_hash": "3bf05b1b9f53eb62e375c5da4b7ba2ca"} {"name": "django", "version": "3.2.25", "python_version": "3.10", "dependencies": [{"metadata": {"name": "Django", "version": "3.2.25"}, "download_info": {"url": "https://files.pythonhosted.org/packages/30/8e/cc23c762c5dcd1d367d73cf006a326e0df2bd0e785cba18b658b39904c1e/Django-3.2.25-py3-none-any.whl"}}, {"metadata": {"name": "asgiref", "version": "3.11.1"}, "download_info": {"url": "https://files.pythonhosted.org/packages/5c/0a/a72d10ed65068e115044937873362e6e32fab1b7dce0046aeb224682c989/asgiref-3.11.1-py3-none-any.whl"}}, {"metadata": {"name": "sqlparse", "version": "0.5.5"}, "download_info": {"url": "https://files.pythonhosted.org/packages/49/4b/359f28a903c13438ef59ebeee215fb25da53066db67b305c125f1c6d2a25/sqlparse-0.5.5-py3-none-any.whl"}}, {"metadata": {"name": "typing_extensions", "version": "4.15.0"}, "download_info": {"url": "https://files.pythonhosted.org/packages/18/67/36e9267722cc04a6b9f15c7f3441c2363321a3ea07da7ae0c0707beb2a9c/typing_extensions-4.15.0-py3-none-any.whl"}}, {"metadata": {"name": "pytz", "version": "2026.2"}, "download_info": {"url": "https://files.pythonhosted.org/packages/ec/dd/96da98f892250475bdf2328112d7468abdd4acc7b902b6af23f4ed958ea0/pytz-2026.2-py2.py3-none-any.whl"}}], "constraints_hash": "3bf05b1b9f53eb62e375c5da4b7ba2ca"} {"name": "django", "version": "3.2.25", "python_version": "3.9", "dependencies": [{"metadata": {"name": "Django", "version": "3.2.25"}, "download_info": {"url": "https://files.pythonhosted.org/packages/30/8e/cc23c762c5dcd1d367d73cf006a326e0df2bd0e785cba18b658b39904c1e/Django-3.2.25-py3-none-any.whl"}}, {"metadata": {"name": "asgiref", "version": "3.11.1"}, "download_info": {"url": "https://files.pythonhosted.org/packages/5c/0a/a72d10ed65068e115044937873362e6e32fab1b7dce0046aeb224682c989/asgiref-3.11.1-py3-none-any.whl"}}, {"metadata": {"name": "sqlparse", "version": "0.5.5"}, "download_info": {"url": "https://files.pythonhosted.org/packages/49/4b/359f28a903c13438ef59ebeee215fb25da53066db67b305c125f1c6d2a25/sqlparse-0.5.5-py3-none-any.whl"}}, {"metadata": {"name": "typing_extensions", "version": "4.15.0"}, "download_info": {"url": "https://files.pythonhosted.org/packages/18/67/36e9267722cc04a6b9f15c7f3441c2363321a3ea07da7ae0c0707beb2a9c/typing_extensions-4.15.0-py3-none-any.whl"}}, {"metadata": {"name": "pytz", "version": "2026.2"}, "download_info": {"url": "https://files.pythonhosted.org/packages/ec/dd/96da98f892250475bdf2328112d7468abdd4acc7b902b6af23f4ed958ea0/pytz-2026.2-py2.py3-none-any.whl"}}], "constraints_hash": "9986a80b5dc5edc58a8ad36062b338c1"} diff --git a/tox.ini b/tox.ini index e91115d32e..36e4688eaf 100644 --- a/tox.ini +++ b/tox.ini @@ -12204,7 +12204,6 @@ deps = django-v5.2.15: channels[daphne] django-v6.0.6: channels[daphne] django-v6.1a1: channels[daphne] - django-v2.2.28: six django-v3.2.25: pytest-asyncio django-v4.2.30: pytest-asyncio django-v5.2.15: pytest-asyncio @@ -12216,8 +12215,10 @@ deps = django-v2.2.28: Werkzeug<2.1.0 django-v3.2.25: djangorestframework>=3.0,<4.0 django-v3.2.25: Werkzeug<2.1.0 - django-v1.11.29: pytest-django<4.0 - django-v2.2.28: pytest-django<4.0 + django-v1.11.29: pytest-django[testing]<4.0 + django-v1.11.29: six + django-v2.2.28: pytest-django[testing]<4.0 + django-v2.2.28: six {py3.14,py3.14t}-django: coverage==7.11.0 django-latest: channels[daphne] django-latest: pytest-asyncio @@ -13859,6 +13860,7 @@ deps = pure_eval-latest: pure_eval==0.2.3 + pure_eval: asttokens trytond-v4.6.22: trytond==4.6.22