From 057ce27bffec4a0d6ca09e2726e92da91b9700a6 Mon Sep 17 00:00:00 2001 From: Jason Antman Date: Mon, 1 Feb 2016 20:38:24 -0500 Subject: [PATCH] issue #95 - remove some straggling references to boto (2) --- awslimitchecker/checker.py | 2 +- awslimitchecker/runner.py | 7 +------ awslimitchecker/tests/test_runner.py | 2 +- awslimitchecker/tests/test_versioncheck.py | 6 +++--- setup.py | 4 +++- 5 files changed, 9 insertions(+), 12 deletions(-) diff --git a/awslimitchecker/checker.py b/awslimitchecker/checker.py index 432a45e7..f9ce1c2d 100644 --- a/awslimitchecker/checker.py +++ b/awslimitchecker/checker.py @@ -194,7 +194,7 @@ def get_service_names(self): def find_usage(self, service=None, use_ta=True): """ For each limit in the specified service (or all services if - ``service`` is ``None``), query the AWS API via :py:mod:`boto` + ``service`` is ``None``), query the AWS API via ``boto3`` and find the current usage amounts for that limit. This method updates the ``current_usage`` attribute of the diff --git a/awslimitchecker/runner.py b/awslimitchecker/runner.py index 323a0fab..19221be7 100644 --- a/awslimitchecker/runner.py +++ b/awslimitchecker/runner.py @@ -50,11 +50,6 @@ logging.basicConfig(level=logging.WARNING) logger = logging.getLogger() -# suppress boto internal logging below WARNING level -boto_log = logging.getLogger("boto") -boto_log.setLevel(logging.WARNING) -boto_log.propagate = True - # suppress boto3 internal logging below WARNING level boto3_log = logging.getLogger("boto3") boto3_log.setLevel(logging.WARNING) @@ -83,7 +78,7 @@ def parse_args(self, argv): :returns: parsed arguments :rtype: :py:class:`argparse.Namespace` """ - desc = 'Report on AWS service limits and usage via boto, optionally ' \ + desc = 'Report on AWS service limits and usage via boto3, optionally ' \ 'warn about any services with usage nearing or exceeding their' \ ' limits. For further help, see ' \ '' diff --git a/awslimitchecker/tests/test_runner.py b/awslimitchecker/tests/test_runner.py index faf31b48..3119062f 100644 --- a/awslimitchecker/tests/test_runner.py +++ b/awslimitchecker/tests/test_runner.py @@ -107,7 +107,7 @@ def test_parse_args(self): def test_parse_args_parser(self): argv = ['-V'] - desc = 'Report on AWS service limits and usage via boto, optionally ' \ + desc = 'Report on AWS service limits and usage via boto3, optionally ' \ 'warn about any services with usage nearing or exceeding ' \ 'their limits. For further help, see ' \ '' diff --git a/awslimitchecker/tests/test_versioncheck.py b/awslimitchecker/tests/test_versioncheck.py index 3f51e506..724d69c3 100644 --- a/awslimitchecker/tests/test_versioncheck.py +++ b/awslimitchecker/tests/test_versioncheck.py @@ -292,7 +292,7 @@ def test_get_dist_version_url(self): ':alt: PyPi package version', 'Status', '------', - 'Keywords: AWS EC2 Amazon boto limits cloud', + 'Keywords: AWS EC2 Amazon boto boto3 limits cloud', 'Platform: UNKNOWN', 'Classifier: Environment :: Console', ] @@ -330,7 +330,7 @@ def test_get_dist_version_url_pip1(self): ':alt: PyPi package version', 'Status', '------', - 'Keywords: AWS EC2 Amazon boto limits cloud', + 'Keywords: AWS EC2 Amazon boto boto3 limits cloud', 'Platform: UNKNOWN', 'Classifier: Environment :: Console', ] @@ -365,7 +365,7 @@ def test_get_dist_version_url_no_homepage(self): ':alt: PyPi package version', 'Status', '------', - 'Keywords: AWS EC2 Amazon boto limits cloud', + 'Keywords: AWS EC2 Amazon boto boto3 limits cloud', 'Platform: UNKNOWN', 'Classifier: Environment :: Console', ] diff --git a/setup.py b/setup.py index 412f0bd2..87a01d80 100644 --- a/setup.py +++ b/setup.py @@ -64,8 +64,10 @@ 'Programming Language :: Python :: 2.6', 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', + 'Programming Language :: Python :: 3.2', 'Programming Language :: Python :: 3.3', 'Programming Language :: Python :: 3.4', + 'Programming Language :: Python :: 3.5', 'Topic :: Internet', 'Topic :: System :: Monitoring', ] @@ -84,6 +86,6 @@ description='A script and python module to check your AWS service limits and usage using boto.', long_description=long_description, install_requires=requires, - keywords="AWS EC2 Amazon boto limits cloud", + keywords="AWS EC2 Amazon boto boto3 limits cloud", classifiers=classifiers )