Merge branch '1.0.x'

setup.py

@@ -1,8 +1,5 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
 import io
 import re
-from collections import OrderedDict
 
 from setuptools import find_packages
 from setuptools import setup
@@ -11,51 +8,24 @@ with io.open("README.rst", "rt", encoding="utf8") as f:
     readme = f.read()
 
 with io.open("src/flask/__init__.py", "rt", encoding="utf8") as f:
-    version = re.search(r"__version__ = \"(.*?)\"", f.read()).group(1)
+    version = re.search(r'__version__ = "(.*?)"', f.read()).group(1)
 
 setup(
     name="Flask",
     version=version,
-    url="https://www.palletsprojects.com/p/flask/",
-    project_urls=OrderedDict(
-        (
-            ("Documentation", "http://flask.pocoo.org/docs/"),
-            ("Code", "https://github.com/pallets/flask"),
-            ("Issue tracker", "https://github.com/pallets/flask/issues"),
-        )
-    ),
-    license="BSD",
+    url="https://palletsprojects.com/p/flask/",
+    project_urls={
+        "Documentation": "http://flask.palletsprojects.com/",
+        "Code": "https://github.com/pallets/flask",
+        "Issue tracker": "https://github.com/pallets/flask/issues",
+    },
+    license="BSD-3-Clause",
     author="Armin Ronacher",
     author_email="armin.ronacher@active-4.com",
-    maintainer="Pallets team",
+    maintainer="Pallets",
     maintainer_email="contact@palletsprojects.com",
     description="A simple framework for building complex web applications.",
     long_description=readme,
-    packages=find_packages("src"),
-    package_dir={"": "src"},
-    include_package_data=True,
-    zip_safe=False,
-    platforms="any",
-    python_requires=">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*",
-    install_requires=[
-        "Werkzeug>=0.15",
-        "Jinja2>=2.10.1",
-        "itsdangerous>=0.24",
-        "click>=5.1",
-    ],
-    extras_require={
-        "dotenv": ["python-dotenv"],
-        "dev": [
-            "pytest>=3",
-            "coverage",
-            "tox",
-            "sphinx",
-            "pallets-sphinx-themes",
-            "sphinxcontrib-log-cabinet",
-            "pre-commit",
-        ],
-        "docs": ["sphinx", "pallets-sphinx-themes", "sphinxcontrib-log-cabinet"],
-    },
     classifiers=[
         "Development Status :: 5 - Production/Stable",
         "Environment :: Web Environment",
@@ -67,7 +37,6 @@ setup(
         "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",
@@ -76,5 +45,33 @@ setup(
         "Topic :: Software Development :: Libraries :: Application Frameworks",
         "Topic :: Software Development :: Libraries :: Python Modules",
     ],
+    packages=find_packages("src"),
+    package_dir={"": "src"},
+    include_package_data=True,
+    python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*",
+    install_requires=[
+        "Werkzeug>=0.15",
+        "Jinja2>=2.10.1",
+        "itsdangerous>=0.24",
+        "click>=5.1",
+    ],
+    extras_require={
+        "dotenv": ["python-dotenv"],
+        "dev": [
+            "pytest",
+            "coverage",
+            "tox",
+            "sphinx",
+            "pallets-sphinx-themes",
+            "sphinxcontrib-log-cabinet",
+            "sphinx-issues",
+        ],
+        "docs": [
+            "sphinx",
+            "pallets-sphinx-themes",
+            "sphinxcontrib-log-cabinet",
+            "sphinx-issues",
+        ],
+    },
     entry_points={"console_scripts": ["flask = flask.cli:main"]},
 )