From c3e15d801b0ea46ead0931246b02b8f8d086b9cb Mon Sep 17 00:00:00 2001 From: Tres Seaver Date: Mon, 1 Jun 2015 14:24:12 -0400 Subject: Fix 'py27-pure'/'py33-pure' tox environments. --- src/zope/security/checker.py | 2 +- src/zope/security/proxy.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/zope/security/checker.py b/src/zope/security/checker.py index 9687f19..8fc4890 100644 --- a/src/zope/security/checker.py +++ b/src/zope/security/checker.py @@ -441,7 +441,7 @@ _available_by_default = [] # Get optimized versions try: import zope.security._zope_security_checker -except ImportError: #pragma NO COVER +except (ImportError, AttributeError): #pragma NO COVER PyPy / PURE_PYTHON pass else: from zope.security._zope_security_checker import _checkers, selectChecker diff --git a/src/zope/security/proxy.py b/src/zope/security/proxy.py index f023ca3..ccfd111 100644 --- a/src/zope/security/proxy.py +++ b/src/zope/security/proxy.py @@ -327,7 +327,7 @@ def getObjectPy(proxy): try: from zope.security._proxy import _Proxy -except ImportError: #pragma NO COVER PyPy +except (ImportError, AttributeError): #pragma NO COVER PyPy / PURE_PYTHON getChecker = getCheckerPy getObject = getObjectPy Proxy = ProxyPy -- cgit v1.2.1 From be4c3a69977bd64e3dcf47a5c000592706a6d113 Mon Sep 17 00:00:00 2001 From: Tres Seaver Date: Mon, 1 Jun 2015 14:25:00 -0400 Subject: Switch to using 'tox' on Travis. Add tests for 'py27-pure', 'py33-pure', 'py34', 'coverage', and 'docs' builds. --- .travis.yml | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index cd437ab..df74a27 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,13 +1,20 @@ language: python sudo: false -python: - - 2.6 - - 2.7 - - 3.2 - - 3.3 +env: + - TOXENV=py26 + - TOXENV=py27 + - TOXENV=py27-pure + - TOXENV=py32 + - TOXENV=py33 + - TOXENV=py33-pure + - TOXENV=py34 + - TOXENV=pypy + - TOXENV=pypy3 + - TOXENV=coverage + - TOXENV=docs install: - - pip install . --use-mirrors + - pip install tox script: - - python setup.py test -q + - tox notifications: email: false -- cgit v1.2.1 From 9b6ea95fd506e507ed26c1ca7418f5ffb14c12e4 Mon Sep 17 00:00:00 2001 From: Tres Seaver Date: Tue, 2 Jun 2015 11:36:05 -0400 Subject: Prep 4.0.2 release. --- CHANGES.rst | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 71bfffc..a66ab03 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,7 +1,7 @@ Changes ======= -4.0.2 (unreleased) +4.0.2 (2015-06-02) ------------------ - Fixed compatibility with ``zope.proxy`` 4.1.5 under PyPy. diff --git a/setup.py b/setup.py index c557a62..c54c4ef 100644 --- a/setup.py +++ b/setup.py @@ -105,7 +105,7 @@ else: ] setup(name='zope.security', - version='4.0.2.dev0', + version='4.0.2', author='Zope Foundation and Contributors', author_email='zope-dev@zope.org', description='Zope Security Framework', -- cgit v1.2.1 From 74d7b3ad03bb74a9df50dc467810d619271b731d Mon Sep 17 00:00:00 2001 From: Tres Seaver Date: Tue, 2 Jun 2015 11:38:02 -0400 Subject: svb --- CHANGES.rst | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGES.rst b/CHANGES.rst index a66ab03..f420f45 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,6 +1,11 @@ Changes ======= +4.0.3 (unreleased) +------------------ + +- TBD + 4.0.2 (2015-06-02) ------------------ diff --git a/setup.py b/setup.py index c54c4ef..370e872 100644 --- a/setup.py +++ b/setup.py @@ -105,7 +105,7 @@ else: ] setup(name='zope.security', - version='4.0.2', + version='4.0.3.dev0', author='Zope Foundation and Contributors', author_email='zope-dev@zope.org', description='Zope Security Framework', -- cgit v1.2.1