diff --git a/.travis.yml b/.travis.yml index 2120c49c..c4819240 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,13 +19,13 @@ matrix: env: TOXENV=py38 dist: xenial sudo: true - - python: "3.7" + - python: "3.8" env: TOXENV=docker dist: xenial sudo: true services: - docker - - python: "3.7" + - python: "3.8" env: TOXENV=docs - python: "2.7" env: TOXENV=integration diff --git a/CHANGES.rst b/CHANGES.rst index 0231e11d..a700e132 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,6 +1,16 @@ Changelog ========= +.. _changelog.8_0_1: + +8.0.1 (2019-12-28) +------------------ + +* Fixes `issue #453 `__ - remove version constraint on ``dateutil`` dependency. +* Fixes `issue #454 `__ - remove version constraint on ``botocore`` dependency. +* Update tox ``docs``, ``localdocs``, and ``docker`` environments to use Python 3.8. +* Fixes `issue #451 `__ - Fix default Rules Per VPC Security Group limit. + .. _changelog.8_0_0: 8.0.0 (2019-11-03) @@ -335,7 +345,7 @@ after development was ceased. The test framework used by awslimitchecker, pytest * Update README with correct boto version requirement. (Thanks to `nadlerjessie `_ for the contribution.) * Update minimum ``boto3`` version requirement from 1.2.3 to 1.4.4; the code for `Issue #268 `_ released in 0.11.0 requires boto3 >= 1.4.4 to make the ElasticLoadBalancing ``DescribeAccountLimits`` call. -* **Bug fix for "Running On-Demand EC2 instances" limit** - `Issue #308 `_ - The fix for `Issue #215 `_ / `PR #223 `_, released in 0.6.0 on November 11, 2016 was based on `incorrect information `_ about how Regional Benefit Reserved Instances (RIs) impact the service limit. The code implemented at that time subtracted Regional Benefit RIs from the count of running instances that we use to establish usage. Upon further review, as well as confirmation from AWS Support, some AWS TAMs, and the `relevant AWS documentation `_, only Zonal RIs (AZ-specific) are exempt from the Running On-Demand Instances limit. Regional Benefit RIs are counted the same as any other On-Demand Instances, as they don't have reserved capacity. This release stops subtracting Regional Benefit RIs from the count of Running Instances, which was causing awslimitchecker to report inaccurately low Running Instances usage. +* **Bug fix for "Running On-Demand EC2 instances" limit** - `Issue #308 `_ - The fix for `Issue #215 `_ / `PR #223 `_, released in 0.6.0 on November 11, 2016 was based on `incorrect information `_ about how Regional Benefit Reserved Instances (RIs) impact the service limit. The code implemented at that time subtracted Regional Benefit RIs from the count of running instances that we use to establish usage. Upon further review, as well as confirmation from AWS Support, some AWS TAMs, and the `relevant AWS documentation `_, only Zonal RIs (AZ-specific) are exempt from the Running On-Demand Instances limit. Regional Benefit RIs are counted the same as any other On-Demand Instances, as they don't have reserved capacity. This release stops subtracting Regional Benefit RIs from the count of Running Instances, which was causing awslimitchecker to report inaccurately low Running Instances usage. .. _changelog.1_0_0: @@ -389,7 +399,7 @@ This release **removes the ElastiCache Clusters limit**, which no longer exists. * `Issue #283 `_ - Add gitter.im chat link to README and docs. * `Issue #282 `_ - versionfinder caused awslimitchecker to die unexpectedly on systems without a ``git`` binary on the PATH. Bump versionfinder requirement to ``>= 0.1.1``. -* `Issue #284 `_ - Fix ElastiCache limits to reflect what AWS Support and the `current documentation `_ say, instead of a `support ticket from July 2015 `_. +* `Issue #284 `_ - Fix ElastiCache limits to reflect what AWS Support and the `current documentation `_ say, instead of a `support ticket from July 2015 `_. * Remove the "Clusters" limit, which no longer exists. * "Nodes per Cluster" limit is Memcached only. diff --git a/awslimitchecker/services/ec2.py b/awslimitchecker/services/ec2.py index f1e82fdb..014e7213 100644 --- a/awslimitchecker/services/ec2.py +++ b/awslimitchecker/services/ec2.py @@ -726,7 +726,7 @@ def _get_limits_networking(self): limits['Rules per VPC security group'] = AwsLimit( 'Rules per VPC security group', self, - 50, + 60, self.warning_threshold, self.critical_threshold, limit_type='AWS::EC2::SecurityGroup', diff --git a/awslimitchecker/version.py b/awslimitchecker/version.py index 512fe5d5..56ecd0ab 100644 --- a/awslimitchecker/version.py +++ b/awslimitchecker/version.py @@ -47,7 +47,7 @@ except ImportError: logger.error("Unable to import versionfinder", exc_info=True) -_VERSION_TUP = (8, 0, 0) +_VERSION_TUP = (8, 0, 1) _VERSION = '.'.join([str(x) for x in _VERSION_TUP]) _PROJECT_URL = 'https://github.com/jantman/awslimitchecker' diff --git a/docs/source/conf.py b/docs/source/conf.py index ea08a400..8db85ada 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -317,7 +317,8 @@ r'https?://waffle\.io.*', r'https?://github\.com/pytest-dev/pytest/blob/master/CHANGELOG\.rst', r'https?://github\.com/jantman/awslimitchecker/releases/tag/.*', - r'https?://github\.com/jantman/awslimitchecker/tree/master/.*' + r'https?://github\.com/jantman/awslimitchecker/tree/master/.*', + r'https?://docs\.aws\.amazon\.com/.*#.*', ] # exclude module docstrings - see http://stackoverflow.com/a/18031024/211734 diff --git a/docs/source/limits.rst b/docs/source/limits.rst index 72814682..5e518baa 100644 --- a/docs/source/limits.rst +++ b/docs/source/limits.rst @@ -180,6 +180,7 @@ Max spot instance requests per region Max target capacity for all spot fleets in region 5000 Max target capacity per spot fleet 3000 Rules per VPC security group 50 +Rules per VPC security group 60 Running On-Demand All F instances |check| 128 Running On-Demand All G instances |check| 128 Running On-Demand All P instances |check| 128 diff --git a/setup.py b/setup.py index 7536d8a2..e598b380 100644 --- a/setup.py +++ b/setup.py @@ -45,9 +45,9 @@ requires = [ 'boto3>=1.9.175', - 'botocore>=1.12.175', + 'botocore', 'termcolor>=1.1.0', - 'python-dateutil>=2.4.2', + 'python-dateutil', 'versionfinder>=0.1.1', 'pytz', 'urllib3' diff --git a/tox.ini b/tox.ini index 41546edf..17c4e93d 100644 --- a/tox.ini +++ b/tox.ini @@ -88,7 +88,7 @@ deps = sphinx sphinx_rtd_theme onetimepass==1.0.1 -basepython = python3.7 +basepython = python3.8 commands = python --version virtualenv --version @@ -116,7 +116,7 @@ deps = sphinx sphinx_rtd_theme onetimepass==1.0.1 -basepython = python3.7 +basepython = python3.8 commands = python --version virtualenv --version @@ -167,6 +167,7 @@ whitelist_externals = env test commands = {[testenv:integration]commands} [testenv:docker] +basepython = python3.8 setenv = TOXINIDIR={toxinidir} TOXDISTDIR={distdir}