From f4c163dbc60b7d21c3f7bdb829ec08b83b6b0c4c Mon Sep 17 00:00:00 2001
From: Nick Lang <nick@nicklang.com>
Date: Fri, 29 Mar 2019 09:27:59 -0600
Subject: [PATCH] update versions and changelog to 7.x

---
 Changelog.rst             |  4 +--
 elasticsearch/__init__.py | 18 ++++++-------
 setup.py                  | 53 +++++++++++++++++----------------------
 3 files changed, 34 insertions(+), 41 deletions(-)

diff --git a/Changelog.rst b/Changelog.rst
index ad7ba9a6..f166e2d4 100644
--- a/Changelog.rst
+++ b/Changelog.rst
@@ -3,12 +3,12 @@
 Changelog
 =========
 
-6.4.0 (dev)
+7.0.0 (dev)
 -----------
   * Removed deprecated option ``update_all_types``.
   * Using insecure SSL configuration (``verify_cert=False``) raises a warning, this can
     be not showed with ``ssl_show_warn=False``
-
+  * Add support for 7.x api's in Elasticsearch both xpack and oss flavors
 6.3.0 (2018-06-20)
 -----------
 
diff --git a/elasticsearch/__init__.py b/elasticsearch/__init__.py
index 0d12966e..de5da014 100644
--- a/elasticsearch/__init__.py
+++ b/elasticsearch/__init__.py
@@ -1,29 +1,29 @@
-#flake8: noqa
+# flake8: noqa
 from __future__ import absolute_import
 
-VERSION = (6, 3, 1)
+VERSION = (7, 0, 0)
 __version__ = VERSION
-__versionstr__ = '.'.join(map(str, VERSION))
+__versionstr__ = ".".join(map(str, VERSION))
 
 import logging
+
 try:  # Python 2.7+
     from logging import NullHandler
 except ImportError:
+
     class NullHandler(logging.Handler):
         def emit(self, record):
             pass
 
+
 import sys
 
-logger = logging.getLogger('elasticsearch')
+logger = logging.getLogger("elasticsearch")
 logger.addHandler(logging.NullHandler())
 
 from .client import Elasticsearch
 from .transport import Transport
-from .connection_pool import ConnectionPool, ConnectionSelector, \
-    RoundRobinSelector
+from .connection_pool import ConnectionPool, ConnectionSelector, RoundRobinSelector
 from .serializer import JSONSerializer
-from .connection import Connection, RequestsHttpConnection, \
-    Urllib3HttpConnection
+from .connection import Connection, RequestsHttpConnection, Urllib3HttpConnection
 from .exceptions import *
-
diff --git a/setup.py b/setup.py
index 36141df0..64b9f49f 100644
--- a/setup.py
+++ b/setup.py
@@ -3,44 +3,39 @@ from os.path import join, dirname
 from setuptools import setup, find_packages
 import sys
 
-VERSION = (6, 3, 1)
+VERSION = (7, 0, 0)
 __version__ = VERSION
-__versionstr__ = '.'.join(map(str, VERSION))
+__versionstr__ = ".".join(map(str, VERSION))
 
-f = open(join(dirname(__file__), 'README'))
+f = open(join(dirname(__file__), "README"))
 long_description = f.read().strip()
 f.close()
 
-install_requires = [
-    'urllib3>=1.21.1',
-]
+install_requires = ["urllib3>=1.21.1"]
 tests_require = [
-    'requests>=2.0.0, <3.0.0',
-    'nose',
-    'coverage',
-    'mock',
-    'pyaml',
-    'nosexcover'
+    "requests>=2.0.0, <3.0.0",
+    "nose",
+    "coverage",
+    "mock",
+    "pyaml",
+    "nosexcover",
 ]
 
 # use external unittest for 2.6
 if sys.version_info[:2] == (2, 6):
-    install_requires.append('unittest2')
+    install_requires.append("unittest2")
 
 setup(
-    name = 'elasticsearch',
-    description = "Python client for Elasticsearch",
+    name="elasticsearch",
+    description="Python client for Elasticsearch",
     license="Apache License, Version 2.0",
-    url = "https://github.com/elastic/elasticsearch-py",
-    long_description = long_description,
-    version = __versionstr__,
-    author = "Honza Král, Nick Lang",
-    author_email = "honza.kral@gmail.com, nick@nicklang.com",
-    packages=find_packages(
-        where='.',
-        exclude=('test_elasticsearch*', )
-    ),
-    classifiers = [
+    url="https://github.com/elastic/elasticsearch-py",
+    long_description=long_description,
+    version=__versionstr__,
+    author="Honza Král, Nick Lang",
+    author_email="honza.kral@gmail.com, nick@nicklang.com",
+    packages=find_packages(where=".", exclude=("test_elasticsearch*",)),
+    classifiers=[
         "Development Status :: 5 - Production/Stable",
         "License :: OSI Approved :: Apache Software License",
         "Intended Audience :: Developers",
@@ -59,12 +54,10 @@ setup(
         "Programming Language :: Python :: Implementation :: PyPy",
     ],
     install_requires=install_requires,
-
-    test_suite='test_elasticsearch.run_tests.run_all',
+    test_suite="test_elasticsearch.run_tests.run_all",
     tests_require=tests_require,
-
     extras_require={
-        'develop': tests_require + ["sphinx<1.7", "sphinx_rtd_theme"],
-        'requests': ['requests>=2.4.0, <3.0.0']
+        "develop": tests_require + ["sphinx<1.7", "sphinx_rtd_theme"],
+        "requests": ["requests>=2.4.0, <3.0.0"],
     },
 )