Menu
▾
▴
[Docutils-checkins] SF.net SVN: docutils:[8934] trunk/docutils
|
From: <mi...@us...> - 2022-01-06 14:52:56
|
Revision: 8934
http://sourceforge.net/p/docutils/code/8934
Author: milde
Date: 2022-01-06 14:52:54 +0000 (Thu, 06 Jan 2022)
Log Message:
-----------
Remove lingering references to Python 2.
Based on Patch 1/6 by Adam Turner (patches #188).
Modified Paths:
--------------
trunk/docutils/docs/dev/distributing.txt
trunk/docutils/docs/dev/release.txt
trunk/docutils/docs/dev/repository.txt
trunk/docutils/docs/user/config.txt
trunk/docutils/docs/user/links.txt
trunk/docutils/setup.py
Modified: trunk/docutils/docs/dev/distributing.txt
===================================================================
--- trunk/docutils/docs/dev/distributing.txt 2022-01-06 00:26:19 UTC (rev 8933)
+++ trunk/docutils/docs/dev/distributing.txt 2022-01-06 14:52:54 UTC (rev 8934)
@@ -28,8 +28,8 @@
Docutils has the following dependencies:
-* Python 2.7 or later is required. Use ">= Python 2.7" in the
- dependencies.
+* Python 3.7 or later is required.
+ Use ">= Python 3.7" in the dependencies.
* Docutils may optionally make use of the PIL (`Python Imaging
Library`_ or Pillow_). If PIL is present, it is automatically
Modified: trunk/docutils/docs/dev/release.txt
===================================================================
--- trunk/docutils/docs/dev/release.txt 2022-01-06 00:26:19 UTC (rev 8933)
+++ trunk/docutils/docs/dev/release.txt 2022-01-06 14:52:54 UTC (rev 8934)
@@ -30,7 +30,6 @@
Run tests ::
export PYTHONWARNINGS=default
- python2 test/alltests.py
python3 test/alltests.py
or use tox.
@@ -46,19 +45,6 @@
python3 -m twine upload --repository-url https://test.pypi.org/legacy/ dist/*
- Wait some minutes to test in virtualenv ::
-
- python2 -m virtualenv py2.7 ; cd py2.7
- export PYTHONPATH= ; . bin/activate
-
- python -m pip install --index-url https://test.pypi.org/simple/ --no-deps docutils
-
- cp -Lr ../docutils-code/docutils/test .
- python test/alltests.py
-
- python -m pip uninstall docutils
- deactivate ; cd .. ; rm -r py2.7
-
Test in venv ::
python3 -m venv du3 ; cd du3
@@ -105,15 +91,6 @@
deactivate ; cd .. ; rm -r du3
- python2 -m virtualenv du2 ; cd du2
- export PYTHONPATH= ; . bin/activate
-
- pip install --no-deps docutils
- cp -Lr ../docutils-code/docutils/test .
- python test/alltests.py
-
- deactivate ; cd .. ; rm -r du2
-
* Notify to docutils-developer and user.
* upload source and generated html to sf-htdocs/0.## ::
@@ -136,7 +113,7 @@
- Select docutils-0.16.tar.gz as default for all OS.
* set_version 0.#.#+1b.dev
-* test with py2 and py3
+* test with py3
* docutils/HISTORY.txt: add title "Changes Since 0.##"
* run sandbox/infrastructure/docutils-update.local
Modified: trunk/docutils/docs/dev/repository.txt
===================================================================
--- trunk/docutils/docs/dev/repository.txt 2022-01-06 00:26:19 UTC (rev 8933)
+++ trunk/docutils/docs/dev/repository.txt 2022-01-06 14:52:54 UTC (rev 8934)
@@ -148,6 +148,8 @@
__ https://setuptools.pypa.io/en/latest/userguide/development_mode.html
#development-mode
+
+ .. _install manually:
3. Install "manually".
Modified: trunk/docutils/docs/user/config.txt
===================================================================
--- trunk/docutils/docs/user/config.txt 2022-01-06 00:26:19 UTC (rev 8933)
+++ trunk/docutils/docs/user/config.txt 2022-01-06 14:52:54 UTC (rev 8934)
@@ -900,10 +900,6 @@
.. Caution::
- * In Python versions older than 2.7.3 and 3.2.3, the newlines_ and
- indents_ options may adversely affect whitespace; use them only for
- reading convenience (see http://bugs.python.org/issue4147).
-
* The XML declaration carries text encoding information. If the encoding
is not UTF-8 or ASCII and the XML declaration is missing, standard
tools may be unable to read the generated XML.
Modified: trunk/docutils/docs/user/links.txt
===================================================================
--- trunk/docutils/docs/user/links.txt 2022-01-06 00:26:19 UTC (rev 8933)
+++ trunk/docutils/docs/user/links.txt 2022-01-06 14:52:54 UTC (rev 8934)
@@ -362,8 +362,7 @@
documentation of Software (and other) *projects* (but other documents
can be written with it too).
- Since version 2.6, the `Python documentation`_ is based on
- reStructuredText and Sphinx.
+ The `Python documentation`_ is based on reStructuredText and Sphinx.
.. _Python documentation: http://docs.python.org/
Modified: trunk/docutils/setup.py
===================================================================
--- trunk/docutils/setup.py 2022-01-06 00:26:19 UTC (rev 8933)
+++ trunk/docutils/setup.py 2022-01-06 14:52:54 UTC (rev 8934)
@@ -9,14 +9,20 @@
try:
from setuptools import setup
except ImportError:
- print('Error: The "setuptools" module, which is required for the')
- print(' installation of Docutils, could not be found.\n')
- print(' You may install it with `python -m pip install setuptools`')
- print(' or from a package called "python-setuptools" (or similar)')
- print(' using your system\'s package manager.\n')
- print(' Alternatively, install a release from PyPi with')
- print(' `python -m pip install docutils`.')
-
+ print("""\
+Error: The "setuptools" module, which is required for the
+ installation of Docutils, could not be found.
+
+ You may install it with `python -m pip install setuptools`
+ or from a package called "python-setuptools" (or similar)
+ using your system\'s package manager.
+
+ Alternatively, install a release from PyPi with
+ `python -m pip install docutils`.'
+
+ If all this fails, try a "manual install".
+ https://docutils.sourceforge.io/docs/dev/repository.html#install-manually
+""")
sys.exit(1)
@@ -36,9 +42,9 @@
'maintainer_email': 'doc...@li...',
'license': 'public domain, Python, 2-Clause BSD, GPL 3 (see COPYING.txt)',
'platforms': 'OS-independent',
- 'python_requires': '>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*',
+ 'python_requires': '>=3.7',
'include_package_data': True,
- 'exclude_package_data': {"": ["docutils.conf"]},
+ 'exclude_package_data': {"": ["docutils.conf"]},
'package_dir': {
'docutils': 'docutils',
'docutils.tools': 'tools'
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
