[Docutils-checkins] SF.net SVN: docutils:[8383] trunk/docutils

[<mi...@us...>]

Revision: 8383
          http://sourceforge.net/p/docutils/code/8383
Author:   milde
Date:     2019-09-01 19:39:36 +0000 (Sun, 01 Sep 2019)
Log Message:
-----------
Update setup.py

Python 3.4 no longer supported,
more languages supported (and Lithuanian accepted by PyPi).

Modified Paths:
--------------
    trunk/docutils/README.txt
    trunk/docutils/setup.py

Modified: trunk/docutils/README.txt
===================================================================
--- trunk/docutils/README.txt	2019-09-01 19:39:23 UTC (rev 8382)
+++ trunk/docutils/README.txt	2019-09-01 19:39:36 UTC (rev 8383)
@@ -16,7 +16,7 @@
 
 This is for those who want to get up & running quickly.
 
-1. Docutils requires Python (version 2.7 or later), available from
+1. Docutils requires Python, available from
 
      http://www.python.org/
 
@@ -104,10 +104,10 @@
 
 To run the code, Python_ must be installed.
 Docutils is compatible with Python versions 2.7, and
-versions 3.5 to 3.7 (cf. `Python 3 compatibility`_).
+3.5 to 3.7 (cf. `Python 3 compatibility`_).
 
-Docutils uses the following packages for enhanced functionality, if they are
-installed:
+Docutils uses the following packages for enhanced functionality,
+if they are installed:
 
 * The `Python Imaging Library`_, or PIL, is used for some image
   manipulation operations.
@@ -125,7 +125,7 @@
 
 Up to version 0.15, the Docutils codebase was translated "on-demand" using
 the 2to3 tool. Starting with Docutils 0.16, the code base supports both
-Python 2.7 and 3.4+ natively.
+Python 2.7 and 3.5+ natively.
 
 
 Project Files & Directories

Modified: trunk/docutils/setup.py
===================================================================
--- trunk/docutils/setup.py	2019-09-01 19:39:23 UTC (rev 8382)
+++ trunk/docutils/setup.py	2019-09-01 19:39:36 UTC (rev 8383)
@@ -10,6 +10,10 @@
 
 try:
     import setuptools
+except ImportError:
+    print('Warning: Could not load package `setuptools`.')
+    print('Actions requiring `setuptools` instead of `distutils` will fail')
+try:
     from distutils.core import setup, Command
     from distutils.command.build import build
     from distutils.command.build_py import build_py
@@ -82,7 +86,7 @@
     '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.*',
+    'python_requires': '>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*', !=3.4.*',
     'cmdclass': {
         'build_data': build_data,
         'install_data': smart_install_data,
@@ -147,8 +151,6 @@
         'tools/rst2odt.py',
         'tools/rst2odt_prepstyles.py',
     ],
-    # BUG pypi did not like following languages
-    #   'Natural Language :: Lithuanian',
     'classifiers': [
         'Development Status :: 4 - Beta',
         'Environment :: Console',
@@ -176,6 +178,7 @@
         'Natural Language :: Chinese (Simplified)',
         'Natural Language :: Chinese (Traditional)',
         'Natural Language :: Czech',
+        'Natural Language :: Danish',
         'Natural Language :: Dutch',
         'Natural Language :: Esperanto',
         'Natural Language :: Finnish',
@@ -182,8 +185,13 @@
         'Natural Language :: French',
         'Natural Language :: Galician',
         'Natural Language :: German',
+        'Natural Language :: Hebrew',
         'Natural Language :: Italian',
         'Natural Language :: Japanese',
+        'Natural Language :: Korean',
+        'Natural Language :: Latvian',
+        'Natural Language :: Lithuanian',
+        'Natural Language :: Persian',
         'Natural Language :: Polish',
         'Natural Language :: Portuguese (Brazilian)',
         'Natural Language :: Russian',

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.