Foreward port changes from 2.0-branch

Author: stevepiercy

CHANGES.txt

@@ -1,6 +1,13 @@
 3.0.0 (unreleased)
 ------------------
 
+.. _2.0.11:
+
+2.0.11 (2020-08-21)
+-------------------
+
+- Drop support of Python 3.4.
+
 - Changed the implementation of input autofocus from JavaScript to an HTML5
   input attribute.
 
@@ -18,16 +25,41 @@
   Default: ``on``.
   (This is unchanged from the JavaScript implementation.)
 
+- Replace the flake8-isort plugin with plain old isort.
+  See https://github.com/Pylons/deform/pull/427
+
+- Improved the script that launches Selenium webdriver to clean up the locale
+  directory after completing a run of functional tests so that its files do not
+  get committed by accident. We also enforce coding style and add a formatter,
+  and improved the contributing documentation.
+  See https://github.com/Pylons/deform/pull/428
+
+- Updated Bootstrap to 3.4.1.
+
+
+.. _2.0.10:
 
 2.0.10 (2020-07-03)
 -------------------
 
 - Correct release date.
 
 
+.. _2.0.9:
+
 2.0.9 (2020-07-03)
 ------------------
 
+- Added CSRF test to pass coverage on schema.py.
+  See https://github.com/Pylons/deform/pull/403
+
+- Modified the DateTimeInputWidget to use HTML5 date/time input types on
+  browsers that support it.
+  See https://github.com/Pylons/deform/pull/406
+
+- Add new translations for Swahili (sw_KE) locale.
+  See https://github.com/Pylons/deform/pull/409
+
 - Add boolean HTML attributes per Chameleon 3.8.0.
 
   All checkboxes, radios, and selects that use boolean HTML attributes
@@ -39,6 +71,8 @@
   See https://github.com/Pylons/deform/issues/417
 
 
+.. _2.0.8:
+
 2.0.8 (2019-10-07)
 ------------------
 

RELEASING.txt

@@ -19,6 +19,8 @@ Prepare new release branch
 
 - Create a new release branch, incrementing the version number.
 
+- Align the release number with deformdemo.
+
 - Do any necessary branch merges (e.g., master to branch, branch to master).
 
 - On release branch:
@@ -62,13 +64,16 @@ Prepare new release branch
 
 - Release the wheels to PyPI:
 
-    $VENV/bin/twine upload dist/deform-X.Y.Z*
+    $VENV/bin/twine upload dist/deform-X.Y.Z-*
 
 - Upload a git tag for the release:
 
     git tag X.Y.Z
     git push origin X.Y.Z
 
+- Add a release on Github.
+  https://github.com/Pylons/deform/releases
+
 - Update RTD to render a new version of the docs at that tag X.Y.Z and set
   X.Y.Z as the default branch such that ``/latest/`` points to it.
 

deform/templates/richtext.pt

@@ -2,7 +2,6 @@
                  tinymce_options tinymce_options|field.widget.tinymce_options;
                  oid oid|field.oid;
                  name name|field.name;"
-
     xmlns:i18n="http://xml.zope.org/namespaces/i18n" 
     i18n:domain="deform"
     tal:omit-tag="">
@@ -15,7 +14,7 @@
       }
     </style>  
   <textarea id="${oid}" name="${name}" 
-            class='tinymce form-control' tal:content="structure cstruct"/>
+            class='tinymce form-control' tal:content="structure cstruct" />
   <span id="${oid}-preload" class="tinymce-preload" 
         tal:content="structure cstruct" />
   <script type="text/javascript">

docs/conf.py

@@ -173,6 +173,7 @@
 # Output file base name for HTML help builder.
 htmlhelp_basename = 'deform'
 
+smartquotes = False
 
 # Options for LaTeX output
 # ------------------------

pyproject.toml

@@ -23,7 +23,7 @@ exclude = '''
 '''
 
 # This next section only exists for people that have their editors
-# automatically call isort.
+# automatically call isort. Black already sorts entries on its own when run.
 [tool.isort]
 combine_as_imports = true
 default_section = "THIRDPARTY"

tox.ini

@@ -66,7 +66,7 @@ basepython = python3.6
 whitelist_externals = make
 commands =
     pip install deform[docs]
-    make -C docs html epub BUILDDIR={envdir} "SPHINXOPTS=-W -E -D suppress_warnings=ref.term"
+    make -C docs html epub BUILDDIR={envdir} "SPHINXOPTS=-W -E"
 
 # Selenium tests are slow, run them against one
 # interpreter only