Update to Python 2.7 and 3.5 and ready for final release. We have bee…

…n using this package in production for over 3 years.
zopefoundation · Jan 5, 2017 · 5d5459e · 5d5459e
1 parent 5eee4d8
commit 5d5459e
Show file tree

Hide file tree

Showing 6 changed files with 53 additions and 37 deletions.
diff --git a/.coveragerc b/.coveragerc
@@ -0,0 +1,19 @@
+[run]
+branch = True
+source = zope.paste
+
+[report]
+precision = 2
+omit = */interfaces.py
+       */interfaces/*
+       */tests.py
+       */tests/*
+
+[html]
+directory = htmlcov
+
+[paths]
+source =
+   src/zope/paste
+   .tox/*/lib/python*/site-packages/zope/paste
+   .tox/pypy*/site-packages/zope/paste
diff --git a/.gitignore b/.gitignore
@@ -12,4 +12,6 @@ src/zope/paste/test_app/Data*
 bin
 build
 develop-eggs
+dist
+htmlcov
 parts
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,10 +1,12 @@
 Change History
 --------------
 
-1.0.0a2 (unreleased)
-~~~~~~~~~~~~~~~~~~~~
+1.0.0 (unreleased)
+~~~~~~~~~~~~~~~~~~
+
+- Changed support from Python 3.3 to 3.5.
 
-- Nothing changed yet.
+- Dropped Python 2.6 support.
 
 
 1.0.0a1 (2013-02-27)

diff --git a/setup.py b/setup.py
@@ -34,7 +34,7 @@ def read_file(filename):
             ]
 setup(
     name="zope.paste",
-    version='1.0.0a2.dev0',
+    version='1.0.0',
     author="Sidnei da Silva and the Zope Community",
     author_email="zope-dev@zope.org",
     description="Zope 3 and PasteDeploy",
@@ -53,10 +53,9 @@ def read_file(filename):
         'License :: OSI Approved :: Zope Public License',
         'Programming Language :: Python',
         'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.3',
+        'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: Implementation :: CPython',
         'Natural Language :: English',
         'Operating System :: OS Independent',

diff --git a/src/zope/paste/tests.py b/src/zope/paste/tests.py
@@ -120,7 +120,7 @@ def test_serving_test_app():
     >>> server = threading.Thread(target=serve.serve, args=(['app.ini'],))
     >>> server.start()
     >>> import time; time.sleep(1)
-    serving on http://127.0.0.1:8765
+    Serving on http://localhost:8765
 
     >>> print(urlopen('http://localhost:8765/').read().decode())
     <html>

diff --git a/tox.ini b/tox.ini
@@ -1,37 +1,31 @@
 [tox]
-envlist = py26,py27,py33
+envlist = coverage-clean, py27, py35, coverage-report
 
 [testenv]
 commands =
-    python setup.py test -q
-# without explicit deps, setup.py test will download a bunch of eggs into $PWD
+    coverage run -m zope.testrunner --test-path=src --auto-color --auto-progress
+setenv =
+  COVERAGE_FILE=.coverage.{envname}
 deps =
-    ZODB >= 4.0.0dev
-    zope.app.appsetup >= 4.0.0a1.dev
-    zope.app.publication >= 4.0.0a1.dev
-    zope.app.wsgi >= 4.0.0a1.dev
-    PasteDeploy
-    setuptools
-    waitress
-    zope.authentication
-    zope.browserpage
-    zope.component
-    zope.error
-    zope.interface
-    zope.principalregistry
-    zope.publisher
-    zope.security
-    zope.site
-    zope.traversing
+    .[test-app]
+    coverage
+    zope.testrunner
+
+[testenv:coverage-clean]
+deps = coverage
+setenv =
+  COVERAGE_FILE=.coverage
+skip_install = true
+commands = coverage erase
 
-[testenv:coverage]
-basepython =
-    python2.7
-develop = true
+[testenv:coverage-report]
+basepython = python3.5
+deps = coverage
+setenv =
+  COVERAGE_FILE=.coverage
+skip_install = true
 commands =
-    nosetests --with-xunit --with-xcoverage
-deps =
-    {[testenv]deps}
-    nose
-    coverage
-    nosexcover
+    coverage combine
+    coverage report
+    coverage html
+    coverage xml