diff --git a/.coveragerc b/.coveragerc index f917935c..e64baf09 100644 --- a/.coveragerc +++ b/.coveragerc @@ -13,3 +13,4 @@ exclude_lines = raise NotImplementedError except ImportError: pragma: no cover + .*# nocoverage.* diff --git a/.landscape.yaml b/.landscape.yaml deleted file mode 100644 index d13c797c..00000000 --- a/.landscape.yaml +++ /dev/null @@ -1,8 +0,0 @@ -doc-warnings: true -strictness: medium -test-warnings: false -pylint: - disable: - - protected-access -ignore-paths: - - awslimitchecker/services/__init__.py diff --git a/.travis.yml b/.travis.yml index c4bd7405..2120c49c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,17 +15,21 @@ matrix: env: TOXENV=py37 dist: xenial sudo: true + - python: "3.8" + env: TOXENV=py38 + dist: xenial + sudo: true - python: "3.7" env: TOXENV=docker dist: xenial sudo: true services: - docker - - python: "2.7" + - python: "3.7" env: TOXENV=docs - python: "2.7" env: TOXENV=integration - - python: "3.6" + - python: "3.7" env: TOXENV=integration3 install: - git config --global user.email "travisci@jasonantman.com" diff --git a/CHANGES.rst b/CHANGES.rst index aea9b7be..f3ebe891 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -4,7 +4,9 @@ Changelog Unreleased Changes ------------------ -**Important:** This release includes **major** changes to the EC2 On-Demand Instances service limits! For most users, this means the 175 Instance-type-specific limits will be removed and replaced with five (5) limits. Please see the sections below for further details, as this will especially impact anyone using limit or threshold overrides, or post-processing awslimitchecker's output. This is also a time to remind all users that this project adheres to a strict :ref:`development.versioning_policy` and if occasional breakage due to limit or IAM policy changes is unacceptable, you should pin to a major version. +**Important:** This release includes **major** changes to the EC2 On-Demand Instances service limits! For most users, this means the 175 Instance-type-specific limits will be removed and replaced with five (5) limits. Please see the "New EC2 vCPU Limits" section below for further details, as this will especially impact anyone using limit or threshold overrides, or post-processing awslimitchecker's output. This is also a time to remind all users that this project adheres to a strict :ref:`development.versioning_policy` and if occasional breakage due to limit or IAM policy changes is unacceptable, you should pin to a major version. + +**Important:** Python versions prior to 3.5, including 2.7, are now pending deprecation. As of January 1, 2020, they will no longer be tested or supported, and awslimitchecker **will require Python 3.5 or newer**. Please see below for details. Also take note that running via the official Docker image is a way to ensure the best version of Python is always used. * `Issue #400 `__ / `PR #434 `__ - Support GovCloud region and alternate partitions in STS assumed roles and Trusted Advisor. Thanks to `@djkiourtsis `__. * `Issue #432 `__ - Update EC2 limit handling for new vCPU-based limits in regions other than ``cn-*`` and ``us-gov-*`` (which still use old per-instance-type limits). See section below for further information. For regions other than ``cn-*`` and ``us-gov-*``, **this will remove** all 175 ``Running On-Demand instances`` and the ``Running On-Demand EC2 instances`` limit, and replace them with: @@ -19,6 +21,10 @@ Unreleased Changes * `Issue #433 `_ - Fix broken links in the docs; waffle.io and landscape.io are both gone, sadly. * `Issue #441 `_ - Fix critical bug where awslimitchecker would die with an unhandled ``botocore.exceptions.ParamValidationError`` exception in accounts that have Trusted Advisor but do not have a "Service Limits" check in the "performance" category. * `Issue #439 `_ - Fix unhandled exception in CloudTrail service when attempting to call ``GetEventSelectors`` on an Organization trail. When calling ``DescribeTrails``, we will now pass ``includeShadowTrails`` as False, to not include replications of trails in different regions or organization trails in member accounts (relevant `API documentation `_). +* `Issue #438 `_ - Per `PEP 373 `__, Python 2.7 will officially end support on January 1, 2020. As such, and in keeping with reasoning explained at `python3statement.org `__, awslimitchecker will **stop supporting and testing against Python 2.7** on January 1, 2020. At that point, all new versions will be free to use Python features introduced in 3.5. As of this version, a `PendingDeprecationWarning `__ will be emitted when running awslimitchecker under Python 2.7. +* `Issue #437 `_ - Per `PEP 429 `_, Python 3.4 reached end-of-life on March 18, 2019 and is now officially retired. Add a ``PendingDeprecationWarning`` for users running under this version, announcing that support for Python 3.4 will be removed on January 1, 2020. +* In following with the above two issues, raise a ``DeprecationWarning`` when running on any Python2 version prior to 2.7 or any Python3 version prior to 3.4, in accorance with the `published end-of-life dates of those versions `_. +* `Issue #436 `_ - Begin testing under Python 3.8 and base our Docker image on ``python:3.8-alpine``. New EC2 vCPU Limits +++++++++++++++++++ diff --git a/Dockerfile b/Dockerfile index 370e977f..fcd96da4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3-alpine +FROM python:3.8-alpine ARG git_version diff --git a/README.rst b/README.rst index c7be3bc0..bbd6b53a 100644 --- a/README.rst +++ b/README.rst @@ -97,7 +97,7 @@ Requirements **Either Docker in order to run via the** `docker image `__, **or:** -* Python 2.7 or 3.4+. Python 2.6 and 3.3 are no longer supported. +* Python 3.5 or newer. Python 2.7 will not be supported as of January 1, 2010. * Python `VirtualEnv `_ and ``pip`` (recommended installation method; your OS/distribution should have packages for these) * `boto3 `_ >= 1.4.6 and its dependency `botocore `_ >= 1.6.0. diff --git a/awslimitchecker/checker.py b/awslimitchecker/checker.py index 6c5fb798..6a967021 100644 --- a/awslimitchecker/checker.py +++ b/awslimitchecker/checker.py @@ -45,9 +45,17 @@ import boto3 import sys import logging +import warnings logger = logging.getLogger(__name__) +warnings.filterwarnings( + action="always", category=DeprecationWarning, module=__name__ +) +warnings.filterwarnings( + action="always", category=PendingDeprecationWarning, module=__name__ +) + class AwsLimitChecker(object): @@ -160,6 +168,7 @@ def __init__(self, warning_threshold=80, critical_threshold=99, ' is %s; please consider upgrading.', self.vinfo.release, latest_ver ) + self._check_python_version() self.warning_threshold = warning_threshold self.critical_threshold = critical_threshold self.profile_name = profile_name @@ -185,6 +194,45 @@ def __init__(self, warning_threshold=80, critical_threshold=99, ta_refresh_timeout=ta_refresh_timeout, ta_api_region=ta_api_region) + def _check_python_version(self): + """ + Check that we are running under a supported Python version, and emit a + warning otherwise. + """ + if sys.version_info[:2] == (2, 7): # nocoverage + warnings.warn( + 'awslimitchecker has detected that it is running under Python ' + '2.7. This will no longer be supported as of January 1, 2020. ' + 'Please upgrade to Python 3.5 or newer. Please see the ' + 'changelog for awslimitchecker version 8.0.0 at ' + 'for further details.', + PendingDeprecationWarning + ) + elif sys.version_info[:2] == (3, 4): # nocoverage + warnings.warn( + 'awslimitchecker has detected that it is running under Python ' + '3.4. This will no longer be supported as of January 1, 2020. ' + 'Please upgrade to Python 3.5 or newer. Please see the ' + 'changelog for awslimitchecker version 8.0.0 at ' + 'for further details.', + PendingDeprecationWarning + ) + elif ( + sys.version_info[0] < 3 or + sys.version_info[0] == 3 and sys.version_info[1] < 4 + ): # nocoverage + warnings.warn( + 'awslimitchecker has detected that it is running under Python ' + '%d.%d. This version has reached end-of-life and is no longer ' + 'supported by awslimitchecker, and may not function correctly. ' + 'Please update to a newer Python version (>= 3.5) or switch ' + 'to running via the official Docker image.' + '' % (sys.version_info[0], sys.version_info[1]), + DeprecationWarning + ) + @property def _boto_conn_kwargs(self): """ diff --git a/docs/source/awslimitchecker.alerts.base.rst b/docs/source/awslimitchecker.alerts.base.rst index ffb25be7..fd255f03 100644 --- a/docs/source/awslimitchecker.alerts.base.rst +++ b/docs/source/awslimitchecker.alerts.base.rst @@ -2,6 +2,6 @@ awslimitchecker.alerts.base module ================================== .. automodule:: awslimitchecker.alerts.base - :members: - :undoc-members: - :show-inheritance: + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/awslimitchecker.alerts.dummy.rst b/docs/source/awslimitchecker.alerts.dummy.rst index b1c594e2..b54376c5 100644 --- a/docs/source/awslimitchecker.alerts.dummy.rst +++ b/docs/source/awslimitchecker.alerts.dummy.rst @@ -2,6 +2,6 @@ awslimitchecker.alerts.dummy module =================================== .. automodule:: awslimitchecker.alerts.dummy - :members: - :undoc-members: - :show-inheritance: + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/awslimitchecker.alerts.pagerdutyv1.rst b/docs/source/awslimitchecker.alerts.pagerdutyv1.rst index 883f93b5..30c859c0 100644 --- a/docs/source/awslimitchecker.alerts.pagerdutyv1.rst +++ b/docs/source/awslimitchecker.alerts.pagerdutyv1.rst @@ -2,6 +2,6 @@ awslimitchecker.alerts.pagerdutyv1 module ========================================= .. automodule:: awslimitchecker.alerts.pagerdutyv1 - :members: - :undoc-members: - :show-inheritance: + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/awslimitchecker.alerts.rst b/docs/source/awslimitchecker.alerts.rst index 0a91cbad..886467d8 100644 --- a/docs/source/awslimitchecker.alerts.rst +++ b/docs/source/awslimitchecker.alerts.rst @@ -2,9 +2,9 @@ awslimitchecker.alerts package ============================== .. automodule:: awslimitchecker.alerts - :members: - :undoc-members: - :show-inheritance: + :members: + :undoc-members: + :show-inheritance: Submodules ---------- @@ -14,4 +14,3 @@ Submodules awslimitchecker.alerts.base awslimitchecker.alerts.dummy awslimitchecker.alerts.pagerdutyv1 - diff --git a/docs/source/awslimitchecker.checker.rst b/docs/source/awslimitchecker.checker.rst index d38a894a..bcb832db 100644 --- a/docs/source/awslimitchecker.checker.rst +++ b/docs/source/awslimitchecker.checker.rst @@ -2,6 +2,6 @@ awslimitchecker.checker module ============================== .. automodule:: awslimitchecker.checker - :members: - :undoc-members: - :show-inheritance: + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/awslimitchecker.connectable.rst b/docs/source/awslimitchecker.connectable.rst index cd868f42..efbf5f69 100644 --- a/docs/source/awslimitchecker.connectable.rst +++ b/docs/source/awslimitchecker.connectable.rst @@ -2,6 +2,6 @@ awslimitchecker.connectable module ================================== .. automodule:: awslimitchecker.connectable - :members: - :undoc-members: - :show-inheritance: + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/awslimitchecker.limit.rst b/docs/source/awslimitchecker.limit.rst index 48837510..93f5d406 100644 --- a/docs/source/awslimitchecker.limit.rst +++ b/docs/source/awslimitchecker.limit.rst @@ -2,6 +2,6 @@ awslimitchecker.limit module ============================ .. automodule:: awslimitchecker.limit - :members: - :undoc-members: - :show-inheritance: + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/awslimitchecker.metrics.base.rst b/docs/source/awslimitchecker.metrics.base.rst index c80bc5f5..a5da667f 100644 --- a/docs/source/awslimitchecker.metrics.base.rst +++ b/docs/source/awslimitchecker.metrics.base.rst @@ -2,6 +2,6 @@ awslimitchecker.metrics.base module =================================== .. automodule:: awslimitchecker.metrics.base - :members: - :undoc-members: - :show-inheritance: + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/awslimitchecker.metrics.datadog.rst b/docs/source/awslimitchecker.metrics.datadog.rst index 7977c7c2..41cd689e 100644 --- a/docs/source/awslimitchecker.metrics.datadog.rst +++ b/docs/source/awslimitchecker.metrics.datadog.rst @@ -2,6 +2,6 @@ awslimitchecker.metrics.datadog module ====================================== .. automodule:: awslimitchecker.metrics.datadog - :members: - :undoc-members: - :show-inheritance: + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/awslimitchecker.metrics.dummy.rst b/docs/source/awslimitchecker.metrics.dummy.rst index c25b1c7c..d555e35a 100644 --- a/docs/source/awslimitchecker.metrics.dummy.rst +++ b/docs/source/awslimitchecker.metrics.dummy.rst @@ -2,6 +2,6 @@ awslimitchecker.metrics.dummy module ==================================== .. automodule:: awslimitchecker.metrics.dummy - :members: - :undoc-members: - :show-inheritance: + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/awslimitchecker.metrics.rst b/docs/source/awslimitchecker.metrics.rst index 92f58ed7..33994cee 100644 --- a/docs/source/awslimitchecker.metrics.rst +++ b/docs/source/awslimitchecker.metrics.rst @@ -2,9 +2,9 @@ awslimitchecker.metrics package =============================== .. automodule:: awslimitchecker.metrics - :members: - :undoc-members: - :show-inheritance: + :members: + :undoc-members: + :show-inheritance: Submodules ---------- @@ -14,4 +14,3 @@ Submodules awslimitchecker.metrics.base awslimitchecker.metrics.datadog awslimitchecker.metrics.dummy - diff --git a/docs/source/awslimitchecker.rst b/docs/source/awslimitchecker.rst index 07152c38..b3bc8bfc 100644 --- a/docs/source/awslimitchecker.rst +++ b/docs/source/awslimitchecker.rst @@ -2,18 +2,18 @@ awslimitchecker package ======================= .. automodule:: awslimitchecker - :members: - :undoc-members: - :show-inheritance: + :members: + :undoc-members: + :show-inheritance: Subpackages ----------- .. toctree:: - awslimitchecker.alerts - awslimitchecker.metrics - awslimitchecker.services + awslimitchecker.alerts + awslimitchecker.metrics + awslimitchecker.services Submodules ---------- @@ -27,4 +27,3 @@ Submodules awslimitchecker.trustedadvisor awslimitchecker.utils awslimitchecker.version - diff --git a/docs/source/awslimitchecker.runner.rst b/docs/source/awslimitchecker.runner.rst index eba058c5..2c0d0a83 100644 --- a/docs/source/awslimitchecker.runner.rst +++ b/docs/source/awslimitchecker.runner.rst @@ -2,6 +2,6 @@ awslimitchecker.runner module ============================= .. automodule:: awslimitchecker.runner - :members: - :undoc-members: - :show-inheritance: + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/awslimitchecker.services.apigateway.rst b/docs/source/awslimitchecker.services.apigateway.rst index c63bab2f..e83e03ee 100644 --- a/docs/source/awslimitchecker.services.apigateway.rst +++ b/docs/source/awslimitchecker.services.apigateway.rst @@ -2,6 +2,6 @@ awslimitchecker.services.apigateway module ========================================== .. automodule:: awslimitchecker.services.apigateway - :members: - :undoc-members: - :show-inheritance: + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/awslimitchecker.services.autoscaling.rst b/docs/source/awslimitchecker.services.autoscaling.rst index 703edaab..cbbbf50e 100644 --- a/docs/source/awslimitchecker.services.autoscaling.rst +++ b/docs/source/awslimitchecker.services.autoscaling.rst @@ -2,6 +2,6 @@ awslimitchecker.services.autoscaling module =========================================== .. automodule:: awslimitchecker.services.autoscaling - :members: - :undoc-members: - :show-inheritance: + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/awslimitchecker.services.base.rst b/docs/source/awslimitchecker.services.base.rst index 74597e6c..7d740a2f 100644 --- a/docs/source/awslimitchecker.services.base.rst +++ b/docs/source/awslimitchecker.services.base.rst @@ -2,6 +2,6 @@ awslimitchecker.services.base module ==================================== .. automodule:: awslimitchecker.services.base - :members: - :undoc-members: - :show-inheritance: + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/awslimitchecker.services.cloudformation.rst b/docs/source/awslimitchecker.services.cloudformation.rst index 608ae898..cbeffe20 100644 --- a/docs/source/awslimitchecker.services.cloudformation.rst +++ b/docs/source/awslimitchecker.services.cloudformation.rst @@ -2,6 +2,6 @@ awslimitchecker.services.cloudformation module ============================================== .. automodule:: awslimitchecker.services.cloudformation - :members: - :undoc-members: - :show-inheritance: + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/awslimitchecker.services.cloudtrail.rst b/docs/source/awslimitchecker.services.cloudtrail.rst index 25c989b6..8bd79ff7 100644 --- a/docs/source/awslimitchecker.services.cloudtrail.rst +++ b/docs/source/awslimitchecker.services.cloudtrail.rst @@ -2,6 +2,6 @@ awslimitchecker.services.cloudtrail module ========================================== .. automodule:: awslimitchecker.services.cloudtrail - :members: - :undoc-members: - :show-inheritance: + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/awslimitchecker.services.directoryservice.rst b/docs/source/awslimitchecker.services.directoryservice.rst index 2dfe05d8..5e5a0930 100644 --- a/docs/source/awslimitchecker.services.directoryservice.rst +++ b/docs/source/awslimitchecker.services.directoryservice.rst @@ -2,6 +2,6 @@ awslimitchecker.services.directoryservice module ================================================ .. automodule:: awslimitchecker.services.directoryservice - :members: - :undoc-members: - :show-inheritance: + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/awslimitchecker.services.dynamodb.rst b/docs/source/awslimitchecker.services.dynamodb.rst index 16eaf89a..fe6bd787 100644 --- a/docs/source/awslimitchecker.services.dynamodb.rst +++ b/docs/source/awslimitchecker.services.dynamodb.rst @@ -2,6 +2,6 @@ awslimitchecker.services.dynamodb module ======================================== .. automodule:: awslimitchecker.services.dynamodb - :members: - :undoc-members: - :show-inheritance: + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/awslimitchecker.services.ebs.rst b/docs/source/awslimitchecker.services.ebs.rst index b6ebeaee..84fed438 100644 --- a/docs/source/awslimitchecker.services.ebs.rst +++ b/docs/source/awslimitchecker.services.ebs.rst @@ -2,6 +2,6 @@ awslimitchecker.services.ebs module =================================== .. automodule:: awslimitchecker.services.ebs - :members: - :undoc-members: - :show-inheritance: + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/awslimitchecker.services.ec2.rst b/docs/source/awslimitchecker.services.ec2.rst index 95c09d8d..0ad5df17 100644 --- a/docs/source/awslimitchecker.services.ec2.rst +++ b/docs/source/awslimitchecker.services.ec2.rst @@ -2,6 +2,6 @@ awslimitchecker.services.ec2 module =================================== .. automodule:: awslimitchecker.services.ec2 - :members: - :undoc-members: - :show-inheritance: + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/awslimitchecker.services.ecs.rst b/docs/source/awslimitchecker.services.ecs.rst index 5d23f901..64181c4d 100644 --- a/docs/source/awslimitchecker.services.ecs.rst +++ b/docs/source/awslimitchecker.services.ecs.rst @@ -2,6 +2,6 @@ awslimitchecker.services.ecs module =================================== .. automodule:: awslimitchecker.services.ecs - :members: - :undoc-members: - :show-inheritance: + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/awslimitchecker.services.efs.rst b/docs/source/awslimitchecker.services.efs.rst index b2fc7b81..a0d80cb4 100644 --- a/docs/source/awslimitchecker.services.efs.rst +++ b/docs/source/awslimitchecker.services.efs.rst @@ -2,6 +2,6 @@ awslimitchecker.services.efs module =================================== .. automodule:: awslimitchecker.services.efs - :members: - :undoc-members: - :show-inheritance: + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/awslimitchecker.services.elasticache.rst b/docs/source/awslimitchecker.services.elasticache.rst index 6b181166..390ccaa8 100644 --- a/docs/source/awslimitchecker.services.elasticache.rst +++ b/docs/source/awslimitchecker.services.elasticache.rst @@ -2,6 +2,6 @@ awslimitchecker.services.elasticache module =========================================== .. automodule:: awslimitchecker.services.elasticache - :members: - :undoc-members: - :show-inheritance: + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/awslimitchecker.services.elasticbeanstalk.rst b/docs/source/awslimitchecker.services.elasticbeanstalk.rst index f5abf84f..55b414f2 100644 --- a/docs/source/awslimitchecker.services.elasticbeanstalk.rst +++ b/docs/source/awslimitchecker.services.elasticbeanstalk.rst @@ -2,6 +2,6 @@ awslimitchecker.services.elasticbeanstalk module ================================================ .. automodule:: awslimitchecker.services.elasticbeanstalk - :members: - :undoc-members: - :show-inheritance: + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/awslimitchecker.services.elb.rst b/docs/source/awslimitchecker.services.elb.rst index 6f3be91a..6666a388 100644 --- a/docs/source/awslimitchecker.services.elb.rst +++ b/docs/source/awslimitchecker.services.elb.rst @@ -2,6 +2,6 @@ awslimitchecker.services.elb module =================================== .. automodule:: awslimitchecker.services.elb - :members: - :undoc-members: - :show-inheritance: + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/awslimitchecker.services.firehose.rst b/docs/source/awslimitchecker.services.firehose.rst index 2b09e254..f7ef9476 100644 --- a/docs/source/awslimitchecker.services.firehose.rst +++ b/docs/source/awslimitchecker.services.firehose.rst @@ -2,6 +2,6 @@ awslimitchecker.services.firehose module ======================================== .. automodule:: awslimitchecker.services.firehose - :members: - :undoc-members: - :show-inheritance: + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/awslimitchecker.services.iam.rst b/docs/source/awslimitchecker.services.iam.rst index 19a96609..183a938e 100644 --- a/docs/source/awslimitchecker.services.iam.rst +++ b/docs/source/awslimitchecker.services.iam.rst @@ -2,6 +2,6 @@ awslimitchecker.services.iam module =================================== .. automodule:: awslimitchecker.services.iam - :members: - :undoc-members: - :show-inheritance: + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/awslimitchecker.services.lambdafunc.rst b/docs/source/awslimitchecker.services.lambdafunc.rst index df01e1a6..8bbf2cda 100644 --- a/docs/source/awslimitchecker.services.lambdafunc.rst +++ b/docs/source/awslimitchecker.services.lambdafunc.rst @@ -2,6 +2,6 @@ awslimitchecker.services.lambdafunc module ========================================== .. automodule:: awslimitchecker.services.lambdafunc - :members: - :undoc-members: - :show-inheritance: + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/awslimitchecker.services.rds.rst b/docs/source/awslimitchecker.services.rds.rst index f49e3488..68222248 100644 --- a/docs/source/awslimitchecker.services.rds.rst +++ b/docs/source/awslimitchecker.services.rds.rst @@ -2,6 +2,6 @@ awslimitchecker.services.rds module =================================== .. automodule:: awslimitchecker.services.rds - :members: - :undoc-members: - :show-inheritance: + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/awslimitchecker.services.redshift.rst b/docs/source/awslimitchecker.services.redshift.rst index 854134d6..a32a11ac 100644 --- a/docs/source/awslimitchecker.services.redshift.rst +++ b/docs/source/awslimitchecker.services.redshift.rst @@ -2,6 +2,6 @@ awslimitchecker.services.redshift module ======================================== .. automodule:: awslimitchecker.services.redshift - :members: - :undoc-members: - :show-inheritance: + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/awslimitchecker.services.route53.rst b/docs/source/awslimitchecker.services.route53.rst index 455e1c94..b3bf7c38 100644 --- a/docs/source/awslimitchecker.services.route53.rst +++ b/docs/source/awslimitchecker.services.route53.rst @@ -2,6 +2,6 @@ awslimitchecker.services.route53 module ======================================= .. automodule:: awslimitchecker.services.route53 - :members: - :undoc-members: - :show-inheritance: + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/awslimitchecker.services.rst b/docs/source/awslimitchecker.services.rst index 1615225f..d6281e1a 100644 --- a/docs/source/awslimitchecker.services.rst +++ b/docs/source/awslimitchecker.services.rst @@ -2,9 +2,9 @@ awslimitchecker.services package ================================ .. automodule:: awslimitchecker.services - :members: - :undoc-members: - :show-inheritance: + :members: + :undoc-members: + :show-inheritance: Submodules ---------- @@ -34,4 +34,3 @@ Submodules awslimitchecker.services.s3 awslimitchecker.services.ses awslimitchecker.services.vpc - diff --git a/docs/source/awslimitchecker.services.s3.rst b/docs/source/awslimitchecker.services.s3.rst index 6d279e7e..4017e2f5 100644 --- a/docs/source/awslimitchecker.services.s3.rst +++ b/docs/source/awslimitchecker.services.s3.rst @@ -2,6 +2,6 @@ awslimitchecker.services.s3 module ================================== .. automodule:: awslimitchecker.services.s3 - :members: - :undoc-members: - :show-inheritance: + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/awslimitchecker.services.ses.rst b/docs/source/awslimitchecker.services.ses.rst index 1804279d..071bfa0f 100644 --- a/docs/source/awslimitchecker.services.ses.rst +++ b/docs/source/awslimitchecker.services.ses.rst @@ -2,6 +2,6 @@ awslimitchecker.services.ses module =================================== .. automodule:: awslimitchecker.services.ses - :members: - :undoc-members: - :show-inheritance: + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/awslimitchecker.services.vpc.rst b/docs/source/awslimitchecker.services.vpc.rst index eb9f6550..45a3563d 100644 --- a/docs/source/awslimitchecker.services.vpc.rst +++ b/docs/source/awslimitchecker.services.vpc.rst @@ -2,6 +2,6 @@ awslimitchecker.services.vpc module =================================== .. automodule:: awslimitchecker.services.vpc - :members: - :undoc-members: - :show-inheritance: + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/awslimitchecker.trustedadvisor.rst b/docs/source/awslimitchecker.trustedadvisor.rst index a873a321..c1099535 100644 --- a/docs/source/awslimitchecker.trustedadvisor.rst +++ b/docs/source/awslimitchecker.trustedadvisor.rst @@ -2,6 +2,6 @@ awslimitchecker.trustedadvisor module ===================================== .. automodule:: awslimitchecker.trustedadvisor - :members: - :undoc-members: - :show-inheritance: + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/awslimitchecker.utils.rst b/docs/source/awslimitchecker.utils.rst index bc379b98..7e36b5c9 100644 --- a/docs/source/awslimitchecker.utils.rst +++ b/docs/source/awslimitchecker.utils.rst @@ -2,6 +2,6 @@ awslimitchecker.utils module ============================ .. automodule:: awslimitchecker.utils - :members: - :undoc-members: - :show-inheritance: + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/awslimitchecker.version.rst b/docs/source/awslimitchecker.version.rst index 26b5a987..3b7937a7 100644 --- a/docs/source/awslimitchecker.version.rst +++ b/docs/source/awslimitchecker.version.rst @@ -2,6 +2,6 @@ awslimitchecker.version module ============================== .. automodule:: awslimitchecker.version - :members: - :undoc-members: - :show-inheritance: + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/development.rst b/docs/source/development.rst index a009ebda..a46d3ef9 100644 --- a/docs/source/development.rst +++ b/docs/source/development.rst @@ -49,7 +49,7 @@ To setup awslimitchecker for development: 1. Fork the `awslimitchecker `_ repository on GitHub -2. Create a ``virtualenv`` to run the code in: +2. Create a ``virtualenv`` (using Python 3.5 or later) to run the code in: .. code-block:: bash diff --git a/docs/source/getting_started.rst b/docs/source/getting_started.rst index a9ea82a7..ae4c6ec8 100644 --- a/docs/source/getting_started.rst +++ b/docs/source/getting_started.rst @@ -61,7 +61,7 @@ Requirements **Either Docker in order to run via the** :ref:`docker image `, **or:** -* Python 2.7 or 3.4+. Python 2.6 and 3.3 are no longer supported. +* Python 3.5 or newer. Python 2.7 will not be supported as of January 1, 2010. * Python `VirtualEnv `_ and ``pip`` (recommended installation method; your OS/distribution should have packages for these) * `boto3 `_ >= 1.4.6 and its dependency `botocore `_ >= 1.6.0. diff --git a/setup.py b/setup.py index 93f04647..23aacdb1 100644 --- a/setup.py +++ b/setup.py @@ -54,7 +54,7 @@ ] classifiers = [ - 'Development Status :: 4 - Beta', + 'Development Status :: 6 - Mature', 'Environment :: Console', 'Intended Audience :: Developers', 'Intended Audience :: Information Technology', @@ -63,13 +63,11 @@ 'Natural Language :: English', 'Operating System :: OS Independent', 'Programming Language :: Python', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.8', 'Topic :: Internet', 'Topic :: System :: Monitoring', ] diff --git a/tox.ini b/tox.ini index 88bd4090..41546edf 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py27,py34,py35,py36,py37,pypy,pypy3,docs,localdocs,integration,integration3,docker +envlist = py27,py34,py35,py36,py37,py38,pypy,pypy3,docs,localdocs,integration,integration3,docker [testenv] deps = @@ -88,7 +88,7 @@ deps = sphinx sphinx_rtd_theme onetimepass==1.0.1 -basepython = python2.7 +basepython = python3.7 commands = python --version virtualenv --version @@ -116,7 +116,7 @@ deps = sphinx sphinx_rtd_theme onetimepass==1.0.1 -basepython = python2.7 +basepython = python3.7 commands = python --version virtualenv --version @@ -161,7 +161,7 @@ commands = deps = {[testenv:integration]deps} passenv = {[testenv:integration]passenv} setenv = {[testenv:integration]setenv} -basepython = python3.6 +basepython = python3.7 sitepackages = False whitelist_externals = env test commands = {[testenv:integration]commands}