Update dependencies to latest versions

This includes several code fixes to make the latest mypy/pylint
happy as well as simplification to the requirements files.

Our doc build script already installs the dev deps so we can simplify
things and consolidate them all into a single requirements file.

Author: jamesls

.github/workflows/run-tests.yml

@@ -20,7 +20,7 @@ jobs:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
         run: |
-          pip install -r requirements-dev.txt -r requirements-docs.txt
+          pip install -r requirements-dev.txt
           pip install --upgrade --upgrade-strategy eager -e .
       - name: Run PRCheck
         run: make prcheck
@@ -43,7 +43,7 @@ jobs:
         run: npm install -g aws-cdk
       - name: Install dependencies
         run: |
-          pip install -r requirements-dev.txt -r requirements-docs.txt
+          pip install -r requirements-dev.txt
           pip install -e .[${{ matrix.cdk-version }}]
       - name: Run CDK tests
         run: python -m pytest tests/functional/cdk
@@ -69,7 +69,7 @@ jobs:
 #          python-version: ${{ matrix.python-version }}
 #      - name: Install dependencies
 #        run: |
-#          pip install -r requirements-dev.txt -r requirements-docs.txt
+#          pip install -r requirements-dev.txt
 #          pip install -e .
 #      - name: Run PRCheck
 #        run: python -m pytest tests/unit tests/functional tests/integration

.pylintrc

@@ -30,14 +30,6 @@ unsafe-load-any-extension=no
 # run arbitrary code
 extension-pkg-whitelist=
 
-# Allow optimization of some AST trees. This will activate a peephole AST
-# optimizer, which will apply various small optimizations. For instance, it can
-# be used to obtain the result of joining multiple strings with the addition
-# operator. Joining a lot of strings can lead to a maximum recursion error in
-# Pylint and this flag can prevent that. It has one side effect, the resulting
-# AST will be different than the one from reality.
-optimize-ast=no
-
 
 [MESSAGES CONTROL]
 
@@ -59,7 +51,7 @@ confidence=
 # --enable=similarities". If you want to run only the classes checker, but have
 # no Warning level messages displayed, use"--disable=all --enable=classes
 # --disable=W"
-disable=R0201,W0613,I0021,I0020,C0111,W1618,W1619,R0902,R0903,W0231,W0611,R0913,W0703,C0330,R0204,I0011,R0904,R0205,R1705,R1710,W0403,C0415,R1725,W0707,R1732,W1512,C0209,W1514
+disable=W0613,I0021,I0020,C0111,R0902,R0903,W0231,W0611,R0913,W0703,I0011,R0904,R0205,R1705,R1710,C0415,R1725,W0707,R1732,W1512,C0209,W1514
 
 
 [REPORTS]
@@ -69,11 +61,6 @@ disable=R0201,W0613,I0021,I0020,C0111,W1618,W1619,R0902,R0903,W0231,W0611,R0913,
 # mypackage.mymodule.MyReporterClass.
 output-format=text
 
-# Put messages in a separate file for each module / package specified on the
-# command line instead of printing them on stdout. Reports (if any) will be
-# written in a file name "pylint_global.[txt|html]".
-files-output=no
-
 # Tells whether to display a full report or only the messages
 reports=no
 
