chore: resolve conflicts in requirement files

edx_repo_tools/find_dependencies/extra.txt

@@ -8,14 +8,17 @@ certifi==2024.2.2
     # via requests
 charset-normalizer==3.3.2
     # via requests
+idna==3.7
 idna==3.7
     # via requests
 markdown-it-py==3.0.0
     # via rich
 mdurl==0.1.2
     # via markdown-it-py
+pygments==2.18.0
 pygments==2.18.0
     # via rich
+requests==2.32.2
 requests==2.32.2
     # via -r edx_repo_tools/find_dependencies/extra.in
 rich==13.7.1

edx_repo_tools/repo_access_scraper/extra.txt

@@ -8,8 +8,10 @@ greenlet==3.0.3
     # via
     #   -c edx_repo_tools/repo_access_scraper/../../requirements/constraints.txt
     #   playwright
+playwright==1.44.0
 playwright==1.44.0
     # via -r edx_repo_tools/repo_access_scraper/extra.in
+pyee==11.1.0
 pyee==11.1.0
     # via playwright
 typing-extensions==4.12.0

requirements/development.txt

@@ -8,6 +8,7 @@ appdirs==1.4.4
     # via
     #   -r requirements/base.txt
     #   fissix
+astroid==3.2.2
 astroid==3.2.2
     # via
     #   pylint
@@ -20,6 +21,7 @@ backports-csv==1.0.7
     # via -r requirements/base.txt
 bowler==0.9.0
     # via -r requirements/base.txt
+build==1.2.1
 build==1.2.1
     # via pip-tools
 cachecontrol==0.14.0
@@ -55,12 +57,14 @@ click==8.1.7
     #   pip-tools
 click-log==0.4.0
     # via edx-lint
+code-annotations==1.8.0
 code-annotations==1.8.0
     # via edx-lint
 colorama==0.4.6
     # via
     #   -r requirements/base.txt
     #   tox
+cryptography==42.0.7
 cryptography==42.0.7
     # via
     #   -r requirements/base.txt
@@ -77,19 +81,23 @@ docutils==0.20.1
     #   statistics
 edx-lint==5.3.6
     # via -r requirements/development.in
+exceptiongroup==1.2.1
 exceptiongroup==1.2.1
     # via
     #   -r requirements/base.txt
     #   pytest
+execnet==2.1.1
 execnet==2.1.1
     # via
     #   -r requirements/base.txt
     #   pytest-xdist
+filelock==3.14.0
 filelock==3.14.0
     # via
     #   -r requirements/base.txt
     #   tox
     #   virtualenv
+fissix==24.4.24
 fissix==24.4.24
     # via
     #   -r requirements/base.txt
@@ -100,8 +108,10 @@ gitdb==4.0.11
     #   gitpython
 github3-py==4.0.1
     # via -r requirements/base.txt
+gitpython==3.1.43
 gitpython==3.1.43
     # via -r requirements/base.txt
+idna==3.7
 idna==3.7
     # via
     #   -r requirements/base.txt
@@ -110,12 +120,17 @@ importlib-metadata==6.11.0
     # via
     #   -c requirements/common_constraints.txt
     #   build
+importlib-metadata==6.11.0
+    # via
+    #   -c requirements/common_constraints.txt
+    #   build
 iniconfig==2.0.0
     # via
     #   -r requirements/base.txt
     #   pytest
 isort==5.13.2
     # via pylint
+jinja2==3.1.4
 jinja2==3.1.4
     # via code-annotations
 lazy==1.6
@@ -136,13 +151,15 @@ msgpack==1.0.8
     # via
     #   -r requirements/base.txt
     #   cachecontrol
+packaging==24.0
 packaging==24.0
     # via
     #   -r requirements/base.txt
     #   build
     #   pyproject-api
     #   pytest
     #   tox
+path==16.14.0
 path==16.14.0
     # via
     #   -r requirements/base.txt
