Update documentation: Python 2.6 and 3.3 are no longer supported.

Author: RKrahl

.travis.yml

@@ -1,10 +1,10 @@
 language: python
 python:
   - "2.7"
-  - "3.3"
   - "3.4"
   - "3.5"
   - "3.6"
+  - "3.7"
 install: pip install -r requirements.txt
 script: make test
 

MANIFEST.in

@@ -3,7 +3,6 @@ include LICENSE.txt
 include MANIFEST.in
 include README.rst
 include doc/examples/*.py
-include python2_6.patch
 include tests/conftest.py
 include tests/pytest.ini
 include tests/test_*.py

Makefile

@@ -8,13 +8,12 @@ build:
 test: build
 	PYTHONPATH=$(BUILDDIR)/lib $(PYTHON) -m pytest tests
 
-sdist: python2_6.patch .gitrevision
+sdist: .gitrevision
 	$(PYTHON) setup.py sdist
 
 doc-html:
 	$(MAKE) -C doc html
 
-
 clean:
 	rm -f *~ tests/*~
 	rm -rf build
@@ -27,15 +26,11 @@ distclean: clean
 	rm -rf __pycache__ tests/__pycache__
 	rm -rf dist
 	rm -rf pytest_dependency.egg-info
-	rm -f python2_6.patch
+	rm -rf .pytest_cache
 	$(MAKE) -C doc distclean
 
 .gitrevision:
 	git describe --always --dirty > .gitrevision
 
-python2_6.patch:
-	git diff `git merge-base master python2_6` python2_6 \
-	    -- . ':(exclude).travis.yml' > $@
-
 
 .PHONY: build test sdist doc-html clean distclean .gitrevision

README.rst

@@ -20,13 +20,10 @@ The latest release version can be found at PyPI, see
 System requirements
 -------------------
 
-+ Python 2.6, 2.7, or 3.3 and newer.
-  Python 2.6 requires patching the sources, see below.
++ Python 2.7 or 3.4 and newer.
 + `setuptools`_.
 + `pytest`_ 3.6.0 or newer.
 
-(Python 3.2 is not supported by pytest 3.6.0 itself.)
-
 
 Installation
 ------------
@@ -48,16 +45,6 @@ Installation
 The last step might require admin privileges in order to write into
 the site-packages directory of your Python installation.
 
-If you are using Python 2.6, apply python2_6.patch after the first
-step:
-
-1a. Patch::
-
-     $ patch -p1 < python2_6.patch
-
-It removes the use of certain language features (dict comprehensions)
-that were introduced in Python 2.7.
-
 
 Documentation
 -------------

doc/src/about.rst

@@ -71,7 +71,7 @@ Copyright and License
 
 - Copyright 2013-2015
   Helmholtz-Zentrum Berlin für Materialien und Energie GmbH
-- Copyright 2016-2017 Rolf Krahl
+- Copyright 2016-2018 Rolf Krahl
 
 Licensed under the Apache License, Version 2.0 (the "License"); you
 may not use this file except in compliance with the License.  You may

doc/src/install.rst

@@ -4,13 +4,10 @@ Installation instructions
 System requirements
 -------------------
 
-+ Python 2.6, 2.7, or 3.3 and newer.
-  Python 2.6 requires patching the sources, see below.
++ Python 2.7 or 3.4 and newer.
 + `setuptools`_.
 + `pytest`_ 3.6.0 or newer.
 
-(Python 3.2 is not supported by pytest 3.6.0 itself.)
-
 
 .. _install-other-packages:
 
@@ -55,20 +52,8 @@ Installation
 The last step might require admin privileges in order to write into
 the site-packages directory of your Python installation.
 
-If you are using Python 2.6, apply python2_6.patch after the first
-step:
-
-1a. Patch::
-
-     $ patch -p1 < python2_6.patch
-
-It removes the use of certain language features (dict comprehensions)
-that were introduced in Python 2.7.
-
 For production use, it is always recommended to use the latest release
-version from PyPI, see above.  If you build from the development
-sources that can be found at GitHub, please note that python2_6.patch
-is generated dynamically and not in the source repository.
+version from PyPI, see above.
 
 
 .. _setuptools: http://pypi.python.org/pypi/setuptools/

setup.py

@@ -70,10 +70,10 @@ def make_release_tree(self, base_dir, files):
         'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
         'Operating System :: OS Independent',
         'License :: OSI Approved :: Apache Software License',
     ],