merge main

Pylons · Aug 15, 2023 · 60fd51b · 60fd51b
2 parents a2d9828 + 5949046
commit 60fd51b
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -8,8 +8,6 @@ unreleased
 
 - Fix missing interpolation in SQLAlchemy model.
 
-- Use fork of pytest-cookies to fix tests on windows.
-
 2.0 (2021-02-28)
 ----------------
 

diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
@@ -129,4 +129,4 @@ Contributors
 
 - Jonathan Vanasco, 2021-01-27
 
-- Chris McDonough, 2023-03-03
+- Chris McDonough, 2023-08-15
diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -1,6 +1,4 @@
 cookiecutter
 pytest
-# the default pytest-cookies is currently broken on windows
-# https://github.com/hackebrot/pytest-cookies/issues/41#issuecomment-1316992381
-git+https://github.com/jamesmyatt/pytest-cookies@bugfix/62#egg=pytest-cookies
+pytest-cookies
 pytest-venv