From d2440133559ea1df864ab68abc2bc08a724c0df1 Mon Sep 17 00:00:00 2001 From: Brad Warren Date: Wed, 16 Nov 2022 23:21:14 -0800 Subject: [PATCH] Upgrade pylint (#9470) * upgrade pylint * pylint --generate-rcfile > .pylintrc * fixup pylintrc * Remove unnecessary lambdas * fix broad-except * fix missing timeouts * fix unit tests * catch more generic exception --- .pylintrc | 705 ++++++++++++------ acme/acme/challenges.py | 5 +- acme/acme/client.py | 2 +- acme/tests/challenges_test.py | 16 +- .../utils/acme_server.py | 3 +- .../utils/dns_server.py | 2 +- .../certbot_integration_tests/utils/misc.py | 8 +- .../utils/pebble_artifacts.py | 2 +- .../utils/pebble_ocsp_server.py | 8 +- .../certbot_integration_tests/utils/proxy.py | 2 +- .../certbot_compatibility_test/validator.py | 20 +- .../certbot_nginx/_internal/configurator.py | 11 +- .../certbot_nginx/_internal/nginxparser.py | 4 +- certbot/CHANGELOG.md | 3 +- certbot/certbot/_internal/eff.py | 2 +- certbot/certbot/_internal/log.py | 6 +- certbot/certbot/_internal/plugins/manual.py | 3 +- certbot/setup.py | 3 +- tools/pinning/current/pyproject.toml | 2 +- tools/requirements.txt | 38 +- 20 files changed, 565 insertions(+), 280 deletions(-) diff --git a/.pylintrc b/.pylintrc index 89495c507..194a8fe94 100644 --- a/.pylintrc +++ b/.pylintrc @@ -1,10 +1,65 @@ -[MASTER] +[MAIN] -# use as many jobs as there are cores -jobs=0 +# Analyse import fallback blocks. This can be used to support both Python 2 and +# 3 compatible code, which means that the block might have code that exists +# only in one or another interpreter, leading to false positives when analysed. +analyse-fallback-blocks=no -# Specify a configuration file. -#rcfile= +# Load and enable all available extensions. Use --list-extensions to see a list +# all available extensions. +#enable-all-extensions= + +# In error mode, messages with a category besides ERROR or FATAL are +# suppressed, and no reports are done by default. Error mode is compatible with +# disabling specific errors. +#errors-only= + +# Always return a 0 (non-error) status code, even if lint errors are found. +# This is primarily useful in continuous integration scripts. +#exit-zero= + +# A comma-separated list of package or module names from where C extensions may +# be loaded. Extensions are loading into the active Python interpreter and may +# run arbitrary code. +extension-pkg-allow-list= + +# A comma-separated list of package or module names from where C extensions may +# be loaded. Extensions are loading into the active Python interpreter and may +# run arbitrary code. (This is an alternative name to extension-pkg-allow-list +# for backward compatibility.) +extension-pkg-whitelist=pywintypes,win32api,win32file,win32security + +# Return non-zero exit code if any of these messages/categories are detected, +# even if score is above --fail-under value. Syntax same as enable. Messages +# specified are enabled, while categories only check already-enabled messages. +fail-on= + +# Specify a score threshold under which the program will exit with error. +fail-under=10 + +# Interpret the stdin as a python script, whose filename needs to be passed as +# the module_or_package argument. +#from-stdin= + +# Files or directories to be skipped. They should be base names, not paths. +ignore=CVS + +# Add files or directories matching the regular expressions patterns to the +# ignore-list. The regex matches against paths and can be in Posix or Windows +# format. Because '\' represents the directory delimiter on Windows systems, it +# can't be used as an escape character. +ignore-paths= + +# Files or directories matching the regular expression patterns are skipped. +# The regex matches against base names, not paths. The default value ignores +# Emacs file locks +ignore-patterns=^\.# + +# List of module names for which member attributes should not be checked +# (useful for modules/projects where namespaces are manipulated during runtime +# and thus existing member attributes cannot be deduced by static analysis). It +# supports qualified module names, as well as Unix pattern matching. +ignored-modules= # Python code to execute, usually for sys.path manipulation such as # pygtk.require(). @@ -13,42 +68,303 @@ jobs=0 # https://github.com/PyCQA/pylint/pull/3396. init-hook="import pylint.config, os, sys; sys.path.append(os.path.dirname(pylint.config.PYLINTRC))" -# Profiled execution. -profile=no +# Use multiple processes to speed up Pylint. Specifying 0 will auto-detect the +# number of processors available to use, and will cap the count on Windows to +# avoid hangs. +jobs=0 -# Add files or directories to the blacklist. They should be base names, not -# paths. -ignore=CVS +# Control the amount of potential inferred values when inferring a single +# object. This can help the performance when dealing with large functions or +# complex, nested conditions. +limit-inference-results=100 + +# List of plugins (as comma separated values of python module names) to load, +# usually to register additional checkers. +load-plugins=linter_plugin # Pickle collected data for later comparisons. persistent=yes -# List of plugins (as comma separated values of python modules names) to load, -# usually to register additional checkers. -load-plugins=linter_plugin +# Minimum Python version to use for version dependent checks. Will default to +# the version used to run pylint. +py-version=3.10 -# A comma-separated list of package or module names from where C extensions may -# be loaded. Extensions are loading into the active Python interpreter and may -# run arbitrary code. -extension-pkg-whitelist=pywintypes,win32api,win32file,win32security +# Discover python modules and packages in the file system subtree. +recursive=no + +# When enabled, pylint would attempt to guess common misconfiguration and emit +# user-friendly hints instead of false-positive error messages. +suggestion-mode=yes + +# Allow loading of arbitrary C extensions. Extensions are imported into the +# active Python interpreter and may run arbitrary code. +unsafe-load-any-extension=no + +# In verbose mode, extra non-checker-related info will be displayed. +#verbose= + + +[BASIC] + +# Naming style matching correct argument names. +argument-naming-style=snake_case + +# Regular expression matching correct argument names. Overrides argument- +# naming-style. If left empty, argument names will be checked with the set +# naming style. +#argument-rgx= + +# Naming style matching correct attribute names. +attr-naming-style=snake_case + +# Regular expression matching correct attribute names. Overrides attr-naming- +# style. If left empty, attribute names will be checked with the set naming +# style. +#attr-rgx= + +# Bad variable names which should always be refused, separated by a comma. +bad-names=foo, + bar, + baz, + toto, + tutu, + tata + +# Bad variable names regexes, separated by a comma. If names match any regex, +# they will always be refused +bad-names-rgxs= + +# Naming style matching correct class attribute names. +class-attribute-naming-style=any + +# Regular expression matching correct class attribute names. Overrides class- +# attribute-naming-style. If left empty, class attribute names will be checked +# with the set naming style. +#class-attribute-rgx= + +# Naming style matching correct class constant names. +class-const-naming-style=UPPER_CASE + +# Regular expression matching correct class constant names. Overrides class- +# const-naming-style. If left empty, class constant names will be checked with +# the set naming style. +#class-const-rgx= + +# Naming style matching correct class names. +class-naming-style=PascalCase + +# Regular expression matching correct class names. Overrides class-naming- +# style. If left empty, class names will be checked with the set naming style. +#class-rgx= + +# Naming style matching correct constant names. +const-naming-style=UPPER_CASE + +# Regular expression matching correct constant names. Overrides const-naming- +# style. If left empty, constant names will be checked with the set naming +# style. +#const-rgx= + +# Minimum line length for functions/classes that require docstrings, shorter +# ones are exempt. +docstring-min-length=-1 + +# Naming style matching correct function names. +function-naming-style=snake_case + +# Regular expression matching correct function names. Overrides function- +# naming-style. If left empty, function names will be checked with the set +# naming style. +function-rgx=[a-z_][a-z0-9_]{2,40}$ + +# Good variable names which should always be accepted, separated by a comma. +good-names=i, + j, + k, + ex, + Run, + _, + fd, + logger + +# Good variable names regexes, separated by a comma. If names match any regex, +# they will always be accepted +good-names-rgxs= + +# Include a hint for the correct naming format with invalid-name. +include-naming-hint=no + +# Naming style matching correct inline iteration names. +inlinevar-naming-style=any + +# Regular expression matching correct inline iteration names. Overrides +# inlinevar-naming-style. If left empty, inline iteration names will be checked +# with the set naming style. +#inlinevar-rgx= + +# Naming style matching correct method names. +method-naming-style=snake_case + +# Regular expression matching correct method names. Overrides method-naming- +# style. If left empty, method names will be checked with the set naming style. +method-rgx=[a-z_][a-z0-9_]{2,50}$ + +# Naming style matching correct module names. +module-naming-style=snake_case + +# Regular expression matching correct module names. Overrides module-naming- +# style. If left empty, module names will be checked with the set naming style. +#module-rgx= + +# Colon-delimited sets of names that determine each other's naming style when +# the name regexes allow several styles. +name-group= + +# Regular expression which should only match function or class names that do +# not require a docstring. +no-docstring-rgx=(__.*__)|(test_[A-Za-z0-9_]*)|(_.*)|(.*Test$) + +# List of decorators that produce properties, such as abc.abstractproperty. Add +# to this list to register other decorators that produce valid properties. +# These decorators are taken in consideration only for invalid-name. +property-classes=abc.abstractproperty + +# Regular expression matching correct type variable names. If left empty, type +# variable names will be checked with the set naming style. +#typevar-rgx= + +# Naming style matching correct variable names. +variable-naming-style=snake_case + +# Regular expression matching correct variable names. Overrides variable- +# naming-style. If left empty, variable names will be checked with the set +# naming style. +variable-rgx=[a-z_][a-z0-9_]{1,30}$ + + +[CLASSES] + +# Warn about protected attribute access inside special methods +check-protected-access-in-special-methods=no + +# List of method names used to declare (i.e. assign) instance attributes. +defining-attr-methods=__init__, + __new__, + setUp, + __post_init__ + +# List of valid names for the first argument in a class method. +valid-classmethod-first-arg=cls + +# List of valid names for the first argument in a metaclass class method. +valid-metaclass-classmethod-first-arg=cls + + +[EXCEPTIONS] + +# Exceptions that will emit a warning when caught. +overgeneral-exceptions=BaseException, + Exception + + +[FORMAT] + +# Expected format of line ending, e.g. empty (any line ending), LF or CRLF. +expected-line-ending-format= + +# Regexp for a line that is allowed to be longer than the limit. +ignore-long-lines=^\s*(# )??$ + +# Number of spaces of indent required inside a hanging or continued line. +# git history told me that "This does something silly/broken..." +#indent-after-paren=4 + +# String used as indentation unit. This is usually " " (4 spaces) or "\t" (1 +# tab). +indent-string=' ' + +# Maximum number of characters on a single line. +max-line-length=100 + +# Maximum number of lines in a module. +max-module-lines=1250 + +# Allow the body of a class to be on the same line as the declaration if body +# contains single statement. +single-line-class-stmt=no + +# Allow the body of an if to be on the same line as the test if there is no +# else. +single-line-if-stmt=no + + +[IMPORTS] + +# List of modules that can be imported at any level, not just the top level +# one. +allow-any-import-level= + +# Allow wildcard imports from modules that define __all__. +allow-wildcard-with-all=no + +# Deprecated modules which should not be used, separated by a comma. +deprecated-modules= + +# Output a graph (.gv or any supported image format) of external dependencies +# to the given file (report RP0402 must not be disabled). +ext-import-graph= + +# Output a graph (.gv or any supported image format) of all (i.e. internal and +# external) dependencies to the given file (report RP0402 must not be +# disabled). +import-graph= + +# Output a graph (.gv or any supported image format) of internal dependencies +# to the given file (report RP0402 must not be disabled). +int-import-graph= + +# Force import order to recognize a module as part of the standard +# compatibility libraries. +known-standard-library= + +# Force import order to recognize a module as part of a third party library. +known-third-party=enchant + +# Couples of modules and preferred modules, separated by a comma. +preferred-modules= + + +[LOGGING] + +# The type of string formatting that logging methods do. `old` means using % +# formatting, `new` is for `{}` formatting. +logging-format-style=old + +# Logging modules to check that the string format arguments are in logging +# function parameter format. +logging-modules=logging,logger [MESSAGES CONTROL] -# Enable the message, report, category or checker with the given id(s). You can -# either give multiple identifier separated by comma (,) or put this option -# multiple time. See also the "--disable" option for examples. -#enable= +# Only show warnings with the listed confidence levels. Leave empty to show +# all. Valid levels: HIGH, CONTROL_FLOW, INFERENCE, INFERENCE_FAILURE, +# UNDEFINED. +confidence=HIGH, + CONTROL_FLOW, + INFERENCE, + INFERENCE_FAILURE, + UNDEFINED # Disable the message, report, category or checker with the given id(s). You # can either give multiple identifiers separated by comma (,) or put this # option multiple times (only on the command line, not in the configuration -# file where it should appear only once).You can also use "--disable=all" to -# disable everything first and then reenable specific checks. For example, if +# file where it should appear only once). You can also use "--disable=all" to +# disable everything first and then re-enable specific checks. For example, if # you want to run only the similarities checker, you can use "--disable=all # --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" +# no Warning level messages displayed, use "--disable=all --enable=classes +# --disable=W". # CERTBOT COMMENT # 1) Once certbot codebase is claimed to be compatible exclusively with Python 3, # the useless-object-inheritance check can be enabled again, and code fixed accordingly. @@ -74,256 +390,185 @@ extension-pkg-whitelist=pywintypes,win32api,win32file,win32security # not need to enforce encoding on files so we disable this check. # 7) consider-using-f-string is "suggesting" to move to f-string when possible with an error. This # clearly relates to code design and not to potential defects in the code, let's just ignore that. -disable=fixme,locally-disabled,locally-enabled,bad-continuation,no-self-use,invalid-name,cyclic-import,duplicate-code,design,import-outside-toplevel,useless-object-inheritance,unsubscriptable-object,no-value-for-parameter,no-else-return,no-else-raise,no-else-break,no-else-continue,raise-missing-from,wrong-import-order,unspecified-encoding,consider-using-f-string +disable=fixme,locally-disabled,invalid-name,cyclic-import,duplicate-code,design,import-outside-toplevel,useless-object-inheritance,unsubscriptable-object,no-value-for-parameter,no-else-return,no-else-raise,no-else-break,no-else-continue,raise-missing-from,wrong-import-order,unspecified-encoding,consider-using-f-string,raw-checker-failed,bad-inline-option,file-ignored,suppressed-message,useless-suppression,deprecated-pragma,use-symbolic-message-instead -[REPORTS] - -# Set the output format. Available formats are text, parseable, colorized, msvs -# (visual studio) and html. You can also give a reporter class, eg -# 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=yes - -# Python expression which should return a note less than 10 (10 is the highest -# note). You have access to the variables errors warning, statement which -# respectively contain the number of errors / warnings messages and the total -# number of statements analyzed. This is used by the global evaluation report -# (RP0004). -evaluation=10.0 - ((float(5 * error + warning + refactor + convention) / statement) * 10) - -# Add a comment according to your evaluation note. This is used by the global -# evaluation report (RP0004). -comment=no - -# Template used to display messages. This is a python new-style format string -# used to format the message information. See doc for all details -#msg-template= +# Enable the message, report, category or checker with the given id(s). You can +# either give multiple identifier separated by comma (,) or put this option +# multiple time (only on the command line, not in the configuration file where +# it should appear only once). See also the "--disable" option for examples. +enable=c-extension-no-member -[BASIC] +[METHOD_ARGS] -# Required attributes for module, separated by a comma -required-attributes= - -# List of builtins function names that should not be used, separated by a comma -bad-functions=map,filter,apply,input,file - -# Good variable names which should always be accepted, separated by a comma -good-names=f,i,j,k,ex,Run,_,fd,logger - -# Bad variable names which should always be refused, separated by a comma -bad-names=foo,bar,baz,toto,tutu,tata - -# Colon-delimited sets of names that determine each other's naming style when -# the name regexes allow several styles. -name-group= - -# Include a hint for the correct naming format with invalid-name -include-naming-hint=no - -# Regular expression matching correct function names -function-rgx=[a-z_][a-z0-9_]{2,40}$ - -# Naming hint for function names -function-name-hint=[a-z_][a-z0-9_]{2,40}$ - -# Regular expression matching correct variable names -variable-rgx=[a-z_][a-z0-9_]{1,30}$ - -# Naming hint for variable names -variable-name-hint=[a-z_][a-z0-9_]{2,30}$ - -# Regular expression matching correct constant names -const-rgx=(([A-Z_][A-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_]{2,30}$ - -# Naming hint for attribute names -attr-name-hint=[a-z_][a-z0-9_]{2,30}$ - -# Regular expression matching correct argument names -argument-rgx=[a-z_][a-z0-9_]{2,30}$ - -# Naming hint for argument names -argument-name-hint=[a-z_][a-z0-9_]{2,30}$ - -# Regular expression matching correct class attribute names -class-attribute-rgx=([A-Za-z_][A-Za-z0-9_]{2,30}|(__.*__))$ - -# Naming hint for class attribute names -class-attribute-name-hint=([A-Za-z_][A-Za-z0-9_]{2,30}|(__.*__))$ - -# 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 -method-rgx=[a-z_][a-z0-9_]{2,50}$ - -# Naming hint for method names -method-name-hint=[a-z_][a-z0-9_]{2,50}$ - -# Regular expression which should only match function or class names that do -# not require a docstring. -no-docstring-rgx=(__.*__)|(test_[A-Za-z0-9_]*)|(_.*)|(.*Test$) - -# Minimum line length for functions/classes that require docstrings, shorter -# ones are exempt. -docstring-min-length=-1 +# List of qualified names (i.e., library.method) which require a timeout +# parameter e.g. 'requests.api.get,requests.api.post' +timeout-methods=requests.api.delete,requests.api.get,requests.api.head,requests.api.options,requests.api.patch,requests.api.post,requests.api.put,requests.api.request [MISCELLANEOUS] # List of note tags to take in consideration, separated by a comma. -notes=FIXME,XXX,TODO +notes=FIXME, + XXX, + TODO + +# Regular expression of note tags to take in consideration. +notes-rgx= -[LOGGING] +[REFACTORING] -# Logging modules to check that the string format arguments are in logging -# function parameter format -logging-modules=logging,logger +# Maximum number of nested blocks for function / method body +max-nested-blocks=5 + +# Complete name of functions that never returns. When checking for +# inconsistent-return-statements if a never returning function is called then +# it will be considered as an explicit return statement and no message will be +# printed. +never-returning-functions=sys.exit,argparse.parse_error -[VARIABLES] +[REPORTS] -# Tells whether we should check for unused import in __init__ files. -init-import=no +# Python expression which should return a score less than or equal to 10. You +# have access to the variables 'fatal', 'error', 'warning', 'refactor', +# 'convention', and 'info' which contain the number of messages in each +# category, as well as 'statement' which is the total number of statements +# analyzed. This score is used by the global evaluation report (RP0004). +evaluation=max(0, 0 if fatal else 10.0 - ((float(5 * error + warning + refactor + convention) / statement) * 10)) -# A regular expression matching the name of dummy variables (i.e. expectedly -# not used). -dummy-variables-rgx=(unused)?_.*|dummy +# Template used to display messages. This is a python new-style format string +# used to format the message information. See doc for all details. +msg-template= -# List of additional names supposed to be defined in builtins. Remember that -# you should avoid to define new builtins when possible. -additional-builtins= +# Set the output format. Available formats are text, parseable, colorized, json +# and msvs (visual studio). You can also give a reporter class, e.g. +# mypackage.mymodule.MyReporterClass. +#output-format= + +# Tells whether to display a full report or only the messages. +reports=no + +# Activate the evaluation score. +score=yes [SIMILARITIES] +# Comments are removed from the similarity computation +ignore-comments=yes + +# Docstrings are removed from the similarity computation +ignore-docstrings=yes + +# Imports are removed from the similarity computation +ignore-imports=yes + +# Signatures are removed from the similarity computation +ignore-signatures=yes + # Minimum lines number of a similarity. min-similarity-lines=6 -# Ignore comments when computing similarities. -ignore-comments=yes -# Ignore docstrings when computing similarities. -ignore-docstrings=yes +[STRING] -# Ignore imports when computing similarities. -ignore-imports=yes +# This flag controls whether inconsistent-quotes generates a warning when the +# character used as a quote delimiter is used inconsistently within a module. +check-quote-consistency=no - -[FORMAT] - -# Maximum number of characters on a single line. -max-line-length=100 - -# Regexp for a line that is allowed to be longer than the limit. -ignore-long-lines=^\s*(# )??$ - -# Allow the body of an if to be on the same line as the test if there is no -# else. -single-line-if-stmt=no - -# List of optional constructs for which whitespace checking is disabled -no-space-check=trailing-comma - -# Maximum number of lines in a module -max-module-lines=1250 - -# String used as indentation unit. This is usually " " (4 spaces) or "\t" (1 -# tab). -indent-string=' ' - -# Number of spaces of indent required inside a hanging or continued line. -# This does something silly/broken... -#indent-after-paren=4 +# This flag controls whether the implicit-str-concat should generate a warning +# on implicit string concatenation in sequences defined over several lines. +check-str-concat-over-line-jumps=no [TYPECHECK] -# Tells whether missing members accessed in mixin class should be ignored. A -# mixin class is detected if its name ends with "mixin" (case insensitive). -ignore-mixin-members=yes +# List of decorators that produce context managers, such as +# contextlib.contextmanager. Add to this list to register other decorators that +# produce valid context managers. +contextmanager-decorators=contextlib.contextmanager + +# List of members which are set dynamically and missed by pylint inference +# system, and so shouldn't trigger E1101 when accessed. Python regular +# expressions are accepted. +generated-members= + +# Tells whether to warn about missing members when the owner of the attribute +# is inferred to be None. +ignore-none=yes + +# This flag controls whether pylint should warn about no-member and similar +# checks whenever an opaque object is returned when inferring. The inference +# can return multiple potential results while evaluating a Python object, but +# some branches might not be evaluated, which results in partial inference. In +# that case, it might be useful to still emit no-member and other checks for +# the rest of the inferred objects. +ignore-on-opaque-inference=yes + +# List of symbolic message names to ignore for Mixin members. +ignored-checks-for-mixins=no-member, + not-async-context-manager, + not-context-manager, + attribute-defined-outside-init + +# List of class names for which member attributes should not be checked (useful +# for classes with dynamically set attributes). This supports the use of +# qualified names. +ignored-classes=optparse.Values,thread._local,_thread._local,argparse.Namespace,Field,Header,JWS,closing # List of module names for which member attributes should not be checked # (useful for modules/projects where namespaces are manipulated during runtime # and thus existing member attributes cannot be deduced by static analysis ignored-modules=pkg_resources,confargparse,argparse -# import errors ignored only in 1.4.4 -# https://bitbucket.org/logilab/pylint/commits/cd000904c9e2 -# List of classes names for which member attributes should not be checked -# (useful for classes with attributes dynamically set). -ignored-classes=Field,Header,JWS,closing +# Show a hint with possible names when a member name was not found. The aspect +# of finding the hint is based on edit distance. +missing-member-hint=yes -# List of members which are set dynamically and missed by pylint inference -# system, and so shouldn't trigger E0201 when accessed. Python regular -# expressions are accepted. -generated-members=REQUEST,acl_users,aq_parent +# The minimum edit distance a name should have in order to be considered a +# similar match for a missing member name. +missing-member-hint-distance=1 + +# The total number of similar names that should be taken in consideration when +# showing a hint for a missing member. +missing-member-max-choices=1 + +# Regex pattern to define which classes are considered mixins. +mixin-class-rgx=.*[Mm]ixin + +# List of decorators that change the signature of a decorated function. +signature-mutators= -[IMPORTS] +[VARIABLES] -# Deprecated modules which should not be used, separated by a comma -deprecated-modules=regsub,TERMIOS,Bastion,rexec +# List of additional names supposed to be defined in builtins. Remember that +# you should avoid defining new builtins when possible. +additional-builtins= -# Create a graph of every (i.e. internal and external) dependencies in the -# given file (report RP0402 must not be disabled) -import-graph= +# Tells whether unused global variables should be treated as a violation. +allow-global-unused-variables=yes -# Create a graph of external dependencies in the given file (report RP0402 must -# not be disabled) -ext-import-graph= +# List of names allowed to shadow builtins +allowed-redefined-builtins= -# Create a graph of internal dependencies in the given file (report RP0402 must -# not be disabled) -int-import-graph= +# List of strings which can identify a callback function by name. A callback +# name must start or end with one of those strings. +callbacks=cb_, + _cb +# A regular expression matching the name of dummy variables (i.e. expected to +# not be used). +dummy-variables-rgx=_+$|(_[a-zA-Z0-9_]*[a-zA-Z0-9]+?$)|dummy|^ignored_|^unused_ -[CLASSES] +# Argument names that match this expression will be ignored. +ignored-argument-names=_.*|^ignored_|^unused_ -# List of interface methods to ignore, separated by a comma. -ignore-iface-methods= +# Tells whether we should check for unused import in __init__ files. +init-import=no -# List of method names used to declare (i.e. assign) instance attributes. -defining-attr-methods=__init__,__new__,setUp - -# List of valid names for the first argument in a class method. -valid-classmethod-first-arg=cls - -# List of valid names for the first argument in a metaclass class method. -valid-metaclass-classmethod-first-arg=mcs - - -[EXCEPTIONS] - -# Exceptions that will emit a warning when being caught. Defaults to -# "Exception" -overgeneral-exceptions=Exception +# List of qualified module names which can have objects that can redefine +# builtins. +redefining-builtins-modules=six.moves,past.builtins,future.builtins,builtins,io diff --git a/acme/acme/challenges.py b/acme/acme/challenges.py index b6290f8e7..61af415bd 100644 --- a/acme/acme/challenges.py +++ b/acme/acme/challenges.py @@ -301,7 +301,7 @@ class HTTP01Response(KeyAuthorizationChallengeResponse): """Whitespace characters which should be ignored at the end of the body.""" def simple_verify(self, chall: 'HTTP01', domain: str, account_public_key: jose.JWK, - port: Optional[int] = None) -> bool: + port: Optional[int] = None, timeout: int = 30) -> bool: """Simple verify. :param challenges.SimpleHTTP chall: Corresponding challenge. @@ -309,6 +309,7 @@ class HTTP01Response(KeyAuthorizationChallengeResponse): :param JWK account_public_key: Public key for the key pair being authorized. :param int port: Port used in the validation. + :param int timeout: Timeout in seconds. :returns: ``True`` iff validation with the files currently served by the HTTP server is successful. @@ -330,7 +331,7 @@ class HTTP01Response(KeyAuthorizationChallengeResponse): uri = chall.uri(domain) logger.debug("Verifying %s at %s...", chall.typ, uri) try: - http_response = requests.get(uri, verify=False) + http_response = requests.get(uri, verify=False, timeout=timeout) except requests.exceptions.RequestException as error: logger.error("Unable to reach %s: %s", uri, error) return False diff --git a/acme/acme/client.py b/acme/acme/client.py index 17ff96e06..ee31f58a7 100644 --- a/acme/acme/client.py +++ b/acme/acme/client.py @@ -480,7 +480,7 @@ class ClientNetwork: :param josepy.JWASignature alg: Algorithm to use in signing JWS. :param bool verify_ssl: Whether to verify certificates on SSL connections. :param str user_agent: String to send as User-Agent header. - :param float timeout: Timeout for requests. + :param int timeout: Timeout for requests. """ def __init__(self, key: jose.JWK, account: Optional[messages.RegistrationResource] = None, alg: jose.JWASignature = jose.RS256, verify_ssl: bool = True, diff --git a/acme/tests/challenges_test.py b/acme/tests/challenges_test.py index 9c68d1668..9e31b36c1 100644 --- a/acme/tests/challenges_test.py +++ b/acme/tests/challenges_test.py @@ -183,7 +183,8 @@ class HTTP01ResponseTest(unittest.TestCase): mock_get.return_value = mock.MagicMock(text=validation) self.assertTrue(self.response.simple_verify( self.chall, "local", KEY.public_key())) - mock_get.assert_called_once_with(self.chall.uri("local"), verify=False) + mock_get.assert_called_once_with(self.chall.uri("local"), verify=False, + timeout=mock.ANY) @mock.patch("acme.challenges.requests.get") def test_simple_verify_bad_validation(self, mock_get): @@ -199,7 +200,8 @@ class HTTP01ResponseTest(unittest.TestCase): HTTP01Response.WHITESPACE_CUTSET)) self.assertTrue(self.response.simple_verify( self.chall, "local", KEY.public_key())) - mock_get.assert_called_once_with(self.chall.uri("local"), verify=False) + mock_get.assert_called_once_with(self.chall.uri("local"), verify=False, + timeout=mock.ANY) @mock.patch("acme.challenges.requests.get") def test_simple_verify_connection_error(self, mock_get): @@ -215,6 +217,16 @@ class HTTP01ResponseTest(unittest.TestCase): self.assertEqual("local:8080", urllib_parse.urlparse( mock_get.mock_calls[0][1][0]).netloc) + @mock.patch("acme.challenges.requests.get") + def test_simple_verify_timeout(self, mock_get): + self.response.simple_verify(self.chall, "local", KEY.public_key()) + mock_get.assert_called_once_with(self.chall.uri("local"), verify=False, + timeout=30) + mock_get.reset_mock() + self.response.simple_verify(self.chall, "local", KEY.public_key(), timeout=1234) + mock_get.assert_called_once_with(self.chall.uri("local"), verify=False, + timeout=1234) + class HTTP01Test(unittest.TestCase): diff --git a/certbot-ci/certbot_integration_tests/utils/acme_server.py b/certbot-ci/certbot_integration_tests/utils/acme_server.py index c12057cd4..ecd7fe778 100755 --- a/certbot-ci/certbot_integration_tests/utils/acme_server.py +++ b/certbot-ci/certbot_integration_tests/utils/acme_server.py @@ -219,7 +219,8 @@ class ACMEServer: # Configure challtestsrv to answer any A record request with ip of the docker host. response = requests.post( f'{BOULDER_V2_CHALLTESTSRV_URL}/set-default-ipv4', - json={'ip': '10.77.77.1'} + json={'ip': '10.77.77.1'}, + timeout=10 ) response.raise_for_status() except BaseException: diff --git a/certbot-ci/certbot_integration_tests/utils/dns_server.py b/certbot-ci/certbot_integration_tests/utils/dns_server.py index ed5b6ccae..8ec024bb3 100644 --- a/certbot-ci/certbot_integration_tests/utils/dns_server.py +++ b/certbot-ci/certbot_integration_tests/utils/dns_server.py @@ -70,7 +70,7 @@ class DNSServer: try: self.process.terminate() self.process.wait(constants.MAX_SUBPROCESS_WAIT) - except BaseException as e: + except BaseException as e: # pylint: disable=broad-except print("BIND9 did not stop cleanly: {}".format(e), file=sys.stderr) shutil.rmtree(self.bind_root, ignore_errors=True) diff --git a/certbot-ci/certbot_integration_tests/utils/misc.py b/certbot-ci/certbot_integration_tests/utils/misc.py index a491ce9ba..f21f7492a 100644 --- a/certbot-ci/certbot_integration_tests/utils/misc.py +++ b/certbot-ci/certbot_integration_tests/utils/misc.py @@ -65,9 +65,9 @@ def check_until_timeout(url: str, attempts: int = 30) -> None: for _ in range(attempts): time.sleep(1) try: - if requests.get(url, verify=False).status_code == 200: + if requests.get(url, verify=False, timeout=10).status_code == 200: return - except requests.exceptions.ConnectionError: + except requests.exceptions.RequestException: pass raise ValueError('Error, url did not respond after {0} attempts: {1}'.format(attempts, url)) @@ -331,7 +331,9 @@ def get_acme_issuers(context: IntegrationTestsContext) -> List[Certificate]: issuers = [] for i in range(PEBBLE_ALTERNATE_ROOTS + 1): - request = requests.get(PEBBLE_MANAGEMENT_URL + '/intermediates/{}'.format(i), verify=False) + request = requests.get(PEBBLE_MANAGEMENT_URL + '/intermediates/{}'.format(i), + verify=False, + timeout=10) issuers.append(load_pem_x509_certificate(request.content, default_backend())) return issuers diff --git a/certbot-ci/certbot_integration_tests/utils/pebble_artifacts.py b/certbot-ci/certbot_integration_tests/utils/pebble_artifacts.py index 8600be5e6..9cd8ddbbe 100644 --- a/certbot-ci/certbot_integration_tests/utils/pebble_artifacts.py +++ b/certbot-ci/certbot_integration_tests/utils/pebble_artifacts.py @@ -31,7 +31,7 @@ def _fetch_asset(asset: str, suffix: str) -> str: if not os.path.exists(asset_path): asset_url = ('https://github.com/letsencrypt/pebble/releases/download/{0}/{1}_{2}' .format(PEBBLE_VERSION, asset, suffix)) - response = requests.get(asset_url) + response = requests.get(asset_url, timeout=30) response.raise_for_status() with open(asset_path, 'wb') as file_h: file_h.write(response.content) diff --git a/certbot-ci/certbot_integration_tests/utils/pebble_ocsp_server.py b/certbot-ci/certbot_integration_tests/utils/pebble_ocsp_server.py index 6fe966ac6..e9c8acd49 100755 --- a/certbot-ci/certbot_integration_tests/utils/pebble_ocsp_server.py +++ b/certbot-ci/certbot_integration_tests/utils/pebble_ocsp_server.py @@ -23,10 +23,12 @@ from certbot_integration_tests.utils.misc import GracefulTCPServer class _ProxyHandler(BaseHTTPServer.BaseHTTPRequestHandler): # pylint: disable=missing-function-docstring def do_POST(self) -> None: - request = requests.get(PEBBLE_MANAGEMENT_URL + '/intermediate-keys/0', verify=False) + request = requests.get(PEBBLE_MANAGEMENT_URL + '/intermediate-keys/0', + verify=False, timeout=10) issuer_key = serialization.load_pem_private_key(request.content, None, default_backend()) - request = requests.get(PEBBLE_MANAGEMENT_URL + '/intermediates/0', verify=False) + request = requests.get(PEBBLE_MANAGEMENT_URL + '/intermediates/0', + verify=False, timeout=10) issuer_cert = x509.load_pem_x509_certificate(request.content, default_backend()) content_len = int(self.headers.get('Content-Length')) @@ -34,7 +36,7 @@ class _ProxyHandler(BaseHTTPServer.BaseHTTPRequestHandler): ocsp_request = ocsp.load_der_ocsp_request(self.rfile.read(content_len)) response = requests.get('{0}/cert-status-by-serial/{1}'.format( PEBBLE_MANAGEMENT_URL, str(hex(ocsp_request.serial_number)).replace('0x', '')), - verify=False + verify=False, timeout=10 ) if not response.ok: diff --git a/certbot-ci/certbot_integration_tests/utils/proxy.py b/certbot-ci/certbot_integration_tests/utils/proxy.py index 3f8e099cf..ba53381e6 100644 --- a/certbot-ci/certbot_integration_tests/utils/proxy.py +++ b/certbot-ci/certbot_integration_tests/utils/proxy.py @@ -21,7 +21,7 @@ def _create_proxy(mapping: Mapping[str, str]) -> Type[BaseHTTPServer.BaseHTTPReq headers = {key.lower(): value for key, value in self.headers.items()} backend = [backend for pattern, backend in mapping.items() if re.match(pattern, headers['host'])][0] - response = requests.get(backend + self.path, headers=headers) + response = requests.get(backend + self.path, headers=headers, timeout=10) self.send_response(response.status_code) for key, value in response.headers.items(): diff --git a/certbot-compatibility-test/certbot_compatibility_test/validator.py b/certbot-compatibility-test/certbot_compatibility_test/validator.py index 1da38ef41..da333e8c5 100644 --- a/certbot-compatibility-test/certbot_compatibility_test/validator.py +++ b/certbot-compatibility-test/certbot_compatibility_test/validator.py @@ -15,6 +15,9 @@ from acme import errors as acme_errors logger = logging.getLogger(__name__) +_VALIDATION_TIMEOUT = 10 + + class Validator: """Collection of functions to test a live webserver's configuration""" @@ -43,9 +46,12 @@ class Validator: """Test whether webserver redirects to secure connection.""" url = "http://{0}:{1}".format(name, port) if headers: - response = requests.get(url, headers=headers, allow_redirects=False) + response = requests.get(url, headers=headers, + allow_redirects=False, + timeout=_VALIDATION_TIMEOUT) else: - response = requests.get(url, allow_redirects=False) + response = requests.get(url, allow_redirects=False, + timeout=_VALIDATION_TIMEOUT) redirect_location = response.headers.get("location", "") # We're checking that the redirect we added behaves correctly. @@ -65,15 +71,19 @@ class Validator: """Test whether webserver redirects.""" url = "http://{0}:{1}".format(name, port) if headers: - response = requests.get(url, headers=headers, allow_redirects=False) + response = requests.get(url, headers=headers, + allow_redirects=False, + timeout=_VALIDATION_TIMEOUT) else: - response = requests.get(url, allow_redirects=False) + response = requests.get(url, allow_redirects=False, + timeout=_VALIDATION_TIMEOUT) return response.status_code in range(300, 309) def hsts(self, name: str) -> bool: """Test for HTTP Strict Transport Security header""" - headers = requests.get("https://" + name).headers + headers = requests.get("https://" + name, + timeout=_VALIDATION_TIMEOUT).headers hsts_header = headers.get("strict-transport-security") if not hsts_header: diff --git a/certbot-nginx/certbot_nginx/_internal/configurator.py b/certbot-nginx/certbot_nginx/_internal/configurator.py index 2786e5e8e..508f50ab7 100644 --- a/certbot-nginx/certbot_nginx/_internal/configurator.py +++ b/certbot-nginx/certbot_nginx/_internal/configurator.py @@ -268,10 +268,12 @@ class NginxConfigurator(common.Configurator): """Prompts user to choose vhosts to install a wildcard certificate for""" if prefer_ssl: vhosts_cache = self._wildcard_vhosts - preference_test = lambda x: x.ssl + def preference_test(x: obj.VirtualHost) -> bool: + return x.ssl else: vhosts_cache = self._wildcard_redirect_vhosts - preference_test = lambda x: not x.ssl + def preference_test(x: obj.VirtualHost) -> bool: + return not x.ssl # Caching! if domain in vhosts_cache: @@ -609,8 +611,9 @@ class NginxConfigurator(common.Configurator): # if we want ssl vhosts: either 'ssl on' or 'addr.ssl' should be enabled # if we want plaintext vhosts: neither 'ssl on' nor 'addr.ssl' should be enabled - _ssl_matches = lambda addr: addr.ssl or all_addrs_are_ssl if ssl else \ - not addr.ssl and not all_addrs_are_ssl + def _ssl_matches(addr: obj.Addr) -> bool: + return addr.ssl or all_addrs_are_ssl if ssl else \ + not addr.ssl and not all_addrs_are_ssl # if there are no listen directives at all, Nginx defaults to # listening on port 80. diff --git a/certbot-nginx/certbot_nginx/_internal/nginxparser.py b/certbot-nginx/certbot_nginx/_internal/nginxparser.py index 874a544f7..1c74cd367 100644 --- a/certbot-nginx/certbot_nginx/_internal/nginxparser.py +++ b/certbot-nginx/certbot_nginx/_internal/nginxparser.py @@ -119,7 +119,9 @@ class RawNginxDumper: return ''.join(self) -spacey = lambda x: (isinstance(x, str) and x.isspace()) or x == '' +def spacey(x: Any) -> bool: + """Is x an empty string or whitespace?""" + return (isinstance(x, str) and x.isspace()) or x == '' class UnspacedList(List[Any]): diff --git a/certbot/CHANGELOG.md b/certbot/CHANGELOG.md index 6f44c9f88..892841942 100644 --- a/certbot/CHANGELOG.md +++ b/certbot/CHANGELOG.md @@ -6,7 +6,7 @@ Certbot adheres to [Semantic Versioning](https://semver.org/). ### Added -* +* `acme.challenges.HTTP01Response.simple_verify` now accepts a timeout argument which defaults to 30 that causes the verification request to timeout after that many seconds. ### Changed @@ -34,6 +34,7 @@ Certbot adheres to [Semantic Versioning](https://semver.org/). ### Fixed * Fixes a bug where the certbot working directory has unusably restrictive permissions on systems with stricter default umasks. +* Requests to subscribe to the EFF mailing list now time out after 60 seconds. We plan to slowly roll out Certbot 2.0 to all of our snap users in the coming months. If you want to use the Certbot 2.0 snap now, please follow the instructions at https://community.letsencrypt.org/t/certbot-2-0-beta-call-for-testing/185945. diff --git a/certbot/certbot/_internal/eff.py b/certbot/certbot/_internal/eff.py index 729991e0d..6b7ceeb48 100644 --- a/certbot/certbot/_internal/eff.py +++ b/certbot/certbot/_internal/eff.py @@ -88,7 +88,7 @@ def subscribe(email: str) -> None: 'form_id': 'eff_supporters_library_subscribe_form'} logger.info('Subscribe to the EFF mailing list (email: %s).', email) logger.debug('Sending POST request to %s:\n%s', url, data) - _check_response(requests.post(url, data=data)) + _check_response(requests.post(url, data=data, timeout=60)) def _check_response(response: requests.Response) -> None: diff --git a/certbot/certbot/_internal/log.py b/certbot/certbot/_internal/log.py index b6b7d4601..0aa33df6b 100644 --- a/certbot/certbot/_internal/log.py +++ b/certbot/certbot/_internal/log.py @@ -348,7 +348,11 @@ def post_arg_parse_except_hook(exc_type: Type[BaseException], exc_value: BaseExc """ exc_info = (exc_type, exc_value, trace) # Only print human advice if not running under --quiet - exit_func = lambda: sys.exit(1) if quiet else exit_with_advice(log_path) + def exit_func() -> None: + if quiet: + sys.exit(1) + else: + exit_with_advice(log_path) # constants.QUIET_LOGGING_LEVEL or higher should be used to # display message the user, otherwise, a lower level like # logger.DEBUG should be used diff --git a/certbot/certbot/_internal/plugins/manual.py b/certbot/certbot/_internal/plugins/manual.py index a5c9559e4..d22b91afb 100644 --- a/certbot/certbot/_internal/plugins/manual.py +++ b/certbot/certbot/_internal/plugins/manual.py @@ -133,7 +133,8 @@ permitted by DNS standards.) 'the user or by performing the setup manually.') def auth_hint(self, failed_achalls: Iterable[achallenges.AnnotatedChallenge]) -> str: - has_chall = lambda cls: any(isinstance(achall.chall, cls) for achall in failed_achalls) + def has_chall(cls: Type[challenges.Challenge]) -> bool: + return any(isinstance(achall.chall, cls) for achall in failed_achalls) has_dns = has_chall(challenges.DNS01) resource_names = { diff --git a/certbot/setup.py b/certbot/setup.py index 9e7f8e4f3..c6218c08c 100644 --- a/certbot/setup.py +++ b/certbot/setup.py @@ -88,7 +88,8 @@ test_extras = [ 'coverage', 'mypy', 'pip', - 'pylint', + # Our pinned version of pylint requires Python >= 3.7.2. + 'pylint ; python_full_version >= "3.7.2"', 'pytest', 'pytest-cov', 'pytest-xdist', diff --git a/tools/pinning/current/pyproject.toml b/tools/pinning/current/pyproject.toml index 70ae0b88a..7db80d7fa 100644 --- a/tools/pinning/current/pyproject.toml +++ b/tools/pinning/current/pyproject.toml @@ -54,7 +54,7 @@ setuptools-rust = "*" # # If this pinning is removed, we may still need to add a lower bound for the # pylint version. See https://github.com/certbot/certbot/pull/9229. -pylint = "2.13.9" +pylint = { version="2.15.5", python = ">=3.7.2" } # Bug in poetry, where still installes yanked versions from pypi (source: https://github.com/python-poetry/poetry/issues/2453) # this version of cryptography introduced a security vulnrability. diff --git a/tools/requirements.txt b/tools/requirements.txt index 2d5640941..948ee1ae8 100644 --- a/tools/requirements.txt +++ b/tools/requirements.txt @@ -8,7 +8,7 @@ alabaster==0.7.12 ; python_version >= "3.7" and python_version < "4.0" apacheconfig==0.3.2 ; python_version >= "3.7" and python_version < "4.0" appnope==0.1.3 ; python_version >= "3.7" and python_version < "4.0" and sys_platform == "darwin" -astroid==2.11.7 ; python_version >= "3.7" and python_version < "4.0" +astroid==2.12.12 ; python_full_version >= "3.7.2" and python_version < "4.0" attrs==22.1.0 ; python_version >= "3.7" and python_version < "4.0" azure-devops==6.0.0b4 ; python_version >= "3.7" and python_version < "4.0" babel==2.11.0 ; python_version >= "3.7" and python_version < "4.0" @@ -17,8 +17,8 @@ backports-cached-property==1.0.2 ; python_version >= "3.7" and python_version < bcrypt==4.0.1 ; python_version >= "3.7" and python_version < "4.0" beautifulsoup4==4.11.1 ; python_version >= "3.7" and python_version < "4.0" bleach==5.0.1 ; python_version >= "3.7" and python_version < "4.0" -boto3==1.26.8 ; python_version >= "3.7" and python_version < "4.0" -botocore==1.29.8 ; python_version >= "3.7" and python_version < "4.0" +boto3==1.26.10 ; python_version >= "3.7" and python_version < "4.0" +botocore==1.29.10 ; python_version >= "3.7" and python_version < "4.0" cachecontrol==0.12.11 ; python_version >= "3.7" and python_version < "4.0" cachetools==5.2.0 ; python_version >= "3.7" and python_version < "4.0" cachy==0.3.0 ; python_version >= "3.7" and python_version < "4.0" @@ -27,7 +27,7 @@ cffi==1.15.1 ; python_version >= "3.7" and python_version < "4.0" charset-normalizer==2.1.1 ; python_version >= "3.7" and python_version < "4" cleo==1.0.0a5 ; python_version >= "3.7" and python_version < "4.0" cloudflare==2.10.4 ; python_version >= "3.7" and python_version < "4.0" -colorama==0.4.6 ; python_version >= "3.7" and python_version < "4.0" and sys_platform == "win32" or python_version >= "3.7" and python_version < "4.0" and platform_system == "Windows" +colorama==0.4.6 ; python_version < "4.0" and sys_platform == "win32" and python_version >= "3.7" or python_version >= "3.7" and python_version < "4.0" and platform_system == "Windows" commonmark==0.9.1 ; python_version >= "3.7" and python_version < "4.0" configargparse==1.5.3 ; python_version >= "3.7" and python_version < "4.0" configobj==5.0.6 ; python_version >= "3.7" and python_version < "4.0" @@ -36,22 +36,22 @@ crashtest==0.3.1 ; python_version >= "3.7" and python_version < "4.0" cryptography==38.0.3 ; python_version >= "3.7" and python_version < "4.0" cython==0.29.32 ; python_version >= "3.7" and python_version < "4.0" decorator==5.1.1 ; python_version >= "3.7" and python_version < "4.0" -dill==0.3.6 ; python_version >= "3.7" and python_version < "4.0" +dill==0.3.6 ; python_full_version >= "3.7.2" and python_version < "4.0" distlib==0.3.6 ; python_version >= "3.7" and python_version < "4.0" distro==1.8.0 ; python_version >= "3.7" and python_version < "4.0" dns-lexicon==3.11.7 ; python_version >= "3.7" and python_version < "4.0" dnspython==2.2.1 ; python_version >= "3.7" and python_version < "4.0" docutils==0.17.1 ; python_version >= "3.7" and python_version < "4.0" dulwich==0.20.50 ; python_version >= "3.7" and python_version < "4.0" -exceptiongroup==1.0.2 ; python_version >= "3.7" and python_version < "3.11" +exceptiongroup==1.0.4 ; python_version >= "3.7" and python_version < "3.11" execnet==1.9.0 ; python_version >= "3.7" and python_version < "4.0" fabric==2.7.1 ; python_version >= "3.7" and python_version < "4.0" filelock==3.8.0 ; python_version >= "3.7" and python_version < "4.0" google-api-core==2.10.2 ; python_version >= "3.7" and python_version < "4.0" -google-api-python-client==2.65.0 ; python_version >= "3.7" and python_version < "4.0" +google-api-python-client==2.66.0 ; python_version >= "3.7" and python_version < "4.0" google-auth-httplib2==0.1.0 ; python_version >= "3.7" and python_version < "4.0" google-auth==2.14.1 ; python_version >= "3.7" and python_version < "4.0" -googleapis-common-protos==1.56.4 ; python_version >= "3.7" and python_version < "4.0" +googleapis-common-protos==1.57.0 ; python_version >= "3.7" and python_version < "4.0" html5lib==1.1 ; python_version >= "3.7" and python_version < "4.0" httplib2==0.21.0 ; python_version >= "3.7" and python_version < "4.0" idna==3.4 ; python_version >= "3.7" and python_version < "4" @@ -63,7 +63,7 @@ invoke==1.7.3 ; python_version >= "3.7" and python_version < "4.0" ipdb==0.13.9 ; python_version >= "3.7" and python_version < "4.0" ipython==7.34.0 ; python_version >= "3.7" and python_version < "4.0" isodate==0.6.1 ; python_version >= "3.7" and python_version < "4.0" -isort==5.10.1 ; python_version >= "3.7" and python_version < "4.0" +isort==5.10.1 ; python_full_version >= "3.7.2" and python_version < "4.0" jaraco-classes==3.2.3 ; python_version >= "3.7" and python_version < "4.0" jedi==0.18.1 ; python_version >= "3.7" and python_version < "4.0" jeepney==0.8.0 ; python_version >= "3.7" and python_version < "4.0" and sys_platform == "linux" @@ -74,11 +74,11 @@ jsonlines==3.1.0 ; python_version >= "3.7" and python_version < "4.0" jsonpickle==2.2.0 ; python_version >= "3.7" and python_version < "4.0" jsonschema==4.17.0 ; python_version >= "3.7" and python_version < "4.0" keyring==23.11.0 ; python_version >= "3.7" and python_version < "4.0" -lazy-object-proxy==1.8.0 ; python_version >= "3.7" and python_version < "4.0" +lazy-object-proxy==1.8.0 ; python_full_version >= "3.7.2" and python_version < "4.0" lockfile==0.12.2 ; python_version >= "3.7" and python_version < "4.0" markupsafe==2.1.1 ; python_version >= "3.7" and python_version < "4.0" matplotlib-inline==0.1.6 ; python_version >= "3.7" and python_version < "4.0" -mccabe==0.7.0 ; python_version >= "3.7" and python_version < "4.0" +mccabe==0.7.0 ; python_full_version >= "3.7.2" and python_version < "4.0" more-itertools==9.0.0 ; python_version >= "3.7" and python_version < "4.0" msgpack==1.0.4 ; python_version >= "3.7" and python_version < "4.0" msrest==0.6.21 ; python_version >= "3.7" and python_version < "4.0" @@ -96,7 +96,7 @@ pickleshare==0.7.5 ; python_version >= "3.7" and python_version < "4.0" pip==22.3.1 ; python_version >= "3.7" and python_version < "4.0" pkginfo==1.8.3 ; python_version >= "3.7" and python_version < "4.0" pkgutil-resolve-name==1.3.10 ; python_version >= "3.7" and python_version < "3.9" -platformdirs==2.5.4 ; python_version >= "3.7" and python_version < "4.0" +platformdirs==2.5.4 ; python_version < "4.0" and python_version >= "3.7" pluggy==1.0.0 ; python_version >= "3.7" and python_version < "4.0" ply==3.11 ; python_version >= "3.7" and python_version < "4.0" poetry-core==1.3.2 ; python_version >= "3.7" and python_version < "4.0" @@ -111,7 +111,7 @@ pyasn1==0.4.8 ; python_version >= "3.7" and python_version < "4.0" pycparser==2.21 ; python_version >= "3.7" and python_version < "4.0" pygments==2.13.0 ; python_version >= "3.7" and python_version < "4.0" pylev==1.4.0 ; python_version >= "3.7" and python_version < "4.0" -pylint==2.13.9 ; python_version >= "3.7" and python_version < "4.0" +pylint==2.15.5 ; python_full_version >= "3.7.2" and python_version < "4.0" pynacl==1.5.0 ; python_version >= "3.7" and python_version < "4.0" pynsist==2.7 ; python_version >= "3.7" and python_version < "4.0" pyopenssl==22.1.0 ; python_version >= "3.7" and python_version < "4.0" @@ -157,20 +157,20 @@ sphinxcontrib-serializinghtml==1.1.5 ; python_version >= "3.7" and python_versio tldextract==3.4.0 ; python_version >= "3.7" and python_version < "4.0" toml==0.10.2 ; python_version >= "3.7" and python_version < "4.0" tomli==2.0.1 ; python_version >= "3.7" and python_full_version <= "3.11.0a6" -tomlkit==0.11.6 ; python_version >= "3.7" and python_version < "4.0" +tomlkit==0.11.6 ; python_version < "4.0" and python_version >= "3.7" tox==3.27.1 ; python_version >= "3.7" and python_version < "4.0" traitlets==5.5.0 ; python_version >= "3.7" and python_version < "4.0" twine==4.0.1 ; python_version >= "3.7" and python_version < "4.0" -typed-ast==1.5.4 ; python_version >= "3.7" and python_version < "3.8" +typed-ast==1.5.4 ; python_version < "3.8" and python_version >= "3.7" types-cryptography==3.3.23.2 ; python_version >= "3.7" and python_version < "4.0" types-pyopenssl==22.1.0.2 ; python_version >= "3.7" and python_version < "4.0" types-pyrfc3339==1.1.1 ; python_version >= "3.7" and python_version < "4.0" -types-python-dateutil==2.8.19.3 ; python_version >= "3.7" and python_version < "4.0" +types-python-dateutil==2.8.19.4 ; python_version >= "3.7" and python_version < "4.0" types-pytz==2022.6.0.1 ; python_version >= "3.7" and python_version < "4.0" -types-requests==2.28.11.4 ; python_version >= "3.7" and python_version < "4.0" +types-requests==2.28.11.5 ; python_version >= "3.7" and python_version < "4.0" types-setuptools==65.5.0.3 ; python_version >= "3.7" and python_version < "4.0" types-six==1.16.21.3 ; python_version >= "3.7" and python_version < "4.0" -types-urllib3==1.26.25.3 ; python_version >= "3.7" and python_version < "4.0" +types-urllib3==1.26.25.4 ; python_version >= "3.7" and python_version < "4.0" typing-extensions==4.4.0 ; python_version >= "3.7" and python_version < "4.0" uritemplate==4.1.1 ; python_version >= "3.7" and python_version < "4.0" urllib3==1.26.12 ; python_version >= "3.7" and python_version < "4" @@ -178,7 +178,7 @@ virtualenv==20.16.7 ; python_version >= "3.7" and python_version < "4.0" wcwidth==0.2.5 ; python_version >= "3.7" and python_version < "4.0" webencodings==0.5.1 ; python_version >= "3.7" and python_version < "4.0" wheel==0.38.4 ; python_version >= "3.7" and python_version < "4.0" -wrapt==1.14.1 ; python_version >= "3.7" and python_version < "4.0" +wrapt==1.14.1 ; python_full_version >= "3.7.2" and python_version < "4.0" xattr==0.9.9 ; python_version >= "3.7" and python_version < "4.0" and sys_platform == "darwin" yarg==0.1.9 ; python_version >= "3.7" and python_version < "4.0" zipp==3.10.0 ; python_version >= "3.7" and python_version < "4.0"