Merge branch 'master' into fix_isort

zopefoundation · Jun 20, 2017 · 037532c · 037532c
2 parents ee567cb + 6b5bbeb
commit 037532c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git a/README.rst b/README.rst
@@ -5,7 +5,7 @@ RestrictedPython
 RestrictedPython is a tool that helps to define a subset of the Python language which allows to provide a program input into a trusted environment.
 RestrictedPython is not a sandbox system or a secured environment, but it helps to define a trusted environment and execute untrusted code inside of it.
 
-For full documentation please see  http://restrictedpython.readthedocs.io/ or the local ``docs/index``.
+For full documentation please see http://restrictedpython.readthedocs.io/ or the local ``docs/index``.
 
 Example
 =======

diff --git a/docs/CHANGES.rst b/docs/CHANGES.rst
@@ -4,15 +4,19 @@ Changes
 4.0a3 (unreleased)
 ------------------
 
-- Update Configurations to give better feedback and helpful reports.
+- Fix install problem caused by an invisible non-ASCII character in
+  `README.rst`.
+
+- Update configurations to give better feedback and helpful reports.
+
 
 
 4.0a2 (2017-05-26)
 ------------------
 
 - Modified README and setup.py to provide a better desciption test for PyPI.
   [loechel]
-  
+
 - Drop support for long-deprecated ``sets`` module.
   [tseaver]
 

diff --git a/tox.ini b/tox.ini
@@ -1,6 +1,5 @@
 [tox]
 envlist =
-    coverage-clean,
     py27,
     py27-datetime,
     py27-rp3,
@@ -12,7 +11,7 @@ envlist =
     docs,
     isort,
     flake8,
-    coverage-report,
+    coverage,
 
 skip_missing_interpreters = False
 
@@ -57,19 +56,15 @@ deps =
     zope.testrunner
     coverage
 
-[testenv:coverage-clean]
-deps = coverage
-skip_install = true
-commands = coverage erase
-
-[testenv:coverage-report]
+[testenv:coverage]
 basepython = python2.7
 deps = coverage
 setenv =
   COVERAGE_FILE=.coverage
 
 skip_install = true
 commands =
+    coverage erase
     coverage combine
     coverage html
     coverage xml