From eed99b84ba2f3c7231895d39593968c01745a1d7 Mon Sep 17 00:00:00 2001
From: Jens Vagelpohl <jens@plyp.com>
Date: Sun, 6 Nov 2022 12:43:02 +0100
Subject: - add missing pieces from PR #27

---
 .github/workflows/tests.yml |  1 +
 .meta.toml                  | 23 ++++++++++++++++++++---
 appveyor.yml                |  6 ++++++
 setup.cfg                   |  4 ++++
 tox.ini                     | 17 +++++++++++++++--
 5 files changed, 46 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index a62f6fb..70629a7 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -349,6 +349,7 @@ jobs:
           ZOPE_INTERFACE_STRICT_IRO: 1
         run: |
           sphinx-build -b html -d docs/_build/doctrees docs docs/_build/html
+          sphinx-build -b doctest -d docs/_build/doctrees docs docs/_build/doctest
 
   lint:
     needs: build-package
diff --git a/.meta.toml b/.meta.toml
index f8a2810..a971dac 100644
--- a/.meta.toml
+++ b/.meta.toml
@@ -11,16 +11,33 @@ with-pypy = true
 with-future-python = false
 with-legacy-python = true
 with-docs = true
-with-sphinx-doctests = false
+with-sphinx-doctests = true
 
 [tox]
-use-flake8 = false
+use-flake8 = true
 
 [coverage]
-fail-under = 0
+fail-under = 100
+
+[flake8]
+additional-config = [
+    "# F401 imported but unused",
+    "per-file-ignores =",
+    "    src/zope/i18nmessageid/__init__.py: F401",
+    ]
 
 [manifest]
 additional-rules = [
     "include *.sh",
     "recursive-include docs *.bat",
     ]
+
+[appveyor]
+global-env-vars = [
+    "# Currently the builds use @mgedmin's Appveyor account.  The PyPI token belongs",
+    "# to zope.wheelbuilder, which is managed by @mgedmin and @dataflake.",
+    "global:",
+    "  TWINE_USERNAME: __token__",
+    "  TWINE_PASSWORD:",
+    "    secure: aoZC/+rvJKg8B5GMGIxd1VZ0Oxtmc0lPMiqT2wHP5qBRoZf6tEB7n9u7uCIifcAX1IWsLCRF7DKWvvCQTFJL5HcQvXFQSnEuXvdMT/utFFx9eCCy+Cu+WuWkasGCG+gx9uhMTe01mixi8yujgVj894Xjdv5YyNH2dPeqV5kInTzYrOmKZs1FTvKTlYZNHyYWRnYhyaLBn4FmmeuXuFcd5o05jkaa2dnerW85F3sr7mWbCgL4GpEQ59rYX34Cl4EdEXw+IViTyFWJuZp+k9GCUnzxAmA+vlfoSbZ6JfvTLaU=",
+    ]
diff --git a/appveyor.yml b/appveyor.yml
index 2311d21..ee3371e 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,6 +1,12 @@
 # Generated from:
 # https://github.com/zopefoundation/meta/tree/master/config/c-code
 environment:
+  # Currently the builds use @mgedmin's Appveyor account.  The PyPI token belongs
+  # to zope.wheelbuilder, which is managed by @mgedmin and @dataflake.
+  global:
+    TWINE_USERNAME: __token__
+    TWINE_PASSWORD:
+      secure: aoZC/+rvJKg8B5GMGIxd1VZ0Oxtmc0lPMiqT2wHP5qBRoZf6tEB7n9u7uCIifcAX1IWsLCRF7DKWvvCQTFJL5HcQvXFQSnEuXvdMT/utFFx9eCCy+Cu+WuWkasGCG+gx9uhMTe01mixi8yujgVj894Xjdv5YyNH2dPeqV5kInTzYrOmKZs1FTvKTlYZNHyYWRnYhyaLBn4FmmeuXuFcd5o05jkaa2dnerW85F3sr7mWbCgL4GpEQ59rYX34Cl4EdEXw+IViTyFWJuZp+k9GCUnzxAmA+vlfoSbZ6JfvTLaU=
 
   matrix:
     - python: 27
diff --git a/setup.cfg b/setup.cfg
index 7867a0d..b41962b 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -8,12 +8,16 @@ create-wheel = no
 
 [flake8]
 doctests = 1
+# F401 imported but unused
+per-file-ignores =
+    src/zope/i18nmessageid/__init__.py: F401
 
 [check-manifest]
 ignore =
     .editorconfig
     .meta.toml
     docs/_build/html/_sources/*
+    docs/_build/doctest/*
 
 [isort]
 force_single_line = True
diff --git a/tox.ini b/tox.ini
index eb70366..36d0f34 100644
--- a/tox.ini
+++ b/tox.ini
@@ -25,8 +25,10 @@ setenv =
     !pure-!pypy-!pypy3: PURE_PYTHON=0
 commands =
     zope-testrunner --test-path=src {posargs:-vc}
+    !py27-!pypy: sphinx-build -b doctest -d {envdir}/.cache/doctrees docs {envdir}/.cache/doctest
 extras =
     test
+    docs
 
 [testenv:coverage]
 basepython = python3
@@ -46,18 +48,29 @@ commands =
 basepython = python3
 skip_install = true
 commands =
+    isort --check-only --diff {toxinidir}/src {toxinidir}/setup.py
+    flake8 src setup.py
     check-manifest
     check-python-versions
 deps =
     check-manifest
     check-python-versions >= 0.19.1
     wheel
+    flake8
+    isort
+
+[testenv:isort-apply]
+basepython = python3
+commands_pre =
+deps =
+    isort
+commands =
+    isort {toxinidir}/src {toxinidir}/setup.py []
 
 [testenv:docs]
 basepython = python3
 skip_install = false
-extras =
-    docs
 commands_pre =
 commands =
     sphinx-build -b html -d docs/_build/doctrees docs docs/_build/html
+    sphinx-build -b doctest -d docs/_build/doctrees docs docs/_build/doctest
-- 
cgit v1.2.1