Merge branch 'master' of github.com:zopefoundation/DateTime

.gitignore

@@ -1,3 +1,18 @@
-*.egg-info
+bin
+build
+dist
+lib
+parts
+
+*.dll
 *.pyc
-.tox/
+*.pyo
+*.so
+.installed.cfg
+develop-eggs/
+eggs/
+*.egg-info/
+.coverage
+coverage.xml
+.tox
+nosetests.xml

.travis.yml

@@ -1,14 +1,18 @@
 language: python
 sudo: false
-env:
-    - TOXENV=py26
-    - TOXENV=py27
-    - TOXENV=py32
-    - TOXENV=py33
-    - TOXENV=py34
+python:
+    - 2.7
+    - 3.3
+    - 3.4
+    - 3.5
 install:
-    - pip install tox
+    - python bootstrap.py
+    - bin/buildout
 script:
-    - tox
+    - bin/test -v1
 notifications:
     email: false
+cache:
+  pip: true
+  directories:
+    - eggs/

CHANGES.rst

@@ -1,10 +1,16 @@
 Changelog
 =========
 
-4.0.2 (unreleased)
-------------------
+4.2 (unreleased)
+----------------
+
+
+4.1 (2016-04-03)
+----------------
+
+- Add support for Python 3.4 and 3.5.
 
-- Add support for Python 3.4.
+- Drop support for Python 2.6 and 3.2.
 
 4.0.1 (2013-10-15)
 ------------------

setup.py

@@ -21,10 +21,11 @@
 with open(os.path.join(here, 'CHANGES.rst')) as f:
     CHANGES = f.read()
 
+__version__ = '4.2.dev0'
 
 setup(
     name='DateTime',
-    version='4.0.2dev',
+    version=__version__,
     url='http://pypi.python.org/pypi/DateTime',
     license='ZPL 2.1',
     description="""\
@@ -44,13 +45,13 @@
         "Operating System :: OS Independent",
         "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.2",
         "Programming Language :: Python :: 3.3",
         "Programming Language :: Python :: 3.4",
+        "Programming Language :: Python :: 3.5",
         "Programming Language :: Python :: Implementation :: CPython",
+        "Programming Language :: Python :: Implementation :: PyPy",
     ],
     install_requires=[
         'zope.interface',

tox.ini

@@ -1,12 +1,19 @@
 [tox]
 envlist =
-    py26,py27,py32,py33,py34
+    py27,py33,py34,py35,pypy,coverage
 
 [testenv]
 commands =
-    python setup.py -q test -q
-# without explicit deps, setup.py test will download a bunch of eggs into $PWD
-# (and it seems I can't use zope.dottedname[testing] here, so forget DRY)
+    nosetests
 deps =
-    zope.interface
-    pytz
+    nose
+
+[testenv:coverage]
+basepython =
+    python2.7
+commands =
+    nosetests --with-xunit --with-xcoverage --where={envsitepackagesdir}/DateTime --cover-package=DateTime
+deps =
+    nose
+    coverage
+    nosexcover