Merge branch 'release/4.0.0' into develop

Author: ikirudennis

CHANGELOG.textile

@@ -1,5 +1,9 @@
 h1. Textile Changelog
 
+h2. Version 4.0.0
+* Drop support for Python 2, hence the version bump. Update list of PY3K versions to currently-supported versions. If you need to use textile on Python 2.7 or Python 3.3 or 3.4, please use textile Version 3.0.4.
+* For use in PyPy environments, textile used to work well with the regex package. Lately, it's running into trouble. Please uninstall regex if this is the case for you.
+
 h2. Version 3.0.4
 * BUGFIX: Restricted mode strips out CSS attributes again.
 * Update travis to more current versions and test against current Pillow version.

CONTRIBUTORS.txt

@@ -6,4 +6,5 @@ Mark Pilgrim
 Alex Shiels
 Jason Samsa
 Kurt Raschke
-Dave Brondsema
+Dave Brondsema
+Dmitry Shachnev

setup.cfg

@@ -1,4 +1,2 @@
 [aliases]
 test=pytest
-[bdist_wheel]
-universal=1

setup.py

@@ -42,13 +42,13 @@ def get_version():
         'License :: OSI Approved :: BSD License',
         'Operating System :: OS Independent',
         'Programming Language :: Python',
-        'Topic :: Software Development :: Libraries :: Python Modules',
-        'Programming Language :: Python',
         'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3 :: Only',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
+        'Topic :: Software Development :: Libraries :: Python Modules',
     ],
     keywords='textile,text,html markup',
     install_requires=[
@@ -65,4 +65,5 @@ def get_version():
     cmdclass = {'test': PyTest},
     include_package_data=True,
     zip_safe=False,
+    python_requires='~=3.5',
 )

textile/version.py

@@ -1 +1 @@
-VERSION = '3.0.4'
+VERSION = '4.0.0'