Skip to content

Commit

Permalink
issue #95 - remove some straggling references to boto (2)
Browse files Browse the repository at this point in the history
  • Loading branch information
jantman committed Feb 2, 2016
1 parent 64aa9a8 commit 057ce27
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 12 deletions.
2 changes: 1 addition & 1 deletion awslimitchecker/checker.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 1 addition & 6 deletions awslimitchecker/runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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 ' \
'<http://awslimitchecker.readthedocs.org/>'
Expand Down
2 changes: 1 addition & 1 deletion awslimitchecker/tests/test_runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 ' \
'<http://awslimitchecker.readthedocs.org/>'
Expand Down
6 changes: 3 additions & 3 deletions awslimitchecker/tests/test_versioncheck.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
]
Expand Down Expand Up @@ -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',
]
Expand Down Expand Up @@ -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',
]
Expand Down
4 changes: 3 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
]
Expand All @@ -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
)

0 comments on commit 057ce27

Please sign in to comment.