Merge pull request #510 from Pylons/sync-main-with-2.0-branch

Forward port changes from 2.0-branch to main

Author: stevepiercy

.github/workflows/ci-tests.yml

@@ -57,6 +57,7 @@ jobs:
       run: tox -e py -- ${{ matrix.pytest-args }}
   functional3:
     runs-on: ubuntu-latest
+    name: Functional Python 3 web tests
     env:
       DISPLAY: ":99"
     services:
@@ -75,13 +76,13 @@ jobs:
     - name: Install requirements
       run: |
         sudo apt-get update
-        pip install tox
         sudo apt-get install gettext
+        pip install tox
     - name: Set URL environment variable
       run: |
         echo "URL=http://`hostname -i`:8523" >> $GITHUB_ENV
         echo "URL: "$URL
-    - name: Run functional web tests
+    - name: Run functional3 web tests
       run: |
         tox -e functional3
   coverage:

CHANGES.txt

@@ -7,7 +7,7 @@
 
 .. _2.0.15:
 
-2.0.15 (unreleased)
+2.0.15 (2020-12-10)
 -------------------
 
 

README.rst

@@ -3,15 +3,23 @@ Deform
 
 .. image:: https://github.com/Pylons/deform/workflows/Build%20and%20test/badge.svg?branch=main
     :target: https://github.com/Pylons/deform/actions?query=workflow%3A%22Build+and+test%22+branch%3Amain
+    :alt: Build Status
+
+.. image:: https://img.shields.io/pypi/v/deform
+    :target: https://pypi.org/project/deform/
+    :alt: Current Release
 
 .. image:: https://readthedocs.org/projects/deform/badge/?version=main
     :target: https://docs.pylonsproject.org/projects/deform/en/main/
-    :alt: Master Documentation Status
+    :alt: Main Documentation Status
 
 .. image:: https://readthedocs.org/projects/deform/badge/?version=latest
     :target: https://docs.pylonsproject.org/projects/deform/en/latest/
     :alt: Latest Documentation Status
 
+.. image:: https://img.shields.io/pypi/pyversions/deform
+    :alt: Python Support
+
 .. contents:: :local:
 
 

run-selenium-tests.bash

@@ -28,7 +28,7 @@ export PATH="${PWD}:$PATH"
 
 # Checkout deformdemo
 if [ ! -d deformdemo_functional_tests ] ; then
-    git clone https://github.com/Pylons/deformdemo.git deformdemo_functional_tests
+    git clone https://github.com/pylons/deformdemo.git deformdemo_functional_tests
 fi
 
 # Locales are needed for deformdemo tests
@@ -40,6 +40,7 @@ pip install -e .
 # Let's go for the demo
 cd deformdemo_functional_tests
 pip install -e .
+pip freeze
 
 # Run test server
 pserve demo.ini &

setup.py

@@ -103,13 +103,15 @@ def readfile(name):
     keywords="web forms form generation schema validation pyramid",
     author="Chris McDonough, Agendaless Consulting",
     author_email="pylons-discuss@googlegroups.com",
+    maintainer="Steve Piercy",
+    maintainer_email="web@stevepiercy.com",
     url="https://docs.pylonsproject.org/projects/deform/en/latest/",
     project_urls={
         'Documentation': docs_url,
-        'Changelog': '{}whatsnew-{}.html'.format(docs_url, branch_version),
+        'Changelog': '{}changes.html'.format(docs_url),
         'Issue Tracker': 'https://github.com/Pylons/deform/issues',
     },
-    license="BSD-derived (http://www.repoze.org/LICENSE.txt)",
+    license="BSD-derived",
     packages=find_packages(),
     include_package_data=True,
     zip_safe=False,

tox.ini

@@ -21,6 +21,8 @@ commands =
 
 [testenv:lint]
 commands =
+    python --version
+    pip freeze
     flake8 deform setup.py
     isort --check-only --df deform setup.py
     black --check --diff deform setup.py
@@ -45,6 +47,8 @@ depends = py39-cover
 whitelist_externals = make
 commands =
     pip install deform[docs]
+    python --version
+    pip freeze
     make -C docs html epub BUILDDIR={envdir} "SPHINXOPTS=-W -E"
 
 # Selenium tests are slow. Run them against only one interpreter.
@@ -53,6 +57,7 @@ commands =
 passenv = DISPLAY WEBDRIVER FIREFOX_PATH URL WAITTOSTART CONTAINERTZ
 commands =
     pip install deform[testing,functional]
+    python --version
     pip freeze
     ./run-selenium-tests.bash --max-runs=4 {posargs}
 deps =