Merge branch '2.0-branch' into latest

mmerickel · mmerickel · commit 0baa17979f0c · 2023-08-24T23:19:46.000-06:00
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,3 +1,11 @@
+2.0.2 (2023-08-24)
+------------------
+
+- Fix unwanted literal inclusion of a METAL attribute in rendered output within
+  the Chameleon ``layout.pt`` template.
+
+- Remove unnecessary fork of pytext-cookies.
+
 2.0.1 (2023-01-29)
 ------------------
 
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
@@ -128,3 +128,5 @@ Contributors
 - Julien Cigar, 2019-10-18
 
 - Jonathan Vanasco, 2021-01-27
+
+- Chris McDonough, 2023-03-03
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
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/base_templates/layout.pt b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/base_templates/layout.pt
@@ -1,5 +1,5 @@
-<!DOCTYPE html metal:define-macro="layout">
-<html lang="{{ '${request.locale_name}' }}">
+<!DOCTYPE html>
+<html lang="{{ '${request.locale_name}' }}" metal:define-macro="layout">
   <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
