Use zopefoundation/meta/config to harmonize package structure.

Fix tests py2/3

.editorconfig

@@ -0,0 +1,39 @@
+# Generated from:
+# https://github.com/zopefoundation/meta/tree/master/config/pure-python
+#
+# EditorConfig Configuration file, for more details see:
+# http://EditorConfig.org
+# EditorConfig is a convention description, that could be interpreted
+# by multiple editors to enforce common coding conventions for specific
+# file types
+
+# top-most EditorConfig file:
+# Will ignore other EditorConfig files in Home directory or upper tree level.
+root = true
+
+
+[*]  # For All Files
+# Unix-style newlines with a newline ending every file
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+# Set default charset
+charset = utf-8
+# Indent style default
+indent_style = space
+# Max Line Length - a hard line wrap, should be disabled
+max_line_length = off
+
+[*.{py,cfg,ini}]
+# 4 space indentation
+indent_size = 4
+
+[*.{yml,zpt,pt,dtml}]
+# 2 space indentation
+indent_size = 2
+
+[{Makefile,.gitmodules}]
+# Tab indentation (no size specified, but view as 4 spaces)
+indent_style = tab
+indent_size = unset
+tab_width = unset

.gitignore

@@ -1,28 +1,24 @@
-syntax:glob
-
+# Generated from:
+# https://github.com/zopefoundation/meta/tree/master/config/pure-python
+*.egg-info/
+*.profraw
+*.pyc
+*.pyo
+.coverage
 .coverage.*
 .installed.cfg
 .mr.developer.cfg
-.tox
-*.bak
-*.pyc
-*.pyo
-*.swo
-*.swp
-bin
-coverage
-dev
-develop-eggs
-develop/*
-dist
+.tox/
+__pycache__/
+bin/
+build/
+coverage.xml
+develop-eggs/
+dist/
 docs/_build
-docs/doctrees
-docs/html
-docs/latex
-docs/make.bat
-docs/Makefile
-eggs
-grokwiki/src/grokwiki.egg-info/
-parts
-src/*.egg-info
-var/
+eggs/
+htmlcov/
+lib/
+lib64
+parts/
+pyvenv.cfg

.travis.yml

@@ -1,19 +1,34 @@
+# Generated from:
+# https://github.com/zopefoundation/meta/tree/master/config/pure-python
 language: python
 python:
-    - 2.7
-    - 3.4
-    - 3.5
-    - 3.6
-    - pypy
-    - pypy3
+  - 2.7
+  - pypy
+  - 3.5
+  - 3.6
+  - 3.7
+  - 3.8
+  - pypy3
+
+matrix:
+  include:
+    - name: "lint"
+      python: 3.7
+      env: TOXENV="lint"
+    - name: "coverage"
+      python: 3.7
+      env: TOXENV="coverage"
+      after_success:
+        - coveralls
+
 install:
-    - pip install -U pip setuptools
-    - pip install -U zope.testrunner coverage coveralls
-    - pip install -U -e .[test]
+  - pip install -U pip
+  - pip install -U tox-travis coveralls
+
 script:
-    - coverage run -m zope.testrunner --test-path=src
-after_success:
-    - coveralls
+  - tox
+
 notifications:
-    email: false
+  email: false
+
 cache: pip

CHANGES.txt

@@ -6,6 +6,7 @@ Grok changes
 
 - Fix DeprecationWarnings.
 
+- Use zopefoundation/meta/config to harmonize package structure.
 
 3.1 (2018-05-09)
 ================

MANIFEST.in

@@ -1,7 +1,21 @@
-global-include *.mo
-include *.txt
+# Generated from:
+# https://github.com/zopefoundation/meta/tree/master/config/pure-python
 include *.rst
-include bootstrap.py
+include *.txt
 include buildout.cfg
-include .travis.yml
-recursive-include src *.cpt *.pt *.py *.zcml
+include tox.ini
+
+exclude MANIFEST.in
+
+recursive-include docs *.bat
+recursive-include docs *.py
+recursive-include docs *.rst
+recursive-include docs Makefile
+
+recursive-include src *.gif
+recursive-include src *.pt
+recursive-include src *.py
+recursive-include src *.rst
+recursive-include src *.txt
+recursive-include src *.xml
+recursive-include src *.zcml

setup.cfg

@@ -0,0 +1,13 @@
+# Generated from:
+# https://github.com/zopefoundation/meta/tree/master/config/pure-python
+[bdist_wheel]
+universal = 1
+
+[flake8]
+doctests = 1
+
+[check-manifest]
+ignore =
+    .editorconfig
+    .meta.cfg
+    .travis.yml