Add [async] deps to dev-requirements.txt

Author: sethmlarson

dev-requirements.txt

@@ -1,7 +1,6 @@
 requests>=2, <3
 pytest
 pytest-cov
-pytest-asyncio
 coverage
 mock
 nosexcover
@@ -16,4 +15,8 @@ pandas
 pyyaml<5.3
 
 black; python_version>="3.6"
-unasync
+
+# Async dependencies
+unasync; python_version>="3.6"
+aiohttp; python_version>="3.6"
+pytest-asyncio; python_version>="3.6"

elasticsearch/client/cluster.py

@@ -137,7 +137,7 @@ def stats(self, node_id=None, params=None, headers=None):
             "GET",
             "/_cluster/stats"
             if node_id in SKIP_IN_PATH
-            else _make_path("_cluster/stats/nodes", node_id),
+            else _make_path("_cluster", "stats", "nodes", node_id),
             params=params,
             headers=headers,
         )

elasticsearch/helpers/test.py

@@ -48,7 +48,7 @@ def _get_client():
         return get_test_client()
 
     @classmethod
-    def setup_class(cls):
+    def setUpClass(cls):
         super(ElasticsearchTestCase, cls).setUpClass()
         cls.client = cls._get_client()
 

setup.py

@@ -19,11 +19,11 @@
 ]
 tests_require = [
     "requests>=2.0.0, <3.0.0",
-    "nose",
     "coverage",
     "mock",
     "pyyaml",
-    "nosexcover",
+    "pytest",
+    "pytest-cov",
 ]
 async_requires = ["aiohttp>3.5.4,<4", "yarl"]
 
@@ -62,7 +62,6 @@
     ],
     python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, <4",
     install_requires=install_requires,
-    test_suite="test_elasticsearch.run_tests.run_all",
     tests_require=tests_require,
     extras_require={
         "develop": tests_require + docs_require + generate_require,

test_elasticsearch/test_async/test_connection.py

@@ -3,18 +3,11 @@
 # Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
 # See the LICENSE file in the project root for more information
 
-import re
 import ssl
 from mock import Mock, patch
 import warnings
 from platform import python_version
 
-from elasticsearch.exceptions import (
-    TransportError,
-    ConflictError,
-    RequestError,
-    NotFoundError,
-)
 from elasticsearch import AIOHttpConnection
 from elasticsearch import __versionstr__
 from ..test_cases import TestCase, SkipTest

test_elasticsearch/test_async/test_server/test_helpers.py

@@ -8,10 +8,12 @@
 from elasticsearch import helpers, TransportError
 from elasticsearch.helpers import ScanError
 
-pytestmark = pytest.mark.asyncio
-
-if not hasattr(helpers, "async_bulk"):
-    pytest.skip("requires async helpers")
+pytestmark = [
+    pytest.mark.asyncio,
+    pytest.mark.skipif(
+        not hasattr(helpers, "async_bulk"), reason="requires async helpers"
+    ),
+]
 
 
 class FailingBulkClient(object):

test_elasticsearch/test_server/__init__.py

@@ -35,10 +35,6 @@ def get_client(**kwargs):
     return new_client
 
 
-def setup():
-    get_client()
-
-
 class ElasticsearchTestCase(BaseTestCase):
     @staticmethod
     def _get_client(**kwargs):

test_elasticsearch/test_server/test_common.py

@@ -266,7 +266,7 @@ def run_skip(self, skip):
             min_version, max_version = version.split("-")
             min_version = _get_version(min_version) or (0,)
             max_version = _get_version(max_version) or (999,)
-            if min_version <= self.es_version <= max_version:
+            if min_version <= self.es_version() <= max_version:
                 raise SkipTest(reason)
 
     def run_catch(self, catch, exception):

tox.ini

@@ -2,6 +2,8 @@
 envlist = pypy,py27,py34,py35,py36,py37,py38,lint,docs
 [testenv]
 whitelist_externals = git
+deps =
+    -r dev-requirements.txt
 commands =
     python setup.py test