diff --git a/package/python-docutils/0001-Update-setup.py.patch b/package/python-docutils/0001-Update-setup.py.patch deleted file mode 100644 index 3fb34a9763..0000000000 --- a/package/python-docutils/0001-Update-setup.py.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 583e59ccf72a02c2a6f0399f29f622c7f2f4a932 Mon Sep 17 00:00:00 2001 -From: milde -Date: Sun, 1 Sep 2019 19:39:36 +0000 -Subject: [PATCH] Update setup.py - -Python 3.4 no longer supported, -more languages supported (and Lithuanian accepted by PyPi). - -git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk@8383 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 - -[Asaf: adjust upstream patch to 0.15.2] -Signed-off-by: Asaf Kahlon ---- - setup.py | 14 +++++++++++++- - 1 file changed, 13 insertions(+), 1 deletion(-) - -diff --git a/setup.py b/setup.py -index f801ea2..5c1ebfd 100755 ---- a/setup.py -+++ b/setup.py -@@ -7,6 +7,10 @@ import os - import glob - 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 -@@ -123,7 +127,7 @@ what-you-see-is-what-you-get plaintext markup syntax.""", # wrap at col 60 - 'maintainer_email': 'docutils-develop@lists.sourceforge.net', - 'license': 'public domain, Python, 2-Clause BSD, GPL 3 (see COPYING.txt)', - 'platforms': 'OS-independent', -- 'python_requires': '>=2.6, !=3.0.*, !=3.1.*, !=3.2.*', -+ 'python_requires': '>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*', - 'package_dir': {'docutils': 'docutils', - 'docutils.tools': 'tools'}, - 'packages': ['docutils', -@@ -213,14 +219,20 @@ classifiers = [ - 'Natural Language :: Chinese (Simplified)', - 'Natural Language :: Chinese (Traditional)', - 'Natural Language :: Czech', -+ 'Natural Language :: Danish', - 'Natural Language :: Dutch', - 'Natural Language :: Esperanto', - 'Natural Language :: Finnish', - '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', --- -2.20.1 -k diff --git a/package/python-docutils/python-docutils.hash b/package/python-docutils/python-docutils.hash index ccccca1064..f5e0b82db8 100644 --- a/package/python-docutils/python-docutils.hash +++ b/package/python-docutils/python-docutils.hash @@ -1,4 +1,4 @@ # md5 from https://pypi.python.org/pypi/docutils/json, sha256 locally computed -md5 e26a308d8000b0bed7416a633217c676 docutils-0.15.2.tar.gz -sha256 a2aeea129088da402665e92e0b25b04b073c04b2dce4ab65caaa38b7ce2e1a99 docutils-0.15.2.tar.gz -sha256 efa0c85aa99ea5b4781240031b0d02af54d7b5554c87ad2b2bea9ba490f6663f COPYING.txt +md5 ca5827e2432fd58f4c8d74a6591135de docutils-0.18.1.tar.gz +sha256 679987caf361a7539d76e584cbeddc311e3aee937877c87346f31debc63e9d06 docutils-0.18.1.tar.gz +sha256 f20172170ef9aeebbf53adf5d8f7d309f7dc6068e9a3a1b52ea772305686739d COPYING.txt diff --git a/package/python-docutils/python-docutils.mk b/package/python-docutils/python-docutils.mk index 9a42d3e5dc..39a570f5a1 100644 --- a/package/python-docutils/python-docutils.mk +++ b/package/python-docutils/python-docutils.mk @@ -4,12 +4,12 @@ # ################################################################################ -PYTHON_DOCUTILS_VERSION = 0.15.2 +PYTHON_DOCUTILS_VERSION = 0.18.1 PYTHON_DOCUTILS_SOURCE = docutils-$(PYTHON_DOCUTILS_VERSION).tar.gz -PYTHON_DOCUTILS_SITE = https://files.pythonhosted.org/packages/93/22/953e071b589b0b1fee420ab06a0d15e5aa0c7470eb9966d60393ce58ad61 -PYTHON_DOCUTILS_LICENSE = Public Domain, BSD-2-Clause, GPL-3.0 (emacs mode), other +PYTHON_DOCUTILS_SITE = https://files.pythonhosted.org/packages/57/b1/b880503681ea1b64df05106fc7e3c4e3801736cf63deffc6fa7fc5404cf5 +PYTHON_DOCUTILS_LICENSE = Public Domain, BSD-2-Clause, BSD-3-Clause, Python-2.0, GPL-3.0+ (emacs mode) PYTHON_DOCUTILS_LICENSE_FILES = COPYING.txt -PYTHON_DOCUTILS_SETUP_TYPE = distutils +PYTHON_DOCUTILS_SETUP_TYPE = setuptools $(eval $(python-package)) $(eval $(host-python-package))