@@ -91,9 +78,6 @@ evaluation=10.0 - ((float(5 * error + warning + refactor + convention) / stateme
 
 [BASIC]
 
-# List of builtins function names that should not be used, separated by a comma
-bad-functions=apply,reduce
-
 # Good variable names which should always be accepted, separated by a comma
 good-names=e,i,j,k,n,ex,Run,_
 
@@ -110,65 +94,35 @@ include-naming-hint=no
 # Regular expression matching correct function names
 function-rgx=[a-z_][a-z0-9_]{2,50}$
 
-# Naming hint for function names
-function-name-hint=[a-z_][a-z0-9_]{2,30}$
-
 # Regular expression matching correct variable names
 variable-rgx=[a-z_][a-z0-9_]{0,50}$
 
-# Naming hint for variable names
-variable-name-hint=[a-z_][a-z0-9_]{2,40}$
-
 # Regular expression matching correct constant names
 const-rgx=(([a-zA-Z_][a-zA-Z0-9_]*)|(__.*__))$
 
-# Naming hint for constant names
-const-name-hint=(([A-Z_][A-Z0-9_]*)|(__.*__))$
-
 # Regular expression matching correct attribute names
 attr-rgx=[a-z_][a-z0-9_]{1,50}$
 
-# Naming hint for attribute names
-attr-name-hint=[a-z_][a-z0-9_]{2,40}$
-
 # Regular expression matching correct argument names
 argument-rgx=[a-z_][a-z0-9_]{0,50}$
 
-# Naming hint for argument names
-argument-name-hint=[a-z_][a-z0-9_]{2,40}$
-
 # Regular expression matching correct class attribute names
 class-attribute-rgx=([A-Za-z_][A-Za-z0-9_]{2,40}|(__.*__))$
 
-# Naming hint for class attribute names
-class-attribute-name-hint=([A-Za-z_][A-Za-z0-9_]{2,40}|(__.*__))$
-
 # Regular expression matching correct inline iteration names
 inlinevar-rgx=[A-Za-z_][A-Za-z0-9_]*$
 
-# Naming hint for inline iteration names
-inlinevar-name-hint=[A-Za-z_][A-Za-z0-9_]*$
-
 # Regular expression matching correct class names
 class-rgx=[A-Z_][a-zA-Z0-9]+$
 
-# Naming hint for class names
-class-name-hint=[A-Z_][a-zA-Z0-9]+$
-
 # Regular expression matching correct module names
 module-rgx=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$
 
-# Naming hint for module names
-module-name-hint=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$
-
 # Regular expression matching correct method names
 # Allow for the ast visitor method names of visit_CamelCase.
 # Allow for do_HTTPMETHOD used in chalice local.
 method-rgx=([a-z_][a-z0-9_]{2,50}|visit_[a-zA-Z]+|do_[A-Z]+)$
 
-# Naming hint for method names
-method-name-hint=[a-z_][a-z0-9_]{2,40}$
-
 # Regular expression which should only match function or class names that do
 # not require a docstring.
 no-docstring-rgx=.*
@@ -190,9 +144,6 @@ ignore-long-lines=^\s*(# )?<?https?://\S+>?$
 # else.
 single-line-if-stmt=no
 
-# List of optional constructs for which whitespace checking is disabled
-no-space-check=trailing-comma,dict-separator
-
 # Maximum number of lines in a module
 max-module-lines=1000
 

CONTRIBUTING.rst

@@ -89,11 +89,6 @@ adding new features, install ``requirements-dev.txt``::
     $ pip install -r requirements-dev.txt
 
 
-If you'd like to just build the docs, install ``requirements-docs.txt``::
-
-    $ pip install -r requirements-docs.txt
-
-
 Running Tests
 -------------
 

chalice/awsclient.py

@@ -35,7 +35,7 @@
     RequestsConnectionError
 from botocore.vendored.requests.exceptions import ReadTimeout as \
     RequestsReadTimeout
-from mypy_extensions import TypedDict
+from typing_extensions import TypedDict
 
 from chalice.constants import DEFAULT_STAGE_NAME
 from chalice.constants import MAX_LAMBDA_DEPLOYMENT_SIZE

chalice/deploy/models.py

@@ -36,8 +36,8 @@ def create(cls, str_version):
         return None
 
 
-Type = TypeVar('Type')
-DV = Union[Placeholder, Type]
+T = TypeVar('T')
+DV = Union[Placeholder, T]
 StrMap = Dict[str, str]
 
 

chalice/deploy/packager.py

@@ -389,7 +389,7 @@ def _check_valid_package(self, package_filename):
         # i.e remove that LambdaLayer model from the app.
         with self._osutils.open_zip(package_filename,
                                     'r', self._osutils.ZIP_DEFLATED) as z:
-            total_size = sum([f.file_size for f in z.infolist()])
+            total_size = sum(f.file_size for f in z.infolist())
             # We have to check the total archive size, Lambda will still error
             # out if you have a zip file with all empty files.  It's not enough
             # to check if the zipfile is empty.

chalice/deploy/sweeper.py

@@ -7,6 +7,7 @@
     Union,
     Sequence,
     cast,
+    NoReturn,
 )
 
 from chalice.config import Config, DeployedResources  # noqa
@@ -370,10 +371,10 @@ def _delete_websocket_api(self, resource_values):
             'message': msg
         }
 
-    def _default_delete(self, resource_values):
-        # type: (Dict[str, Any]) -> None
+    def _default_delete(self, *resource_values):
+        # type: (Any) -> NoReturn
         err_msg = "Sweeper encountered an unknown resource: %s" % \
-                  resource_values
+                  str(resource_values)
         raise RuntimeError(err_msg)
 
     def _update_plan(self, instructions, message=None, insert=False):

chalice/package.py

@@ -756,7 +756,7 @@ def _add_websocket_domain_name(self, resource, template):
                 {'CertificateArn': domain_name.certificate_arn,
                  'EndpointType': 'REGIONAL'},
             ]
-        }
+        }  # type: Dict[str, Any]
         if domain_name.tags:
             properties['Tags'] = domain_name.tags
         template['Resources'][cfn_name] = {
@@ -1655,11 +1655,10 @@ def _get_value(self, loader, node):
         # type: (yaml.SafeLoader, Node) -> Any
         if node.tag[1:] == 'GetAtt' and isinstance(node.value,
                                                    six.string_types):
-            value = node.value.split('.', 1)
+            return node.value.split('.', 1)
         elif isinstance(node, ScalarNode):
-            value = loader.construct_scalar(node)
+            return loader.construct_scalar(node)
         elif isinstance(node, SequenceNode):
-            value = loader.construct_sequence(node)
+            return loader.construct_sequence(node)
         else:
-            value = loader.construct_mapping(node)
-        return value
+            return loader.construct_mapping(node)

requirements-dev.in

@@ -4,18 +4,19 @@ pylint<3.0.0
 websocket-client<2.0.0
 hypothesis
 coverage
-doc8
+doc8<1.0.0
 pydocstyle
 flake8
 pytest-cov
 requests
-# Sphinx doesn't support 0.18.x yet.
-docutils<0.18.0
-# There are some py3 specific changes we'll need
-# to make before we can upgrade mypy, so we're holding
-# off on upgrading this for now.
-mypy==0.812
-mypy-extensions
+Sphinx==4.3.2
+docutils
+mypy
+typing-extensions
 wheel
 pygments
 mock
+types-six
+types-python-dateutil
+types-PyYAML
+attrs<21.5.0