Merge branch 'prepare-10.4.0'

Author: Rémy HUBSCHER

CHANGELOG.rst

@@ -4,10 +4,11 @@ CHANGELOG
 This document describes changes between each past release.
 
 
-10.4.0 (unreleased)
+10.4.0 (2019-05-09)
 ===================
 
 - Add support for Bearer tokens in the CLI utilities.
+- Use black for code formatting.
 
 
 10.3.0 (2019-03-07)

setup.py

@@ -1,56 +1,47 @@
 import codecs
 import os
-import sys
 from setuptools import setup, find_packages
 
 here = os.path.abspath(os.path.dirname(__file__))
 
-with codecs.open(os.path.join(here, 'README.rst'), encoding='utf-8') as f:
+with codecs.open(os.path.join(here, "README.rst"), encoding="utf-8") as f:
     README = f.read()
 
-REQUIREMENTS = [
-    'requests>=2.8.1',
-    'unidecode',
-]
-
-
-if sys.version_info < (2, 7, 9):
-    # For secure SSL connexion with Python 2.7 (InsecurePlatformWarning)
-    REQUIREMENTS.append('PyOpenSSL')
-    REQUIREMENTS.append('ndg-httpsclient')
-    REQUIREMENTS.append('pyasn1')
+REQUIREMENTS = ["requests>=2.8.1", "unidecode"]
 
 test_requirements = [
-    'pytest',
-    'pytest-cache',
-    'pytest-cov',
-    'pytest-sugar',
-    'pytest-xdist',
-    'kinto',
-    'unidecode',
+    "pytest",
+    "pytest-cache",
+    "pytest-cov",
+    "pytest-sugar",
+    "pytest-xdist",
+    "kinto",
+    "unidecode",
 ]
 
-setup(name='kinto-http',
-      version='10.4.0.dev0',
-      description='Kinto client',
-      long_description=README,
-      license='Apache License (2.0)',
-      classifiers=[
-          "Programming Language :: Python",
-          "Programming Language :: Python :: 3",
-          "Programming Language :: Python :: 3.5",
-          "Programming Language :: Python :: 3.6",
-          "Programming Language :: Python :: Implementation :: CPython",
-          "Topic :: Internet :: WWW/HTTP",
-          "License :: OSI Approved :: Apache Software License"
-      ],
-      keywords="web services",
-      author='Mozilla Services',
-      author_email='[email protected]',
-      url='https://github.com/Kinto/kinto-http.py/',
-      packages=find_packages(),
-      include_package_data=True,
-      zip_safe=False,
-      install_requires=REQUIREMENTS,
-      test_suite='kinto_http.tests',
-      tests_require=test_requirements)
+setup(
+    name="kinto-http",
+    version="10.4.0",
+    description="Kinto client",
+    long_description=README,
+    license="Apache License (2.0)",
+    classifiers=[
+        "Programming Language :: Python",
+        "Programming Language :: Python :: 3",
+        "Programming Language :: Python :: 3.6",
+        "Programming Language :: Python :: 3.7",
+        "Programming Language :: Python :: Implementation :: CPython",
+        "Topic :: Internet :: WWW/HTTP",
+        "License :: OSI Approved :: Apache Software License",
+    ],
+    keywords="web services",
+    author="Mozilla Services",
+    author_email="[email protected]",
+    url="https://github.com/Kinto/kinto-http.py/",
+    packages=find_packages(),
+    include_package_data=True,
+    zip_safe=False,
+    install_requires=REQUIREMENTS,
+    test_suite="kinto_http.tests",
+    tests_require=test_requirements,
+)