Merge upstream/master and resolve requirements conflicts

Author: rodrigo.nogueira

requirements/constraints.txt

@@ -130,7 +130,7 @@ packaging==26.0
     #   pytest
     #   sphinx
     #   wheel
-pathspec==1.0.3
+pathspec==1.0.4
     # via mypy
 pip-tools==7.5.2
     # via -r requirements/dev.in

requirements/dev.txt

@@ -127,7 +127,7 @@ packaging==26.0
     #   pytest
     #   sphinx
     #   wheel
-pathspec==1.0.3
+pathspec==1.0.4
     # via mypy
 pip-tools==7.5.2
     # via -r requirements/dev.in

requirements/lint.txt

@@ -57,7 +57,7 @@ nodeenv==1.10.0
     # via pre-commit
 packaging==26.0
     # via pytest
-pathspec==1.0.3
+pathspec==1.0.4
     # via mypy
 platformdirs==4.5.1
     # via virtualenv

requirements/test-common.txt

@@ -45,10 +45,8 @@ mypy==1.19.1 ; implementation_name == "cpython"
 mypy-extensions==1.1.0
     # via mypy
 packaging==26.0
-    # via
-    #   pytest
-    #   pytest-rerunfailures
-pathspec==1.0.3
+    # via pytest
+pathspec==1.0.4
     # via mypy
 pkgconfig==1.5.5
     # via -r requirements/test-common.in

requirements/test-ft.txt

@@ -73,7 +73,7 @@ packaging==26.0
     # via
     #   gunicorn
     #   pytest
-pathspec==1.0.3
+pathspec==1.0.4
     # via mypy
 pkgconfig==1.5.5
     # via -r requirements/test-common.in

requirements/test.txt

@@ -73,8 +73,7 @@ packaging==26.0
     # via
     #   gunicorn
     #   pytest
-    #   pytest-rerunfailures
-pathspec==1.0.3
+pathspec==1.0.4
     # via mypy
 pkgconfig==1.5.5
     # via -r requirements/test-common.in