From dbfbd1961a2e7e2c4b35769c7e1a2bb4bae82dba Mon Sep 17 00:00:00 2001
From: Pete Cheslock <petecheslock@gmail.com>
Date: Mon, 22 Jan 2024 08:26:58 -0500
Subject: [PATCH 1/5] Exclude the appmap test files

---
 pyproject.toml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index d79a4618..239c548f 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -22,7 +22,10 @@ classifiers = [
         'Topic :: Software Development :: Documentation'
 ]
 include = ['appmap.pth']
-exclude = ['_appmap/wrapt']
+exclude = [
+    '_appmap/wrapt',
+    '_appmap/test/data/*/appmap.yml'
+]
 
 packages = [
     { include = "appmap"}, {include = "_appmap" }, {include = "_appmap/wrapt", from = "vendor"}

From 636cbb6dd99bdf13d91d6249c5bcddb11aa8b89b Mon Sep 17 00:00:00 2001
From: Pete Cheslock <petecheslock@gmail.com>
Date: Mon, 22 Jan 2024 09:17:08 -0500
Subject: [PATCH 2/5] Update glob to exclude more files

---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index 239c548f..62e2464a 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -24,7 +24,7 @@ classifiers = [
 include = ['appmap.pth']
 exclude = [
     '_appmap/wrapt',
-    '_appmap/test/data/*/appmap.yml'
+    '_appmap/test/data/**/appmap.yml'
 ]
 
 packages = [

From 17ae69086591984c0f003c924aa6798501856a61 Mon Sep 17 00:00:00 2001
From: Pete Cheslock <petecheslock@gmail.com>
Date: Mon, 22 Jan 2024 13:08:28 -0500
Subject: [PATCH 3/5] Include the necessary files only for the sdist exclude
 them otherwise

---
 pyproject.toml | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 62e2464a..02097c95 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -21,14 +21,18 @@ classifiers = [
         'Topic :: Software Development :: Debuggers',
         'Topic :: Software Development :: Documentation'
 ]
-include = ['appmap.pth']
-exclude = [
-    '_appmap/wrapt',
-    '_appmap/test/data/**/appmap.yml'
+
+include = [
+    'appmap.pth',
+    { path = '_appmap/test/**/*', format = 'sdist' }
 ]
 
+exclude = ['_appmap/wrapt']
+
 packages = [
-    { include = "appmap"}, {include = "_appmap" }, {include = "_appmap/wrapt", from = "vendor"}
+    { include = "appmap" },
+    { include = "_appmap/*.py" },
+    { include = "_appmap/wrapt/**/*", from = "vendor" }
 ]
 
 [tool.poetry.dependencies]

From 00db37d71489e8c24401612163e991e7a3a355ad Mon Sep 17 00:00:00 2001
From: Pete Cheslock <petecheslock@gmail.com>
Date: Mon, 22 Jan 2024 13:47:13 -0500
Subject: [PATCH 4/5] Use a lower working version of pytest-django

---
 pyproject.toml | 1 +
 tox.ini        | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index 02097c95..7388700e 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -56,6 +56,7 @@ httpretty = "^1.0.5"
 pytest = "^6.1.2"
 pytest-randomly = "^3.5.0"
 pylint = "^2.6.0"
+pytest-django = "^ 4.5.2"
 flake8 = "^3.8.4"
 pyfakefs = "^4.3.2"
 pprintpp = ">=0.4.0"
diff --git a/tox.ini b/tox.ini
index a2934df7..5b67b5be 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,7 +10,7 @@ allowlist_externals =
     poetry
 
 deps=
-    pytest-django
+    pytest-django <4.7.0
     web: Django >=4.0, <5.0
     web: Flask >= 2
     flask1: -rrequirements-flask1.txt

From 9b113501dcc779bd9a363d0ee4c5e5d70163cc9f Mon Sep 17 00:00:00 2001
From: Pete Cheslock <petecheslock@gmail.com>
Date: Mon, 22 Jan 2024 13:59:30 -0500
Subject: [PATCH 5/5] Update the tox config correctly

---
 pyproject.toml | 2 +-
 tox.ini        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 7388700e..f38bbf46 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -56,7 +56,7 @@ httpretty = "^1.0.5"
 pytest = "^6.1.2"
 pytest-randomly = "^3.5.0"
 pylint = "^2.6.0"
-pytest-django = "^ 4.5.2"
+pytest-django = "~ 4.5.2"
 flake8 = "^3.8.4"
 pyfakefs = "^4.3.2"
 pprintpp = ">=0.4.0"
diff --git a/tox.ini b/tox.ini
index 5b67b5be..c230bb9d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,7 +10,7 @@ allowlist_externals =
     poetry
 
 deps=
-    pytest-django <4.7.0
+    pytest-django >=4.5.2, <4.6
     web: Django >=4.0, <5.0
     web: Flask >= 2
     flask1: -rrequirements-flask1.txt