From 0ddbef574e169de7be0e42775ebd023d315eb93f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 25 Jan 2025 00:55:54 +0000
Subject: [PATCH 1/2] Bump pytest-django from 4.3.0 to 4.9.0

Bumps [pytest-django](https://github.com/pytest-dev/pytest-django) from 4.3.0 to 4.9.0.
- [Release notes](https://github.com/pytest-dev/pytest-django/releases)
- [Changelog](https://github.com/pytest-dev/pytest-django/blob/main/docs/changelog.rst)
- [Commits](https://github.com/pytest-dev/pytest-django/compare/v4.3.0...v4.9.0)

---
updated-dependencies:
- dependency-name: pytest-django
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 requirements-dev.txt | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/requirements-dev.txt b/requirements-dev.txt
index 1704a743c2..fb485ed93c 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -10,10 +10,6 @@ asgiref==3.3.4
     #   django
 aspy-yaml==1.3.0
     # via pre-commit
-attrs==23.1.0
-    # via
-    #   -c requirements.txt
-    #   pytest
 brotli==1.0.9
     # via geventhttpclient
 build==1.2.1
@@ -71,6 +67,8 @@ docopt==0.6.2
     # via pytest-watch
 drf-yasg==1.21.5
     # via -r requirements-dev.in
+exceptiongroup==1.2.2
+    # via pytest
 faker==0.9.1
     # via mixer
 filelock==3.4.1
@@ -154,8 +152,6 @@ pre-commit==1.15.1
     # via -r requirements-dev.in
 psutil==5.8.0
     # via locust
-py==1.10.0
-    # via pytest
 pycodestyle==2.3.1
     # via flake8
 pyflakes==1.5.0
@@ -172,7 +168,7 @@ pyproject-hooks==1.1.0
     # via
     #   build
     #   pip-tools
-pytest==6.2.4
+pytest==7.4.4
     # via
     #   -r requirements-dev.in
     #   pytest-django
@@ -180,7 +176,7 @@ pytest==6.2.4
     #   pytest-pythonpath
     #   pytest-timeout
     #   pytest-watch
-pytest-django==4.3.0
+pytest-django==4.9.0
     # via -r requirements-dev.in
 pytest-logging==2015.11.4
     # via -r requirements-dev.in
@@ -237,13 +233,12 @@ tblib==1.7.0
 text-unidecode==1.2
     # via faker
 toml==0.10.2
-    # via
-    #   pre-commit
-    #   pytest
+    # via pre-commit
 tomli==1.2.3
     # via
     #   build
     #   pip-tools
+    #   pytest
 typing-extensions==4.5.0
     # via locust
 uritemplate==3.0.1

From d32a9779989612462601ac5efd6cde71db2173d4 Mon Sep 17 00:00:00 2001
From: Richard Tibbles <richard@learningequality.org>
Date: Fri, 24 Jan 2025 17:11:15 -0800
Subject: [PATCH 2/2] Update pythonpath setting in tests to use built in pytest
 option. Remove pytest-pythonpath

---
 pytest.ini           | 3 +--
 requirements-dev.in  | 1 -
 requirements-dev.txt | 3 ---
 3 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/pytest.ini b/pytest.ini
index 466d04b19f..67ceb7b9da 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,9 +1,8 @@
 [pytest]
 testpaths = contentcuration/
+pythonpath = contentcuration/
 # Settings for pytest-django
 DJANGO_SETTINGS_MODULE=contentcuration.test_settings
-# Settings for pytest-pythonpath
-python_paths = contentcuration/
 
 filterwarnings =
     ignore::UserWarning
diff --git a/requirements-dev.in b/requirements-dev.in
index 7a403fffcd..6dad42b9a6 100644
--- a/requirements-dev.in
+++ b/requirements-dev.in
@@ -10,7 +10,6 @@ mixer==6.1.3
 pytest
 pytest-django
 pytest-logging
-pytest-pythonpath
 pytest-timeout
 pytest-watch
 pre-commit==1.15.1
diff --git a/requirements-dev.txt b/requirements-dev.txt
index fb485ed93c..f409dfe57e 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -173,15 +173,12 @@ pytest==7.4.4
     #   -r requirements-dev.in
     #   pytest-django
     #   pytest-logging
-    #   pytest-pythonpath
     #   pytest-timeout
     #   pytest-watch
 pytest-django==4.9.0
     # via -r requirements-dev.in
 pytest-logging==2015.11.4
     # via -r requirements-dev.in
-pytest-pythonpath==0.7.3
-    # via -r requirements-dev.in
 pytest-timeout==1.4.2
     # via -r requirements-dev.in
 pytest-watch==4.2.0