summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitlab-ci.yml6
-rw-r--r--src/mailman/docs/NEWS.rst1
2 files changed, 4 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 94f8b1de7..8630fe549 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,13 +21,13 @@ docs:
sqlite:
script:
- - tox -e py34,py35
+ - tox -e py34,py35,py36
pgsql:
services:
- postgres:latest
script:
- - MAILMAN_EXTRA_TESTING_CFG=/home/runner/configs/postgres.cfg tox -e py34-pg,py35-pg
+ - MAILMAN_EXTRA_TESTING_CFG=/home/runner/configs/postgres.cfg tox -e py34-pg,py35-pg,py36-pg
tags:
- postgres
@@ -35,6 +35,6 @@ mysql:
services:
- mysql:latest
script:
- - MAILMAN_EXTRA_TESTING_CFG=/home/runner/configs/mysql.cfg tox -e py34-mysql,py35-mysql
+ - MAILMAN_EXTRA_TESTING_CFG=/home/runner/configs/mysql.cfg tox -e py34-mysql,py35-mysql,py36-mysql
tags:
- mysql
diff --git a/src/mailman/docs/NEWS.rst b/src/mailman/docs/NEWS.rst
index 26d7433c3..1841f8fb7 100644
--- a/src/mailman/docs/NEWS.rst
+++ b/src/mailman/docs/NEWS.rst
@@ -151,6 +151,7 @@ Interfaces
Internal
--------
+ * Add official support for Python 3.6. (Closes #295)
* A handful of unused legacy exceptions have been removed. The redundant
`MailmanException` has been removed; use `MailmanError` everywhere.
* Drop the use of the `lazr.smtptest` library, which is based on the