summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormilde <milde@929543f6-e4f2-0310-98a6-ba3bd3dd1d04>2019-08-26 12:10:34 +0000
committermilde <milde@929543f6-e4f2-0310-98a6-ba3bd3dd1d04>2019-08-26 12:10:34 +0000
commit1ef1989292e633829bb2fc76f4541a48ad36a8ac (patch)
tree3b43963269a84cbb7b2c8b5232bcb2ebad6465f6
parente3b7e784a5145a704707e04feb09abe0a6be113c (diff)
downloaddocutils-1ef1989292e633829bb2fc76f4541a48ad36a8ac.tar.gz
Drop support for Python 3.4
This doesn't involve a whole lot of changes, but references to Python 3.3 and 3.4 (plus some to the already removed Python 2.6) are removed and 'setup.py' is updated as necessary. This has already been agreed upon, as noted in RELEASE-NOTES.txt: Docutils 0.15.x is the last version supporting Python 2.6, 3.3, and 3.4. Docutils 0.16 is compatible with Python versions 2.7 and 3.5 to 3.7. Signed-off-by: Stephen Finucane <stephen@that.guru> Small fixes by Günter Milde. git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk@8343 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
-rw-r--r--docutils/HISTORY.txt2
-rw-r--r--docutils/README.txt2
-rw-r--r--docutils/docs/dev/testing.txt45
-rwxr-xr-xdocutils/setup.py1
-rw-r--r--docutils/tox.ini2
5 files changed, 24 insertions, 28 deletions
diff --git a/docutils/HISTORY.txt b/docutils/HISTORY.txt
index defbfbb1d..70bac5fa4 100644
--- a/docutils/HISTORY.txt
+++ b/docutils/HISTORY.txt
@@ -20,7 +20,7 @@ Changes Since 0.15
* General
- - Dropped support for Python 2.6, Python 3.3 (work in progress).
+ - Dropped support for Python 2.6, 3.3 and 3.4 (work in progress).
- Keep `backslash escapes`__ in the document tree. Backslash characters in
text are be represented by NULL characters in the ``text`` attribute of
Doctree nodes and removed in the writing stage by the node's
diff --git a/docutils/README.txt b/docutils/README.txt
index 2816531a5..41c8c6ba9 100644
--- a/docutils/README.txt
+++ b/docutils/README.txt
@@ -104,7 +104,7 @@ Requirements
To run the code, Python_ must be installed.
Docutils is compatible with Python versions 2.7, and
-versions 3.3 to 3.7 (cf. `Python 3 compatibility`_).
+versions 3.5 to 3.7 (cf. `Python 3 compatibility`_).
Docutils uses the following packages for enhanced functionality, if they are
installed:
diff --git a/docutils/docs/dev/testing.txt b/docutils/docs/dev/testing.txt
index f9d326b52..65b8a8cc6 100644
--- a/docutils/docs/dev/testing.txt
+++ b/docutils/docs/dev/testing.txt
@@ -38,29 +38,27 @@ Python 3, ``cd`` to the package's root directory and do::
Python Versions
===============
-A docutils release has a commitment to support a minimum version and
-beyond. Before a release is cut, tests must pass in all supported python
-versions.
+A docutils release has a commitment to support a minimum version and beyond.
+Before a release is cut, tests must pass in all supported Python versions.
-The Docutils 0.15 release supports Python 2.6 or later.
+The Docutils 0.15 release supports Python 2.7 and Python 3.5 or later.
-Therefore, you should install python 2.6, 2.7 as well as 3.3 up to the
-latest Python (3.5 at the time of this writing) installed and always run the
-tests on all of them. In a pinch, the edge cases (2.6, and 3.5) should cover
-most of it.
+Therefore, you should install Python 2.7 as well as 3.5 up to the latest Python
+(3.7 at the time of this writing) and always run the tests on all of
+them. In a pinch, the edge cases (2.7, and 3.7) should cover most of it.
Good resources covering the differences between Python versions:
-* `What's New in Python 2.6`__
* `What's New in Python 2.7`__
-* `What's New in Python 3.3`__
-* `What's New in Python 3.4`__
+* `What's New in Python 3.5`__
+* `What's New in Python 3.6`__
+* `What's New in Python 3.7`__
* `PEP 290 - Code Migration and Modernization`__
-__ http://docs.python.org/whatsnew/2.6.html
-__ http://docs.python.org/whatsnew/2.7.html
-__ https://docs.python.org/3/whatsnew/3.3.html
-__ https://docs.python.org/3/whatsnew/3.4.html
+__ https://docs.python.org/whatsnew/2.6.html
+__ https://docs.python.org/3/whatsnew/3.5.html
+__ https://docs.python.org/3/whatsnew/3.6.html
+__ https://docs.python.org/3/whatsnew/3.7.html
__ http://www.python.org/peps/pep-0290.html
.. _Python Check-in Policies: http://www.python.org/dev/tools.html
@@ -76,20 +74,19 @@ Testing across multiple python versions
test multiple python versions::
# assuming your system runs 2.7.x
- pyenv install 2.6.9
- pyenv install 3.3.6
- pyenv install 3.4.3
- pyenv global system 2.6.9 3.3.6 3.4.3
+ pyenv install 3.5.7
+ pyenv install 3.6.9
+ pyenv install 3.7.3
+ pyenv global system 3.5.7 3.6.9 3.7.3
# reset your shims
rm -rf ~/.pyenv/shims && pyenv rehash
-This will give you ``python2.6``, ``python2.7``, ``python3.3`` and
-``python3.4``. Along with that, ``pip2.6``, ``pip2.7`` and so on.
+This will give you ``python2.7`` and ``python3.5`` through ``python3.7``.
+You will also get ``pip2.7``, ``pip3.5``, etc.
-To save time, you can use `tox`_. To
-install tox, you can use ``easy_install tox`` or ``pip install tox``.
-From shell::
+To save time, you can use `tox`_. To install tox, run ``pip install tox``.
+Once installed, from shell::
cd docutils
tox
diff --git a/docutils/setup.py b/docutils/setup.py
index 469b39722..b7c899516 100755
--- a/docutils/setup.py
+++ b/docutils/setup.py
@@ -199,7 +199,6 @@ classifiers = [
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
- 'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
diff --git a/docutils/tox.ini b/docutils/tox.ini
index 0f3e4bd02..8962474bd 100644
--- a/docutils/tox.ini
+++ b/docutils/tox.ini
@@ -1,6 +1,6 @@
[tox]
minversion = 1.6
-envlist = py{27,34,35,36,37}
+envlist = py{27,35,36,37}
# NOTE(stephenfin): we need to skip generating and installing the sdist, opting
# to install manually instead. This is because we still use distutils and pip
# hasn't supported uninstalling distutils-packaged libraries since 6.0. Once we