@@ -153,17 +170,20 @@ pbr==6.0.0
     # via stevedore
 pip-tools==7.4.1
     # via -r requirements/development.in
+platformdirs==4.2.2
 platformdirs==4.2.2
     # via
     #   -r requirements/base.txt
     #   pylint
     #   tox
     #   virtualenv
+pluggy==1.5.0
 pluggy==1.5.0
     # via
     #   -r requirements/base.txt
     #   pytest
     #   tox
+pycparser==2.22
 pycparser==2.22
     # via
     #   -r requirements/base.txt
@@ -172,6 +192,7 @@ pyjwt[crypto]==2.8.0
     # via
     #   -r requirements/base.txt
     #   github3-py
+pylint==3.2.2
 pylint==3.2.2
     # via
     #   edx-lint
@@ -190,10 +211,12 @@ pyproject-api==1.6.1
     # via
     #   -r requirements/base.txt
     #   tox
+pyproject-hooks==1.1.0
 pyproject-hooks==1.1.0
     # via
     #   build
     #   pip-tools
+pytest==8.2.1
 pytest==8.2.1
     # via
     #   -r requirements/base.txt
@@ -203,8 +226,10 @@ pytest==8.2.1
     #   pytest-xdist
 pytest-logging==2015.11.4
     # via -r requirements/base.txt
+pytest-mock==3.14.0
 pytest-mock==3.14.0
     # via -r requirements/development.in
+pytest-xdist==3.6.1
 pytest-xdist==3.6.1
     # via -r requirements/base.txt
 python-dateutil==2.9.0.post0
@@ -220,6 +245,7 @@ pyyaml==6.0.1
     #   -r requirements/base.txt
     #   code-annotations
     #   responses
+requests==2.32.2
 requests==2.32.2
     # via
     #   -r requirements/base.txt
@@ -258,10 +284,13 @@ tomli==2.0.1
     #   pyproject-api
     #   pytest
     #   tox
+tomlkit==0.12.5
 tomlkit==0.12.5
     # via pylint
+tox==4.15.0
 tox==4.15.0
     # via -r requirements/base.txt
+tqdm==4.66.4
 tqdm==4.66.4
     # via -r requirements/base.txt
 typing-extensions==4.12.0
@@ -279,6 +308,7 @@ urllib3==2.2.1
     #   responses
 urlobject==2.4.3
     # via -r requirements/base.txt
+virtualenv==20.26.2
 virtualenv==20.26.2
     # via
     #   -r requirements/base.txt
@@ -287,6 +317,7 @@ volatile==2.1.0
     # via
     #   -r requirements/base.txt
     #   bowler
+wheel==0.43.0
 wheel==0.43.0
     # via pip-tools
 zipp==3.19.0
@@ -295,3 +326,7 @@ zipp==3.19.0
 # The following packages are considered to be unsafe in a requirements file:
 # pip
 # setuptools
+
+# The following packages are considered to be unsafe in a requirements file:
+# pip
+# setuptools

requirements/pip-tools.txt

@@ -4,10 +4,16 @@
 #
 #    make upgrade
 #
+build==1.2.1
 build==1.2.1
     # via pip-tools
 click==8.1.7
     # via pip-tools
+importlib-metadata==6.11.0
+    # via
+    #   -c requirements/common_constraints.txt
+    #   build
+packaging==24.0
 importlib-metadata==6.11.0
     # via
     #   -c requirements/common_constraints.txt
@@ -16,6 +22,7 @@ packaging==24.0
     # via build
 pip-tools==7.4.1
     # via -r requirements/pip-tools.in
+pyproject-hooks==1.1.0
 pyproject-hooks==1.1.0
     # via
     #   build
@@ -24,6 +31,7 @@ tomli==2.0.1
     # via
     #   build
     #   pip-tools
+wheel==0.43.0
 wheel==0.43.0
     # via pip-tools
 zipp==3.19.0