Merge branch 'master' into fix_94

zopefoundation · Apr 20, 2020 · 08ac99a · 08ac99a
2 parents 35c0f20 + 0fc75c0
commit 08ac99a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/buildout.cfg b/buildout.cfg
@@ -1,7 +1,7 @@
 [buildout]
 extends =
-    https://raw.githubusercontent.com/zopefoundation/Zope/master/versions.cfg
-    https://raw.githubusercontent.com/zopefoundation/Zope/master/sources.cfg
+    https://raw.githubusercontent.com/zopefoundation/Zope/4.x/versions.cfg
+    https://raw.githubusercontent.com/zopefoundation/Zope/4.x/sources.cfg
 develop = .
 parts = interpreter test coverage
 

diff --git a/setup.py b/setup.py
@@ -45,6 +45,7 @@
       },
       license='ZPL 2.1',
       description='Security framework for Zope.',
+      keywords='security access authorization',
       author='Zope Foundation and Contributors',
       author_email='zope-dev@zope.org',
       long_description=README + '\n\n' + CHANGES,

diff --git a/tox.ini b/tox.ini
@@ -4,7 +4,7 @@ envlist =
     py35,
     py36,
     py37,
-    py-38,
+    py38,
     lint,
     coverage,
 
@@ -13,7 +13,7 @@ skip_missing_interpreters = False
 [testenv]
 commands =
     {envbindir}/buildout -c {toxinidir}/buildout.cfg buildout:directory={envdir} buildout:develop={toxinidir} bootstrap
-    {envbindir}/buildout -c {toxinidir}/buildout.cfg buildout:directory={envdir} buildout:develop={toxinidir} install test
+    {envbindir}/buildout -nc {toxinidir}/buildout.cfg buildout:directory={envdir} buildout:develop={toxinidir} install test
     coverage run {envbindir}/test --all {posargs:-pvc}
 deps =
     zc.buildout