diff --git a/.pylintrc b/.pylintrc index 77ea20ee9..7f949986d 100644 --- a/.pylintrc +++ b/.pylintrc @@ -1,263 +1,301 @@ [MASTER] -# Specify a configuration file. -#rcfile= +# 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= -# Python code to execute, usually for sys.path manipulation such as -# pygtk.require(). -#init-hook= +# 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= -# Add files or directories to the blacklist. They should be base names, not -# paths. +# Specify a score threshold to be exceeded before program exits with error. +fail-under=10.0 + +# Files or directories to be skipped. They should be base names, not paths. ignore=CVS -# Add files or directories matching the regex patterns to the blacklist. The -# regex matches against base names, not paths. +# Files or directories matching the regex patterns are skipped. The regex +# matches against base names, not paths. ignore-patterns= -# Pickle collected data for later comparisons. -persistent=yes +# Python code to execute, usually for sys.path manipulation such as +# pygtk.require(). +#init-hook= -# List of plugins (as comma separated values of python modules names) to load, +# Use multiple processes to speed up Pylint. Specifying 0 will auto-detect the +# number of processors available to use. +jobs=1 + +# 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=pylint.extensions.docparams, # enable checking of docstring args - pylint.extensions.docstyle, # basic docstring style checks + pylint.extensions.docstyle, # basic docstring style checks -# Use multiple processes to speed up Pylint. -jobs=1 +# Pickle collected data for later comparisons. +persistent=yes + +# 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 -# 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=numpy - [MESSAGES CONTROL] # Only show warnings with the listed confidence levels. Leave empty to show -# all. Valid levels: HIGH, INFERENCE, INFERENCE_FAILURE, UNDEFINED +# all. Valid levels: HIGH, INFERENCE, INFERENCE_FAILURE, UNDEFINED. confidence= -# 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= - # 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 +# 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 # 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" -disable=no-self-use, # disabled as it is too verbose - fixme, # disabled as TODOs would show up as warnings - protected-access, # disabled as we don't follow the public vs private - # convention strictly - duplicate-code, # disabled as it is too verbose - redundant-returns-doc, # for @abstractmethod, it cannot interpret "pass" - # disable the "too-many/few-..." refactoring hints - too-many-lines, too-many-branches, too-many-locals, too-many-nested-blocks, - too-many-statements, too-many-instance-attributes, too-many-arguments, - too-many-public-methods, too-few-public-methods, too-many-ancestors, - unnecessary-pass, # allow for methods with just "pass", for clarity - no-else-return, # relax "elif" after a clause with a return - missing-yield-doc, # in coroutines, these checks can yield false - missing-yield-type-doc, # positives (pun intended) - import-outside-toplevel, - docstring-first-line-empty, - no-name-in-module, # remove when pylint behaves - import-error, # remove when pylint behaves - bad-continuation, bad-whitespace, # differences of opinion with black +# no Warning level messages displayed, use "--disable=all --enable=classes +# --disable=W". +disable=arguments-renamed, # more readable and clear + bad-continuation, bad-whitespace, # differences of opinion with black + consider-using-f-string, # unnecesary to convert all str.format() to f strings + consider-using-with, # too verbose, not all resource-allocating operations should have `with` + docstring-first-line-empty, # docstrings are more readable + duplicate-code, # too verbose + fixme, # avoid that to do annotations show up as warnings + missing-param-doc, # false positives when docs contain ":" + no-else-return, # relax "elif" after a clause with a return + no-member, # false positives when variable from external function + no-self-use, # too verbose + protected-access, # we don't strictly follow the public vs. private convention + raise-missing-from, # not every exception needs `from`, adding `from None` is too verbose + too-few-public-methods, # too verbose + too-many-ancestors, # too verbose + too-many-arguments, # too verbose + too-many-branches, # too verbose + too-many-instance-attributes, # too verbose + too-many-lines, # too verbose + too-many-locals, # too verbose + too-many-nested-blocks, # too verbose + too-many-public-methods, # too verbose + too-many-statements, # too verbose + unnecessary-pass, # allow for methods with just "pass", for clarity + +# 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 + [REPORTS] -# Set the output format. Available formats are text, parseable, colorized, msvs -# (visual studio) and html. You can also give a reporter class, eg +# Python expression which should return a score less than or equal to 10. You +# have access to the variables 'error', 'warning', 'refactor', and 'convention' +# 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=10.0 - ((float(5 * error + warning + refactor + convention) / statement) * 10) + +# 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= + +# 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=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]". This option is deprecated -# and it will be removed in Pylint 2.0. -files-output=no +# Tells whether to display a full report or only the messages. +reports=no -# Tells whether to display a full report or only the messages -reports=yes +# Activate the evaluation score. +score=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) -# 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= +[REFACTORING] +# Maximum number of nested blocks for function / method body +max-nested-blocks=5 -[BASIC] +# 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 -# Good variable names which should always be accepted, separated by a comma -# i,j,k = typical indices -# n,m = typical numbers -# ex = for exceptions and errors -# v,w = typical vectors -# x,y,z = typical axes -# _ = placeholder name -# q,r,qr,cr,qc = quantum and classical registers, and quantum circuit -# pi = the PI constant -# op = operation iterator -# b = basis iterator -good-names=i,j,k,n,m,ex,v,w,x,y,z,Run,_,logger,q,r,qr,cr,qc,pi,op,b,ar,br - -# Bad variable names which should always be refused, separated by a comma -bad-names=foo,bar,toto,tutu,tata -# Colon-delimited sets of names that determine each other's naming style when -# the name regexes allow several styles. -name-group= +[LOGGING] -# Include a hint for the correct naming format with invalid-name -include-naming-hint=no +# The type of string formatting that logging methods do. `old` means using % +# formatting, `new` is for `{}` formatting. +logging-format-style=old -# List of decorators that produce properties, such as abc.abstractproperty. Add -# to this list to register other decorators that produce valid properties. -property-classes=abc.abstractproperty +# Logging modules to check that the string format arguments are in logging +# function parameter format. +logging-modules=logging + + +[SPELLING] -# Regular expression matching correct module names -module-rgx=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$ +# Limits count of emitted suggestions for spelling mistakes. +max-spelling-suggestions=4 -# Naming hint for module names -module-name-hint=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$ +# Spelling dictionary name. Available dictionaries: none. To make it work, +# install the 'python-enchant' package. +spelling-dict= -# Regular expression matching correct constant names -const-rgx=(([A-Z_][A-Z0-9_]*)|(__.*__))$ +# List of comma separated words that should not be checked. +spelling-ignore-words= -# Naming hint for constant names -const-name-hint=(([A-Z_][A-Z0-9_]*)|(__.*__))$ +# A path to a file that contains the private dictionary; one word per line. +spelling-private-dict-file= -# Regular expression matching correct class names -class-rgx=[A-Z_][a-zA-Z0-9]+$ +# Tells whether to store unknown words to the private dictionary (see the +# --spelling-private-dict-file option) instead of raising a message. +spelling-store-unknown-words=no -# Naming hint for class names -class-name-hint=[A-Z_][a-zA-Z0-9]+$ -# Regular expression matching correct function names -function-rgx=[a-z_][a-z0-9_]{2,30}$ +[MISCELLANEOUS] -# Naming hint for function names -function-name-hint=[a-z_][a-z0-9_]{2,30}$ +# List of note tags to take in consideration, separated by a comma. +notes=FIXME, + XXX, + TODO -# Regular expression matching correct method names -method-rgx=(([a-z_][a-z0-9_]{2,49})|(assert[A-Z][a-zA-Z0-9]{2,43}))$ +# Regular expression of note tags to take in consideration. +#notes-rgx= -# Naming hint for method names -method-name-hint=[a-z_][a-z0-9_]{2,30}$ or camelCase `assert*` in tests. -# Regular expression matching correct attribute names -attr-rgx=[a-z_][a-z0-9_]{2,30}$ +[TYPECHECK] -# Naming hint for attribute names -attr-name-hint=[a-z_][a-z0-9_]{2,30}$ +# 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 -# Regular expression matching correct argument names -argument-rgx=[a-z_][a-z0-9_]{2,30}$ +# 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= -# Naming hint for argument names -argument-name-hint=[a-z_][a-z0-9_]{2,30}$ +# 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 -# Regular expression matching correct variable names -variable-rgx=[a-z_][a-z0-9_]{2,30}$ +# Tells whether to warn about missing members when the owner of the attribute +# is inferred to be None. +ignore-none=yes -# Naming hint for variable names -variable-name-hint=[a-z_][a-z0-9_]{2,30}$ +# 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 -# Regular expression matching correct class attribute names -class-attribute-rgx=([A-Za-z_][A-Za-z0-9_]{2,30}|(__.*__))$ +# 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 -# Naming hint for class attribute names -class-attribute-name-hint=([A-Za-z_][A-Za-z0-9_]{2,30}|(__.*__))$ +# 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= -# Regular expression matching correct inline iteration names -inlinevar-rgx=[A-Za-z_][A-Za-z0-9_]*$ +# 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 -# Naming hint for inline iteration names -inlinevar-name-hint=[A-Za-z_][A-Za-z0-9_]*$ +# 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 -# Regular expression which should only match function or class names that do -# not require a docstring. -no-docstring-rgx=^_ +# 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 -# Minimum line length for functions/classes that require docstrings, shorter -# ones are exempt. -docstring-min-length=-1 +# List of decorators that change the signature of a decorated function. +signature-mutators= -[ELIF] +[VARIABLES] -# Maximum number of nested blocks for function / method body -max-nested-blocks=5 +# List of additional names supposed to be defined in builtins. Remember that +# you should avoid defining new builtins when possible. +additional-builtins= +# Tells whether unused global variables should be treated as a violation. +allow-global-unused-variables=yes -[FORMAT] +# List of names allowed to shadow builtins +allowed-redefined-builtins= -# Maximum number of characters on a single line. -max-line-length=105 +# 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 -# Regexp for a line that is allowed to be longer than the limit. -ignore-long-lines=^\s*(# )??$ +# 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_ -# 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 +# Argument names that match this expression will be ignored. Default to name +# with leading underscore. +ignored-argument-names=_.*|^ignored_|^unused_ -# List of optional constructs for which whitespace checking is disabled. `dict- -# separator` is used to allow tabulation in dicts, etc.: {1 : 1,\n222: 2}. -# `trailing-comma` allows a space between comma and closing bracket: (a, ). -# `empty-line` allows space-only lines. -no-space-check=trailing-comma,dict-separator +# Tells whether we should check for unused import in __init__ files. +init-import=no -# Maximum number of lines in a module -max-module-lines=1000 +# List of qualified module names which can have objects that can redefine +# builtins. +redefining-builtins-modules=six.moves,past.builtins,future.builtins,builtins,io -# 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. -indent-after-paren=4 +[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*(# )??$ -[LOGGING] +# Number of spaces of indent required inside a hanging or continued line. +indent-after-paren=4 -# Logging modules to check that the string format arguments are in logging -# function parameter format -logging-modules=logging +# 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=105 -[MISCELLANEOUS] +# Maximum number of lines in a module. +max-module-lines=1000 -# List of note tags to take in consideration, separated by a comma. -notes=FIXME,XXX,TODO +# 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 -[SIMILARITIES] -# Minimum lines number of a similarity. -min-similarity-lines=4 +[SIMILARITIES] # Ignore comments when computing similarities. ignore-comments=yes @@ -268,142 +306,173 @@ ignore-docstrings=yes # Ignore imports when computing similarities. ignore-imports=no +# Minimum lines number of a similarity. +min-similarity-lines=4 -[SPELLING] -# Spelling dictionary name. Available dictionaries: none. To make it working -# install python-enchant package. -spelling-dict= +[BASIC] -# List of comma separated words that should not be checked. -spelling-ignore-words= +# Naming style matching correct argument names. +argument-naming-style=snake_case -# A path to a file that contains private dictionary; one word per line. -spelling-private-dict-file= +# Regular expression matching correct argument names. Overrides argument- +# naming-style. +#argument-rgx= -# Tells whether to store unknown words to indicated private dictionary in -# --spelling-private-dict-file option instead of raising a message. -spelling-store-unknown-words=no +# Naming style matching correct attribute names. +attr-naming-style=snake_case +# Regular expression matching correct attribute names. Overrides attr-naming- +# style. +#attr-rgx= -[TYPECHECK] +# Bad variable names which should always be refused, separated by a comma. +bad-names=foo, + bar, + baz, + toto, + tutu, + tata -# 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 +# Bad variable names regexes, separated by a comma. If names match any regex, +# they will always be refused +bad-names-rgxs= -# 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=matplotlib.cm +# Naming style matching correct class attribute names. +class-attribute-naming-style=any -# 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,QuantumCircuit +# Regular expression matching correct class attribute names. Overrides class- +# attribute-naming-style. +#class-attribute-rgx= -# 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=requests.codes.ok +# Naming style matching correct class constant names. +class-const-naming-style=UPPER_CASE -# 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 +# Regular expression matching correct class constant names. Overrides class- +# const-naming-style. +#class-const-rgx= +# Naming style matching correct class names. +class-naming-style=PascalCase -[VARIABLES] +# Regular expression matching correct class names. Overrides class-naming- +# style. +#class-rgx= -# Tells whether we should check for unused import in __init__ files. -init-import=no - -# A regular expression matching the name of dummy variables (i.e. expectedly -# not used). -dummy-variables-rgx=(_+[a-zA-Z0-9]*?$)|dummy +# Naming style matching correct constant names. +const-naming-style=UPPER_CASE -# List of additional names supposed to be defined in builtins. Remember that -# you should avoid to define new builtins when possible. -additional-builtins= +# Regular expression matching correct constant names. Overrides const-naming- +# style. +#const-rgx= -# 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 +# Minimum line length for functions/classes that require docstrings, shorter +# ones are exempt. +docstring-min-length=-1 -# List of qualified module names which can have objects that can redefine -# builtins. -redefining-builtins-modules=six.moves,future.builtins +# Naming style matching correct function names. +function-naming-style=snake_case +# Regular expression matching correct function names. Overrides function- +# naming-style. +#function-rgx= -[CLASSES] +# Good variable names which should always be accepted, separated by a comma. +good-names=i, + j, + k, + ex, + Run, + _ -# List of method names used to declare (i.e. assign) instance attributes. -defining-attr-methods=__init__,__new__,setUp +# Good variable names regexes, separated by a comma. If names match any regex, +# they will always be accepted +good-names-rgxs= -# List of valid names for the first argument in a class method. -valid-classmethod-first-arg=cls +# Include a hint for the correct naming format with invalid-name. +include-naming-hint=no -# List of valid names for the first argument in a metaclass class method. -valid-metaclass-classmethod-first-arg=mcs +# Naming style matching correct inline iteration names. +inlinevar-naming-style=any -# List of member names, which should be excluded from the protected access -# warning. -exclude-protected=_asdict,_fields,_replace,_source,_make +# Regular expression matching correct inline iteration names. Overrides +# inlinevar-naming-style. +#inlinevar-rgx= +# Naming style matching correct method names. +method-naming-style=snake_case -[DESIGN] +# Regular expression matching correct method names. Overrides method-naming- +# style. +#method-rgx= -# Maximum number of arguments for function / method -max-args=8 +# Naming style matching correct module names. +module-naming-style=snake_case -# Argument names that match this expression will be ignored. Default to name -# with leading underscore -ignored-argument-names=_.* +# Regular expression matching correct module names. Overrides module-naming- +# style. +#module-rgx= -# Maximum number of locals for function / method body -max-locals=15 +# Colon-delimited sets of names that determine each other's naming style when +# the name regexes allow several styles. +name-group= -# Maximum number of return / yield for function / method body -max-returns=6 +# Regular expression which should only match function or class names that do +# not require a docstring. +no-docstring-rgx=^_ -# Maximum number of branch for function / method body -max-branches=12 +# 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 -# Maximum number of statements in function / method body -max-statements=50 +# Naming style matching correct variable names. +variable-naming-style=snake_case -# Maximum number of parents for a class (see R0901). -max-parents=7 +# Regular expression matching correct variable names. Overrides variable- +# naming-style. +#variable-rgx= -# Maximum number of attributes for a class (see R0902). -max-attributes=10 -# Minimum number of public methods for a class (see R0903). -min-public-methods=2 +[STRING] -# Maximum number of public methods for a class (see R0904). -max-public-methods=35 +# 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 -# Maximum number of boolean expressions in a if statement -max-bool-expr=5 +# 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 [IMPORTS] -# Deprecated modules which should not be used, separated by a comma -deprecated-modules=optparse +# List of modules that can be imported at any level, not just the top level +# one. +allow-any-import-level= -# Create a graph of every (i.e. internal and external) dependencies in the -# given file (report RP0402 must not be disabled) -import-graph= +# Allow wildcard imports from modules that define __all__. +allow-wildcard-with-all=no + +# 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 + +# Deprecated modules which should not be used, separated by a comma. +deprecated-modules=optparse,tkinter.tix -# Create a graph of external dependencies in the given file (report RP0402 must -# not be disabled) +# 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= -# Create a graph of internal dependencies in the given file (report RP0402 must -# not be disabled) +# 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 @@ -413,14 +482,72 @@ known-standard-library= # Force import order to recognize a module as part of a third party library. known-third-party=enchant -# 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 +# Couples of modules and preferred modules, separated by a comma. +preferred-modules= + + +[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 member names, which should be excluded from the protected access +# warning. +exclude-protected=_asdict, + _fields, + _replace, + _source, + _make + +# 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 + + +[DESIGN] + +# Maximum number of arguments for function / method. +max-args=8 + +# Maximum number of attributes for a class (see R0902). +max-attributes=7 + +# Maximum number of boolean expressions in an if statement (see R0916). +max-bool-expr=5 + +# Maximum number of branch for function / method body. +max-branches=12 + +# Maximum number of locals for function / method body. +max-locals=15 + +# Maximum number of parents for a class (see R0901). +max-parents=7 + +# Maximum number of public methods for a class (see R0904). +max-public-methods=35 + +# Maximum number of return / yield for function / method body. +max-returns=6 + +# Maximum number of statements in function / method body. +max-statements=50 + +# Minimum number of public methods for a class (see R0903). +min-public-methods=2 [EXCEPTIONS] # Exceptions that will emit a warning when being caught. Defaults to -# "Exception" -overgeneral-exceptions=Exception +# "BaseException, Exception". +overgeneral-exceptions=BaseException, + Exception diff --git a/constraints.txt b/constraints.txt index ce9c4551f..e69de29bb 100644 --- a/constraints.txt +++ b/constraints.txt @@ -1,3 +0,0 @@ -astroid==2.3.3 -pylint==2.4.4 -traitlets!=5.0.5 diff --git a/qiskit_ibm_provider/api/clients/base.py b/qiskit_ibm_provider/api/clients/base.py index 5111e9858..b1b708378 100644 --- a/qiskit_ibm_provider/api/clients/base.py +++ b/qiskit_ibm_provider/api/clients/base.py @@ -221,10 +221,7 @@ def stream( self._current_retry += 1 if self._current_retry > retries: - error_message = ( - "Max retries exceeded: Failed to establish a " - f"websocket connection." - ) + error_message = "Max retries exceeded: Failed to establish a websocket connection." if self._error: error_message += f" Error: {self._error}" diff --git a/qiskit_ibm_provider/credentials/configrc.py b/qiskit_ibm_provider/credentials/configrc.py index 72c64f05e..d6db6fcb1 100644 --- a/qiskit_ibm_provider/credentials/configrc.py +++ b/qiskit_ibm_provider/credentials/configrc.py @@ -195,7 +195,7 @@ def _section_name(credentials_: Credentials) -> str: unrolled_credentials[_PREFERENCES_SECTION_NAME] = unrolled_pref # Write the configuration file. - with open(filename, "w") as config_file: + with open(filename, "w", encoding="utf-8") as config_file: config_parser = ConfigParser() config_parser.optionxform = str # type: ignore config_parser.read_dict(unrolled_credentials) diff --git a/qiskit_ibm_provider/ibm_backend.py b/qiskit_ibm_provider/ibm_backend.py index 8d7d099f1..9000754ec 100644 --- a/qiskit_ibm_provider/ibm_backend.py +++ b/qiskit_ibm_provider/ibm_backend.py @@ -796,7 +796,7 @@ def run( # type: ignore[override] ` method. backend_options: DEPRECATED dictionary of backend options for the execution. noise_model: Noise model. - kwargs: Additional runtime configuration options. They take + **kwargs: Additional runtime configuration options. They take precedence over options of the same names specified in `backend_options`. Returns: diff --git a/qiskit_ibm_provider/ibm_backend_service.py b/qiskit_ibm_provider/ibm_backend_service.py index d39ad4d9d..7a3c7bc23 100644 --- a/qiskit_ibm_provider/ibm_backend_service.py +++ b/qiskit_ibm_provider/ibm_backend_service.py @@ -128,7 +128,7 @@ def backends( hub: Name of the hub. group: Name of the group. project: Name of the project. - kwargs: Simple filters that specify a ``True``/``False`` criteria in the + **kwargs: Simple filters that specify a ``True``/``False`` criteria in the backend configuration, backends status, or provider credentials. An example to get the operational backends with 5 qubits:: @@ -141,7 +141,7 @@ def backends( IBMBackendValueError: If only one or two parameters from `hub`, `group`, `project` are specified. """ - backends: List[IBMBackend] = list() + backends: List[IBMBackend] = [] if all([hub, group, project]): hgp = self._provider._get_hgp(hub, group, project) backends = list(hgp.backends.values()) diff --git a/qiskit_ibm_provider/ibm_provider.py b/qiskit_ibm_provider/ibm_provider.py index 6f97700ba..a99cd0f97 100644 --- a/qiskit_ibm_provider/ibm_provider.py +++ b/qiskit_ibm_provider/ibm_provider.py @@ -571,7 +571,7 @@ def backends( hub: Name of the hub. group: Name of the group. project: Name of the project. - kwargs: Simple filters that specify a ``True``/``False`` criteria in the + **kwargs: Simple filters that specify a ``True``/``False`` criteria in the backend configuration, backends status, or provider credentials. An example to get the operational backends with 5 qubits:: diff --git a/qiskit_ibm_provider/jupyter/dashboard/dashboard.py b/qiskit_ibm_provider/jupyter/dashboard/dashboard.py index 15981223b..2ca55b1c0 100644 --- a/qiskit_ibm_provider/jupyter/dashboard/dashboard.py +++ b/qiskit_ibm_provider/jupyter/dashboard/dashboard.py @@ -42,7 +42,7 @@ def __init__(self, children: Optional[List] = None, **kwargs: Any): **kwargs: Additional keywords to be passed to ``ipywidgets.Accordion``. """ children = children or [] - super(AccordionWithThread, self).__init__(children=children, **kwargs) + super().__init__(children=children, **kwargs) self._thread = None # Devices VBox. self._device_list = None # type: Optional[wid.VBox] @@ -109,7 +109,7 @@ def _get_backends(self) -> None: ) for backend in hgp.backends.values(): if not backend.configuration().simulator: - if backend.name() not in ibm_backends.keys(): + if backend.name() not in ibm_backends: ibm_backends[backend.name()] = BackendWithProviders( backend=backend, providers=[hgp_name] ) diff --git a/qiskit_ibm_provider/jupyter/jobs_widget.py b/qiskit_ibm_provider/jupyter/jobs_widget.py index 0a98f07ae..fb793c730 100644 --- a/qiskit_ibm_provider/jupyter/jobs_widget.py +++ b/qiskit_ibm_provider/jupyter/jobs_widget.py @@ -143,7 +143,7 @@ def _job_summary( _id = job.job_id() _name = job.name() _status = job.status().name - if _year not in jobs_dates.keys(): + if _year not in jobs_dates: jobs_dates[_year] = {} _month = _date.month diff --git a/qiskit_ibm_provider/jupyter/qubits_widget.py b/qiskit_ibm_provider/jupyter/qubits_widget.py index 203fc79fc..7f8f64660 100644 --- a/qiskit_ibm_provider/jupyter/qubits_widget.py +++ b/qiskit_ibm_provider/jupyter/qubits_widget.py @@ -65,7 +65,7 @@ def qubits_tab(backend: Union[IBMBackend, FakeBackend]) -> wid.VBox: for nduv in qubit_data: if nduv.name == "readout_error": cali_data[nduv.name] = str(round(nduv.value * 100, 3)) - elif nduv.name in cali_data.keys(): + elif nduv.name in cali_data: cali_data[nduv.name] = str(round(nduv.value, 3)) + " " + nduv.unit gate_names = [] diff --git a/qiskit_ibm_provider/version.py b/qiskit_ibm_provider/version.py index 7483e6cad..01df79c6b 100644 --- a/qiskit_ibm_provider/version.py +++ b/qiskit_ibm_provider/version.py @@ -28,9 +28,9 @@ def _minimal_ext_cmd(cmd: List[str]) -> bytes: # construct minimal environment env = {} for k in ["SYSTEMROOT", "PATH"]: - v = os.environ.get(k) - if v is not None: - env[k] = v + version = os.environ.get(k) + if version is not None: + env[k] = version # LANGUAGE is used on win32 env["LANGUAGE"] = "C" env["LANG"] = "C" @@ -60,7 +60,7 @@ def git_version() -> str: return git_revision -with open(os.path.join(ROOT_DIR, "VERSION.txt"), "r") as version_file: +with open(os.path.join(ROOT_DIR, "VERSION.txt"), "r", encoding="utf-8") as version_file: VERSION = version_file.read().strip() diff --git a/qiskit_ibm_provider/visualization/interactive/error_map.py b/qiskit_ibm_provider/visualization/interactive/error_map.py index ae69d1d2a..f13951454 100644 --- a/qiskit_ibm_provider/visualization/interactive/error_map.py +++ b/qiskit_ibm_provider/visualization/interactive/error_map.py @@ -93,7 +93,7 @@ def iplot_error_map( n_qubits = config.n_qubits cmap = config.coupling_map - if n_qubits in DEVICE_LAYOUTS.keys(): + if n_qubits in DEVICE_LAYOUTS: grid_data = DEVICE_LAYOUTS[n_qubits] else: fig = go.Figure() diff --git a/qiskit_ibm_provider/visualization/interactive/gate_map.py b/qiskit_ibm_provider/visualization/interactive/gate_map.py index 9a9002193..e48d16e63 100644 --- a/qiskit_ibm_provider/visualization/interactive/gate_map.py +++ b/qiskit_ibm_provider/visualization/interactive/gate_map.py @@ -87,7 +87,7 @@ def iplot_gate_map( if isinstance(line_color, str): line_color = [line_color] * len(cmap) if cmap else [] - if n_qubits in DEVICE_LAYOUTS.keys(): + if n_qubits in DEVICE_LAYOUTS: grid_data = DEVICE_LAYOUTS[n_qubits] else: fig = go.Figure() diff --git a/qiskit_ibm_provider/visualization/interactive/plotly_wrapper.py b/qiskit_ibm_provider/visualization/interactive/plotly_wrapper.py index 014ce2b7c..818f7622e 100644 --- a/qiskit_ibm_provider/visualization/interactive/plotly_wrapper.py +++ b/qiskit_ibm_provider/visualization/interactive/plotly_wrapper.py @@ -55,7 +55,7 @@ def show(self, *args, **kwargs) -> None: import plotly.io as pio config = {} - if "config" not in kwargs.keys(): + if "config" not in kwargs: config = {"displayModeBar": False, "editable": False} pio.show(self._fig, *args, config=config, **kwargs) @@ -101,7 +101,7 @@ def show(self, *args: Any, **kwargs: Any) -> None: import plotly.io as pio config = {} - if "config" not in kwargs.keys(): + if "config" not in kwargs: config = {"scrollZoom": False, "displayModeBar": False, "editable": False} pio.show(self, *args, config=config, **kwargs) diff --git a/requirements-dev.txt b/requirements-dev.txt index 5a29bc798..edb7ae6ba 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,8 +1,7 @@ -mypy==0.812 -pycodestyle -pylint==2.4.4 +mypy==0.931 +pylint==2.12.2 vcrpy -pproxy==2.1.8 +pproxy==2.7.8 Sphinx>=1.8.3 sphinx-rtd-theme>=0.4.0 sphinx-tabs>=1.1.11 @@ -21,9 +20,7 @@ reno>=2.11.0 scipy>=1.0 nbformat>=4.4.0 nbconvert>=5.3.1 -qiskit_rng qiskit-aer websockets>=8 -scikit-quant;platform_system != 'Windows' black==22.1.0 coverage>=6.3 \ No newline at end of file diff --git a/test/contextmanagers.py b/test/contextmanagers.py index f21402e25..3a179ccbd 100644 --- a/test/contextmanagers.py +++ b/test/contextmanagers.py @@ -127,8 +127,7 @@ def _mock_initialize_hgps( self, credentials: Credentials, preferences: Optional[Dict] = None ) -> None: """Mock ``_initialize_hgps()``, just storing the credentials.""" - hgp = dict() - hgp["credentials"] = credentials + hgp = {"credentials": credentials} self._hgp = hgp self._hgps = {} if preferences: diff --git a/test/fake_account_client.py b/test/fake_account_client.py index b703139e0..66f74a5f8 100644 --- a/test/fake_account_client.py +++ b/test/fake_account_client.py @@ -164,7 +164,7 @@ def data(self): time_per_step = {} timestamp = self._creation_date - for api_stat in API_STATUS_TO_INT: + for api_stat in API_STATUS_TO_INT: # pylint: disable=consider-using-dict-items if API_STATUS_TO_INT[status] > API_STATUS_TO_INT[api_stat]: time_per_step[api_stat.value] = timestamp.isoformat() timestamp += timedelta(seconds=30) diff --git a/test/ibm/test_account_client.py b/test/ibm/test_account_client.py index 17db59ffc..4ff90abfc 100644 --- a/test/ibm/test_account_client.py +++ b/test/ibm/test_account_client.py @@ -50,17 +50,17 @@ def setUpClass(cls, provider, hub, group, project): def setUp(self): """Initial test setup.""" super().setUp() - qr = QuantumRegister(2) - cr = ClassicalRegister(2) - self.qc1 = QuantumCircuit(qr, cr, name="qc1") - self.qc2 = QuantumCircuit(qr, cr, name="qc2") - self.qc1.h(qr) - self.qc2.h(qr[0]) - self.qc2.cx(qr[0], qr[1]) - self.qc1.measure(qr[0], cr[0]) - self.qc1.measure(qr[1], cr[1]) - self.qc2.measure(qr[0], cr[0]) - self.qc2.measure(qr[1], cr[1]) + quantum_register = QuantumRegister(2) + classical_register = ClassicalRegister(2) + self.qc1 = QuantumCircuit(quantum_register, classical_register, name="qc1") + self.qc2 = QuantumCircuit(quantum_register, classical_register, name="qc2") + self.qc1.h(quantum_register) + self.qc2.h(quantum_register[0]) + self.qc2.cx(quantum_register[0], quantum_register[1]) + self.qc1.measure(quantum_register[0], classical_register[0]) + self.qc1.measure(quantum_register[1], classical_register[1]) + self.qc2.measure(quantum_register[0], classical_register[0]) + self.qc2.measure(quantum_register[1], classical_register[1]) self.seed = 73846087 self.fake_server = None @@ -214,9 +214,9 @@ def setUpClass(cls, provider, hub, group, project): def _get_qobj(backend): """Return a Qobj.""" # Create a circuit. - qr = QuantumRegister(2) - cr = ClassicalRegister(2) - qc1 = QuantumCircuit(qr, cr, name="qc1") + quantum_register = QuantumRegister(2) + classical_register = ClassicalRegister(2) + qc1 = QuantumCircuit(quantum_register, classical_register, name="qc1") seed = 73846087 # Assemble the Qobj. diff --git a/test/ibm/test_basic_server_paths.py b/test/ibm/test_basic_server_paths.py index acb50aafa..c73ef8d88 100644 --- a/test/ibm/test_basic_server_paths.py +++ b/test/ibm/test_basic_server_paths.py @@ -136,6 +136,6 @@ def _submit_job_with_retry(self, circs, backend, max_retry=5): limit_error = err time.sleep(1) - self.fail( + return self.fail( "Unable to submit job after {} retries: {}".format(max_retry, limit_error) ) diff --git a/test/ibm/test_composite_job.py b/test/ibm/test_composite_job.py index 07fc5cdd8..da017323f 100644 --- a/test/ibm/test_composite_job.py +++ b/test/ibm/test_composite_job.py @@ -902,7 +902,7 @@ def test_job_missing_subjobs(self): ) with self.assertRaises(IBMJobInvalidStateError) as err_cm: self.provider.backend.job(job_set.job_id()) - self.assertIn(f"tags", str(err_cm.exception)) + self.assertIn("tags", str(err_cm.exception)) finally: job._api_client.job_update_attribute( job_id=job.job_id(), attr_name="tags", attr_value=saved_tags diff --git a/test/ibm/test_ibm_integration.py b/test/ibm/test_ibm_integration.py index a0f96574f..76e095f6e 100644 --- a/test/ibm/test_ibm_integration.py +++ b/test/ibm/test_ibm_integration.py @@ -45,13 +45,13 @@ def setUpClass(cls, provider, hub, group, project): def setUp(self): super().setUp() - qr = QuantumRegister(1) - cr = ClassicalRegister(1) - self._qc1 = QuantumCircuit(qr, cr, name="qc1") - self._qc2 = QuantumCircuit(qr, cr, name="qc2") - self._qc1.measure(qr[0], cr[0]) - self._qc2.x(qr[0]) - self._qc2.measure(qr[0], cr[0]) + quantum_register = QuantumRegister(1) + classical_register = ClassicalRegister(1) + self._qc1 = QuantumCircuit(quantum_register, classical_register, name="qc1") + self._qc2 = QuantumCircuit(quantum_register, classical_register, name="qc2") + self._qc1.measure(quantum_register[0], classical_register[0]) + self._qc2.x(quantum_register[0]) + self._qc2.measure(quantum_register[0], classical_register[0]) def test_ibm_result_fields(self): """Test components of a result from a remote simulator.""" @@ -67,12 +67,12 @@ def test_compile_remote(self, backend): """Test transpile with a remote backend.""" qubit_reg = QuantumRegister(2, name="q") clbit_reg = ClassicalRegister(2, name="c") - qc = QuantumCircuit(qubit_reg, clbit_reg, name="bell") - qc.h(qubit_reg[0]) - qc.cx(qubit_reg[0], qubit_reg[1]) - qc.measure(qubit_reg, clbit_reg) + quantum_circuit = QuantumCircuit(qubit_reg, clbit_reg, name="bell") + quantum_circuit.h(qubit_reg[0]) + quantum_circuit.cx(qubit_reg[0], qubit_reg[1]) + quantum_circuit.measure(qubit_reg, clbit_reg) - circuits = transpile(qc, backend=backend) + circuits = transpile(quantum_circuit, backend=backend) self.assertIsInstance(circuits, QuantumCircuit) @requires_device @@ -80,13 +80,13 @@ def test_compile_two_remote(self, backend): """Test transpile with a remote backend on two circuits.""" qubit_reg = QuantumRegister(2, name="q") clbit_reg = ClassicalRegister(2, name="c") - qc = QuantumCircuit(qubit_reg, clbit_reg, name="bell") - qc.h(qubit_reg[0]) - qc.cx(qubit_reg[0], qubit_reg[1]) - qc.measure(qubit_reg, clbit_reg) + quantum_circuit = QuantumCircuit(qubit_reg, clbit_reg, name="bell") + quantum_circuit.h(qubit_reg[0]) + quantum_circuit.cx(qubit_reg[0], qubit_reg[1]) + quantum_circuit.measure(qubit_reg, clbit_reg) qc_extra = QuantumCircuit(qubit_reg, clbit_reg, name="extra") qc_extra.measure(qubit_reg, clbit_reg) - circuits = transpile([qc, qc_extra], backend) + circuits = transpile([quantum_circuit, qc_extra], backend) self.assertIsInstance(circuits[0], QuantumCircuit) self.assertIsInstance(circuits[1], QuantumCircuit) @@ -94,14 +94,16 @@ def test_compile_two_run_remote(self): """Test transpile and run two circuits.""" qubit_reg = QuantumRegister(2, name="q") clbit_reg = ClassicalRegister(2, name="c") - qc = QuantumCircuit(qubit_reg, clbit_reg, name="bell") - qc.h(qubit_reg[0]) - qc.cx(qubit_reg[0], qubit_reg[1]) - qc.measure(qubit_reg, clbit_reg) + quantum_circuit = QuantumCircuit(qubit_reg, clbit_reg, name="bell") + quantum_circuit.h(qubit_reg[0]) + quantum_circuit.cx(qubit_reg[0], qubit_reg[1]) + quantum_circuit.measure(qubit_reg, clbit_reg) qc_extra = QuantumCircuit(qubit_reg, clbit_reg, name="extra") qc_extra.measure(qubit_reg, clbit_reg) circs = transpile( - [qc, qc_extra], backend=self.sim_backend, seed_transpiler=self.seed + [quantum_circuit, qc_extra], + backend=self.sim_backend, + seed_transpiler=self.seed, ) job = self.sim_backend.run(circs) result = job.result() @@ -109,10 +111,12 @@ def test_compile_two_run_remote(self): def test_execute_two_remote(self): """Test executing two circuits on a remote backend.""" - qc = ReferenceCircuits.bell() + quantum_circuit = ReferenceCircuits.bell() qc_extra = QuantumCircuit(2, 2) qc_extra.measure_all() - job = execute([qc, qc_extra], self.sim_backend, seed_transpiler=self.seed) + job = execute( + [quantum_circuit, qc_extra], self.sim_backend, seed_transpiler=self.seed + ) results = job.result() self.assertIsInstance(results, Result) @@ -120,8 +124,8 @@ def test_execute_two_remote(self): def test_private_job(self, provider, hub, group, project): """Test a private job.""" backend = provider.get_backend("ibmq_qasm_simulator", hub, group, project) - qc = ReferenceCircuits.bell() - job = execute(qc, backend=backend) + quantum_circuit = ReferenceCircuits.bell() + job = execute(quantum_circuit, backend=backend) self.assertIsNotNone(job.circuits()) self.assertIsNotNone(job.result()) diff --git a/test/ibm/test_ibm_job.py b/test/ibm/test_ibm_job.py index a2159ca1c..3954bf6fe 100644 --- a/test/ibm/test_ibm_job.py +++ b/test/ibm/test_ibm_job.py @@ -88,15 +88,15 @@ def test_run_device(self, backend): def test_run_multiple_simulator(self): """Test running multiple jobs in a simulator.""" num_qubits = 16 - qr = QuantumRegister(num_qubits, "qr") - cr = ClassicalRegister(num_qubits, "cr") - qc = QuantumCircuit(qr, cr) + quantum_register = QuantumRegister(num_qubits, "qr") + classical_register = ClassicalRegister(num_qubits, "cr") + quantum_circuit = QuantumCircuit(quantum_register, classical_register) for i in range(num_qubits - 1): - qc.cx(qr[i], qr[i + 1]) - qc.measure(qr, cr) + quantum_circuit.cx(quantum_register[i], quantum_register[i + 1]) + quantum_circuit.measure(quantum_register, classical_register) num_jobs = 5 job_array = [ - self.sim_backend.run(transpile([qc] * 20), shots=2048) + self.sim_backend.run(transpile([quantum_circuit] * 20), shots=2048) for _ in range(num_jobs) ] timeout = 30 @@ -106,7 +106,7 @@ def test_run_multiple_simulator(self): if check >= 2: self.log.info("found %d simultaneous jobs", check) break - if all([job.status() is JobStatus.DONE for job in job_array]): + if all((job.status() is JobStatus.DONE for job in job_array)): # done too soon? don't generate error self.log.warning( "all jobs completed before simultaneous jobs " "could be detected" @@ -134,8 +134,8 @@ def test_run_multiple_simulator(self): result_array = [job.result() for job in job_array] self.log.info("got back all job results") # Ensure all jobs have finished. - self.assertTrue(all([job.status() is JobStatus.DONE for job in job_array])) - self.assertTrue(all([result.success for result in result_array])) + self.assertTrue(all((job.status() is JobStatus.DONE for job in job_array))) + self.assertTrue(all((result.success for result in result_array))) # Ensure job ids are unique. job_ids = [job.job_id() for job in job_array] @@ -146,15 +146,16 @@ def test_run_multiple_simulator(self): def test_run_multiple_device(self, backend): """Test running multiple jobs in a real device.""" num_qubits = 5 - qr = QuantumRegister(num_qubits, "qr") - cr = ClassicalRegister(num_qubits, "cr") - qc = QuantumCircuit(qr, cr) + quantum_register = QuantumRegister(num_qubits, "qr") + classical_register = ClassicalRegister(num_qubits, "cr") + quantum_circuit = QuantumCircuit(quantum_register, classical_register) for i in range(num_qubits - 1): - qc.cx(qr[i], qr[i + 1]) - qc.measure(qr, cr) + quantum_circuit.cx(quantum_register[i], quantum_register[i + 1]) + quantum_circuit.measure(quantum_register, classical_register) num_jobs = 3 job_array = [ - backend.run(transpile(qc, backend=backend)) for _ in range(num_jobs) + backend.run(transpile(quantum_circuit, backend=backend)) + for _ in range(num_jobs) ] time.sleep(3) # give time for jobs to start (better way?) job_status = [job.status() for job in job_array] @@ -178,8 +179,8 @@ def test_run_multiple_device(self, backend): result_array = [job.result() for job in job_array] # Ensure all jobs have finished. - self.assertTrue(all([job.status() is JobStatus.DONE for job in job_array])) - self.assertTrue(all([result.success for result in result_array])) + self.assertTrue(all((job.status() is JobStatus.DONE for job in job_array))) + self.assertTrue(all((result.success for result in result_array))) # Ensure job ids are unique. job_ids = [job.job_id() for job in job_array] @@ -524,10 +525,10 @@ def test_pulse_job(self): inst_map = defaults.instruction_schedule_map # Run 2 experiments - 1 with x pulse and 1 without - x = inst_map.get("x", 0) - measure = inst_map.get("measure", range(config.n_qubits)) << x.duration + x_pulse = inst_map.get("x", 0) + measure = inst_map.get("measure", range(config.n_qubits)) << x_pulse.duration ground_sched = measure - excited_sched = x | measure + excited_sched = x_pulse | measure schedules = [ground_sched, excited_sched] job = backend.run(schedules, meas_level=1, shots=256) diff --git a/test/ibm/test_ibm_job_states.py b/test/ibm/test_ibm_job_states.py index 649d32663..2a4ef328f 100644 --- a/test/ibm/test_ibm_job_states.py +++ b/test/ibm/test_ibm_job_states.py @@ -16,6 +16,8 @@ import copy import time +from concurrent import futures +from concurrent.futures import ThreadPoolExecutor from contextlib import suppress from unittest import mock @@ -297,7 +299,6 @@ def test_completed_result(self): def test_block_on_result_waiting_until_completed(self): """Test waiting for job results.""" - from concurrent import futures job = self.run_with_api(NonQueuedAPI()) with futures.ThreadPoolExecutor() as executor: @@ -309,7 +310,6 @@ def test_block_on_result_waiting_until_completed(self): def test_block_on_result_waiting_until_cancelled(self): """Test canceling job while waiting for results.""" - from concurrent.futures import ThreadPoolExecutor job = self.run_with_api(CancellableAPI()) with ThreadPoolExecutor() as executor: @@ -322,7 +322,6 @@ def test_block_on_result_waiting_until_cancelled(self): def test_block_on_result_waiting_until_exception(self): """Test getting API error while waiting for job results.""" - from concurrent.futures import ThreadPoolExecutor job = self.run_with_api(ThrowingAPI()) diff --git a/test/ibm/test_ibm_logger.py b/test/ibm/test_ibm_logger.py index d8abccf12..8d76fd471 100644 --- a/test/ibm/test_ibm_logger.py +++ b/test/ibm/test_ibm_logger.py @@ -167,7 +167,7 @@ def test_log_file(self): ) # Assert the messages were logged. - with open(temp_log_file.name) as file_: + with open(temp_log_file.name, encoding="utf-8") as file_: content_as_str = file_.read() # Check whether the appropriate substrings are in the file. diff --git a/test/ibm/test_ibm_provider.py b/test/ibm/test_ibm_provider.py index 3d19f01ba..2db5dc079 100644 --- a/test/ibm/test_ibm_provider.py +++ b/test/ibm/test_ibm_provider.py @@ -298,7 +298,9 @@ def test_load_saved_account_invalid_hgp_format(self): # Save the account. IBMProvider.save_account(token=self.token, url=QISKIT_IBM_API_URL) # Add an invalid provider field to the account stored. - with open(temp_qiskitrc.tmp_file.name, "a") as _file: + with open( + temp_qiskitrc.tmp_file.name, "a", encoding="utf-8" + ) as _file: _file.write("default_provider = {}".format(invalid_hgp)) # Ensure an error is raised if the stored provider is in an invalid format. with self.assertRaises(IBMProviderError) as context_manager: @@ -378,11 +380,11 @@ class TestIBMProviderServices(IBMTestCase, providers.ProviderTestCase): def setUp(self): """Initial test setup.""" super().setUp() - qr = QuantumRegister(1) - cr = ClassicalRegister(1) - self.qc1 = QuantumCircuit(qr, cr, name="circuit0") - self.qc1.h(qr[0]) - self.qc1.measure(qr, cr) + quantum_register = QuantumRegister(1) + classical_register = ClassicalRegister(1) + self.qc1 = QuantumCircuit(quantum_register, classical_register, name="circuit0") + self.qc1.h(quantum_register[0]) + self.qc1.measure(quantum_register, classical_register) @requires_provider def _get_provider(self, provider, hub, group, project): diff --git a/test/ibm/test_ibm_qasm_simulator.py b/test/ibm/test_ibm_qasm_simulator.py index 71033e2be..ff6b3efeb 100644 --- a/test/ibm/test_ibm_qasm_simulator.py +++ b/test/ibm/test_ibm_qasm_simulator.py @@ -41,33 +41,37 @@ def setUp(self, provider, hub, group, project): def test_execute_one_circuit_simulator_online(self): """Test execute_one_circuit_simulator_online.""" - qr = QuantumRegister(1) - cr = ClassicalRegister(1) - qc = QuantumCircuit(qr, cr, name="qc") - qc.h(qr[0]) - qc.measure(qr[0], cr[0]) - circs = transpile(qc, backend=self.sim_backend, seed_transpiler=73846087) + quantum_register = QuantumRegister(1) + classical_register = ClassicalRegister(1) + quantum_circuit = QuantumCircuit( + quantum_register, classical_register, name="qc" + ) + quantum_circuit.h(quantum_register[0]) + quantum_circuit.measure(quantum_register[0], classical_register[0]) + circs = transpile( + quantum_circuit, backend=self.sim_backend, seed_transpiler=73846087 + ) shots = 1024 job = self.sim_backend.run(circs, shots=shots) result = job.result() - counts = result.get_counts(qc) + counts = result.get_counts(quantum_circuit) target = {"0": shots / 2, "1": shots / 2} threshold = 0.1 * shots self.assertDictAlmostEqual(counts, target, threshold) def test_execute_several_circuits_simulator_online(self): """Test execute_several_circuits_simulator_online.""" - qr = QuantumRegister(2) - cr = ClassicalRegister(2) - qcr1 = QuantumCircuit(qr, cr, name="qc1") - qcr2 = QuantumCircuit(qr, cr, name="qc2") - qcr1.h(qr) - qcr2.h(qr[0]) - qcr2.cx(qr[0], qr[1]) - qcr1.measure(qr[0], cr[0]) - qcr1.measure(qr[1], cr[1]) - qcr2.measure(qr[0], cr[0]) - qcr2.measure(qr[1], cr[1]) + quantum_register = QuantumRegister(2) + classical_register = ClassicalRegister(2) + qcr1 = QuantumCircuit(quantum_register, classical_register, name="qc1") + qcr2 = QuantumCircuit(quantum_register, classical_register, name="qc2") + qcr1.h(quantum_register) + qcr2.h(quantum_register[0]) + qcr2.cx(quantum_register[0], quantum_register[1]) + qcr1.measure(quantum_register[0], classical_register[0]) + qcr1.measure(quantum_register[1], classical_register[1]) + qcr2.measure(quantum_register[0], classical_register[0]) + qcr2.measure(quantum_register[1], classical_register[1]) shots = 1024 circs = transpile( [qcr1, qcr2], backend=self.sim_backend, seed_transpiler=73846087 @@ -110,13 +114,13 @@ def test_online_qasm_simulator_two_registers(self): def test_conditional_operation(self): """Test conditional operation.""" - qr = QuantumRegister(4) - cr = ClassicalRegister(4) - circuit = QuantumCircuit(qr, cr) - circuit.x(qr[0]) - circuit.x(qr[2]) - circuit.measure(qr[0], cr[0]) - circuit.x(qr[0]).c_if(cr, 1) + quantum_register = QuantumRegister(4) + classical_register = ClassicalRegister(4) + circuit = QuantumCircuit(quantum_register, classical_register) + circuit.x(quantum_register[0]) + circuit.x(quantum_register[2]) + circuit.measure(quantum_register[0], classical_register[0]) + circuit.x(quantum_register[0]).c_if(classical_register, 1) result = self.sim_backend.run( transpile(circuit, backend=self.sim_backend) diff --git a/test/ibm/test_serialization.py b/test/ibm/test_serialization.py index 92ac93f18..a7ee41070 100644 --- a/test/ibm/test_serialization.py +++ b/test/ibm/test_serialization.py @@ -71,9 +71,9 @@ def test_pulse_qobj(self): defaults = backend.defaults() inst_map = defaults.instruction_schedule_map - x = inst_map.get("x", 0) - measure = inst_map.get("measure", range(config.n_qubits)) << x.duration - schedules = x | measure + x_pulse = inst_map.get("x", 0) + measure = inst_map.get("measure", range(config.n_qubits)) << x_pulse.duration + schedules = x_pulse | measure job = backend.run(schedules, meas_level=1, shots=256) rqobj = self.provider.backend.job(job.job_id())._get_qobj() @@ -176,10 +176,10 @@ def test_pulse_job_result(self): raise SkipTest("Skipping pulse test since no pulse backend found.") backend = least_busy(backends) - qc = QuantumCircuit(1, 1) - qc.x(0) - qc.measure([0], [0]) - sched = schedule(transpile(qc, backend=backend), backend=backend) + quantum_circuit = QuantumCircuit(1, 1) + quantum_circuit.x(0) + quantum_circuit.measure([0], [0]) + sched = schedule(transpile(quantum_circuit, backend=backend), backend=backend) job = backend.run(sched) result = job.result() diff --git a/test/ibm/test_tutorials.py b/test/ibm/test_tutorials.py index 31ee50e90..6740957fc 100644 --- a/test/ibm/test_tutorials.py +++ b/test/ibm/test_tutorials.py @@ -30,7 +30,9 @@ class TutorialsTestCaseMeta(type): """Metaclass that dynamically appends a "test_TUTORIAL_NAME" method to the class.""" - def __new__(mcs, name, bases, dict_): + def __new__( + mcs, name, bases, dict_ + ): # pylint: disable=bad-mcs-classmethod-argument def create_test(filename): """Return a new test function.""" @@ -46,7 +48,9 @@ def test_function(self): test_name = "test_%s" % to_python_identifier(filename) dict_[test_name] = create_test(filename) dict_[test_name].__doc__ = 'Test tutorial "%s"' % filename - return type.__new__(mcs, name, bases, dict_) + return type.__new__( + mcs, name, bases, dict_ + ) # pylint: disable=bad-mcs-classmethod-argument @skipIf(not TEST_OPTIONS["run_slow"], "Skipping slow tests.") @@ -60,7 +64,7 @@ def _run_notebook(filename): # Open the notebook. file_path = os.path.dirname(os.path.abspath(filename)) - with open(filename) as file_: + with open(filename, encoding="utf-8") as file_: notebook = nbformat.read(file_, as_version=4) with warnings.catch_warnings(): diff --git a/test/ibm/websocket/test_websocket_integration.py b/test/ibm/websocket/test_websocket_integration.py index 3fca5af08..19820e9d4 100644 --- a/test/ibm/websocket/test_websocket_integration.py +++ b/test/ibm/websocket/test_websocket_integration.py @@ -184,14 +184,14 @@ def test_websockets_timeout(self): def test_websockets_multi_job(self): """Test checking status of multiple jobs in parallel via websockets.""" - def _run_job_get_result(q): + def _run_job_get_result(queue): """Run a job and get its result.""" job = self.sim_backend.run(self.bell) # Manually disable the non-websocket polling. job._api_client._job_final_status_polling = self._job_final_status_polling job._wait_for_completion() if job._status is not JobStatus.DONE: - q.put( + queue.put( "Job {} status should be DONE but is {}".format( job.job_id(), job._status.name ) diff --git a/test/utils.py b/test/utils.py index 7620ae8f8..6da766467 100644 --- a/test/utils.py +++ b/test/utils.py @@ -98,9 +98,9 @@ def get_large_circuit(backend: IBMBackend) -> QuantumCircuit: """ n_qubits = min(backend.configuration().n_qubits, 20) circuit = QuantumCircuit(n_qubits, n_qubits) - for n in range(n_qubits - 1): - circuit.h(n) - circuit.cx(n, n + 1) + for num_qubits in range(n_qubits - 1): + circuit.h(num_qubits) + circuit.cx(num_qubits, num_qubits + 1) circuit.measure(list(range(n_qubits)), list(range(n_qubits))) return circuit @@ -210,10 +210,10 @@ def get_pulse_schedule(backend: IBMBackend) -> Schedule: inst_map = defaults.instruction_schedule_map # Run 2 experiments - 1 with x pulse and 1 without - x = inst_map.get("x", 0) - measure = inst_map.get("measure", range(config.n_qubits)) << x.duration + x_pulse = inst_map.get("x", 0) + measure = inst_map.get("measure", range(config.n_qubits)) << x_pulse.duration ground_sched = measure - excited_sched = x | measure + excited_sched = x_pulse | measure schedules = [ground_sched, excited_sched] return schedules