From d6929487be7d5b4726e468c01d955c5cd04389ea Mon Sep 17 00:00:00 2001 From: Michael Aichmueller Date: Thu, 18 May 2023 16:46:48 +0200 Subject: [PATCH 1/8] pre-commit setup --- .clang-format | 155 ++++++++++++++++++++++++++++++++++++++++ .cmake-format.yaml | 18 +++++ .pre-commit-config.yaml | 68 ++++++++++++++++++ black.cfg | 17 +++++ 4 files changed, 258 insertions(+) create mode 100644 .clang-format create mode 100644 .cmake-format.yaml create mode 100644 .pre-commit-config.yaml create mode 100644 black.cfg diff --git a/.clang-format b/.clang-format new file mode 100644 index 0000000000..4c73e88302 --- /dev/null +++ b/.clang-format @@ -0,0 +1,155 @@ +BasedOnStyle: Chromium +Language: Cpp +AccessModifierOffset: -1 +AlignAfterOpenBracket: BlockIndent +#AlignConsecutiveMacros: true +AlignConsecutiveAssignments: false +AlignConsecutiveDeclarations: false +AlignEscapedNewlines: Left +AlignOperands: true +AlignTrailingComments: false +AllowAllArgumentsOnNextLine: true +AllowAllConstructorInitializersOnNextLine: true +AllowAllParametersOfDeclarationOnNextLine: false +AllowShortBlocksOnASingleLine: true +AllowShortCaseLabelsOnASingleLine: true +AllowShortFunctionsOnASingleLine: Inline +AllowShortLambdasOnASingleLine: All +AllowShortIfStatementsOnASingleLine: Never +AllowShortLoopsOnASingleLine: false +AlwaysBreakAfterDefinitionReturnType: None +AlwaysBreakAfterReturnType: None +AlwaysBreakBeforeMultilineStrings: true +AlwaysBreakTemplateDeclarations: Yes +BinPackArguments: false +BinPackParameters: false +BreakBeforeBraces: Custom +BraceWrapping: + AfterCaseLabel: false + AfterClass: false + AfterControlStatement: false + AfterEnum: false + AfterFunction: true + AfterNamespace: false + AfterObjCDeclaration: false + AfterStruct: false + AfterUnion: false + AfterExternBlock: false + BeforeCatch: false + BeforeElse: false + IndentBraces: false + SplitEmptyFunction: true + SplitEmptyRecord: true + SplitEmptyNamespace: true +BreakBeforeBinaryOperators: NonAssignment +BreakBeforeInheritanceComma: false +BreakInheritanceList: AfterColon +BreakBeforeTernaryOperators: true +BreakConstructorInitializersBeforeComma: false +BreakConstructorInitializers: BeforeColon +BreakAfterJavaFieldAnnotations: false +BreakStringLiterals: true +ColumnLimit: 100 +CommentPragmas: '^ IWYU pragma:' +CompactNamespaces: false +ConstructorInitializerAllOnOneLineOrOnePerLine: true +ConstructorInitializerIndentWidth: 4 +ContinuationIndentWidth: 3 +Cpp11BracedListStyle: true +DerivePointerAlignment: true +DisableFormat: false +ExperimentalAutoDetectBinPacking: false +FixNamespaceComments: true +ForEachMacros: + - foreach + - Q_FOREACH + - BOOST_FOREACH +IncludeBlocks: Regroup +IncludeCategories: + - Regex: '^' + Priority: 2 + - Regex: '^<.*\.h>' + Priority: 1 + - Regex: '^<.*' + Priority: 2 + - Regex: '.*' + Priority: 3 +IncludeIsMainRegex: '([-_](test|unittest))?$' +IndentCaseLabels: true +IndentPPDirectives: BeforeHash +IndentWidth: 3 +IndentWrappedFunctionNames: false +JavaScriptQuotes: Leave +JavaScriptWrapImports: true +KeepEmptyLinesAtTheStartOfBlocks: false +MacroBlockBegin: '' +MacroBlockEnd: '' +MaxEmptyLinesToKeep: 1 +NamespaceIndentation: None +ObjCBinPackProtocolList: Never +ObjCBlockIndentWidth: 2 +ObjCSpaceAfterProperty: false +ObjCSpaceBeforeProtocolList: true +PenaltyBreakAssignment: 1000 +PenaltyBreakBeforeFirstCallParameter: 0 +PenaltyBreakComment: 300 +PenaltyBreakFirstLessLess: 120 +PenaltyBreakString: 1000 +PenaltyBreakTemplateDeclaration: 10 +PenaltyExcessCharacter: 1000000 +PenaltyReturnTypeOnItsOwnLine: 200 +PointerAlignment: Left +RawStringFormats: + - Language: Cpp + Delimiters: + - cc + - CC + - cpp + - Cpp + - CPP + - 'c++' + - 'C++' + CanonicalDelimiter: '' + BasedOnStyle: google + - Language: TextProto + Delimiters: + - pb + - PB + - proto + - PROTO + EnclosingFunctions: + - EqualsProto + - EquivToProto + - PARSE_PARTIAL_TEXT_PROTO + - PARSE_TEST_PROTO + - PARSE_TEXT_PROTO + - ParseTextOrDie + - ParseTextProtoOrDie + CanonicalDelimiter: '' + BasedOnStyle: google +ReflowComments: true +SortIncludes: true +SortUsingDeclarations: false +SpaceAfterCStyleCast: true +SpaceAfterLogicalNot: true +SpaceAfterTemplateKeyword: true +SpaceBeforeAssignmentOperators: true +SpaceBeforeCpp11BracedList: false +SpaceBeforeCtorInitializerColon: true +SpaceBeforeInheritanceColon: false +SpaceBeforeParens: Never +SpaceBeforeRangeBasedForLoopColon: true +SpaceInEmptyParentheses: false +SpacesBeforeTrailingComments: 2 +SpacesInAngles: true +SpacesInContainerLiterals: false +SpacesInCStyleCastParentheses: false +SpacesInParentheses: false +SpacesInSquareBrackets: false +Standard: Auto +StatementMacros: + - Q_UNUSED + - QT_REQUIRE_VERSION +TabWidth: 8 +UseTab: Never +... diff --git a/.cmake-format.yaml b/.cmake-format.yaml new file mode 100644 index 0000000000..c4a575eeed --- /dev/null +++ b/.cmake-format.yaml @@ -0,0 +1,18 @@ +additional_commands: + foo: + flags: + - BAR + - BAZ + kwargs: + DEPENDS: '*' + HEADERS: '*' + SOURCES: '*' +bullet_char: '*' +dangle_parens: false +enum_char: . +line_ending: unix +line_width: 120 +max_pargs_hwrap: 3 +separate_ctrl_name_with_space: false +separate_fn_name_with_space: false +tab_size: 2 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml new file mode 100644 index 0000000000..e72fda7418 --- /dev/null +++ b/.pre-commit-config.yaml @@ -0,0 +1,68 @@ +# To run all pre-commit checks, use: +# +# pre-commit run -a +# +# To install pre-commit hooks that run every time you commit: +# +# pre-commit install +# + + +repos: + # Standard hooks + - repo: https://github.com/pre-commit/pre-commit-hooks + rev: "v4.4.0" + hooks: + - id: check-added-large-files + - id: check-case-conflict + - id: check-docstring-first + - id: check-merge-conflict + - id: check-symlinks + - id: check-toml + - id: check-yaml + - id: debug-statements + - id: end-of-file-fixer + - id: mixed-line-ending + - id: requirements-txt-fixer + - id: trailing-whitespace + + # Check for common mistakes + - repo: https://github.com/pre-commit/pygrep-hooks + rev: "v1.10.0" + hooks: + - id: python-check-blanket-noqa + - id: python-check-blanket-type-ignore + - id: python-no-log-warn + - id: python-no-eval + - id: python-use-type-annotations + + # Sort includes + - repo: https://github.com/PyCQA/isort + rev: "5.12.0" + hooks: + - id: isort + args: ["--profile", "black"] + + # Format Python code + - repo: https://github.com/psf/black + rev: 23.3.0 + hooks: + - id: black + language_version: python3 + types: [python] + args: ["--config", "black.cfg"] + + # Clang-format the C++ part of the code base automatically + - repo: https://github.com/pre-commit/mirrors-clang-format + rev: "v16.0.3" + hooks: + - id: clang-format + types_or: [ c++, c, cuda ] + + # CMake format and lint the CMakeLists.txt files + - repo: https://github.com/cheshirekow/cmake-format-precommit + rev: v0.6.13 + hooks: + - id: cmake-format + additional_dependencies: + - pyyaml diff --git a/black.cfg b/black.cfg new file mode 100644 index 0000000000..f323685739 --- /dev/null +++ b/black.cfg @@ -0,0 +1,17 @@ +[tool.black] +include = '\.pyi?$' +exclude = ''' +/( +\.eggs +| \.git +| \.hg +| \.mypy_cache +| \.nox +| \.tox +| \.venv +| _build +| buck-out +| build +| dist +)/ +''' From 0c272b2d53fb33525eb89ad3dc7cb85b605a50b7 Mon Sep 17 00:00:00 2001 From: Michael Aichmueller Date: Thu, 18 May 2023 16:59:54 +0200 Subject: [PATCH 2/8] ignore editable install aux files --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 5315c68f81..cd69541f4f 100644 --- a/.gitignore +++ b/.gitignore @@ -60,3 +60,5 @@ Package.resolved # Visual Studio generated files open_spiel/.vs /.env + +open_spiel.egg-info/ From 626e685b58b007ef902d13dff18674a4edc63a34 Mon Sep 17 00:00:00 2001 From: Michael Aichmueller Date: Thu, 18 May 2023 18:49:18 +0200 Subject: [PATCH 3/8] remove hooks that need manual fixes --- .pre-commit-config.yaml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index e72fda7418..ffdb4fa6ba 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -15,7 +15,9 @@ repos: hooks: - id: check-added-large-files - id: check-case-conflict - - id: check-docstring-first +# Check docstring-first currently clashes with an integrated file: +# open_spiel/python/algorithms/psro_v2/strategy_selectors.py:281: Multiple module docstrings (first docstring on line 15). +# - id: check-docstring-first - id: check-merge-conflict - id: check-symlinks - id: check-toml @@ -32,7 +34,8 @@ repos: hooks: - id: python-check-blanket-noqa - id: python-check-blanket-type-ignore - - id: python-no-log-warn +# Python-no-log-warn clashes in multiple places where logging.warn has been used +# - id: python-no-log-warn - id: python-no-eval - id: python-use-type-annotations From cd044a77c5ecf869456fe2ef38f39e6496faf6e7 Mon Sep 17 00:00:00 2001 From: Michael Aichmueller Date: Thu, 18 May 2023 18:50:56 +0200 Subject: [PATCH 4/8] tiny change to not have common checks fail --- open_spiel/python/mfg/games/predator_prey.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/open_spiel/python/mfg/games/predator_prey.py b/open_spiel/python/mfg/games/predator_prey.py index 0befe8e344..32f42dd6ea 100644 --- a/open_spiel/python/mfg/games/predator_prey.py +++ b/open_spiel/python/mfg/games/predator_prey.py @@ -198,7 +198,7 @@ def __init__(self, game, population=None): if self._population is not None: assert 0 <= self._population < self.num_players() # When set, [2] numpy array representing the x, y position on the grid. - self._pos = None # type: Optional[np.ndarray] + self._pos: Optional[np.ndarray] = None self._t = 0 self.size = game.size # Number of states in the grid. From db3577fb6526f30fa48fcc941862b08def638397 Mon Sep 17 00:00:00 2001 From: Michael Aichmueller Date: Thu, 18 May 2023 22:41:09 +0200 Subject: [PATCH 5/8] add pyproject.toml, strip setup.py to build extension only, add pylint necessary changes to allow pylint to be a pre-commit hook as well, modernize setup process --- .pre-commit-config.yaml | 54 +++-- .pylintrc | 429 ++++++++++++++++++++++++++++++++++++++++ black.cfg | 17 -- pyproject.toml | 83 ++++++++ setup.py | 85 +++----- 5 files changed, 581 insertions(+), 87 deletions(-) create mode 100644 .pylintrc delete mode 100644 black.cfg create mode 100644 pyproject.toml diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index ffdb4fa6ba..092a50039b 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -15,9 +15,9 @@ repos: hooks: - id: check-added-large-files - id: check-case-conflict -# Check docstring-first currently clashes with an integrated file: -# open_spiel/python/algorithms/psro_v2/strategy_selectors.py:281: Multiple module docstrings (first docstring on line 15). -# - id: check-docstring-first + # Check docstring-first currently clashes with an integrated file: + # open_spiel/python/algorithms/psro_v2/strategy_selectors.py:281: Multiple module docstrings (first docstring on line 15). + # - id: check-docstring-first - id: check-merge-conflict - id: check-symlinks - id: check-toml @@ -34,8 +34,8 @@ repos: hooks: - id: python-check-blanket-noqa - id: python-check-blanket-type-ignore -# Python-no-log-warn clashes in multiple places where logging.warn has been used -# - id: python-no-log-warn + # Python-no-log-warn clashes in multiple places where logging.warn has been used + # - id: python-no-log-warn - id: python-no-eval - id: python-use-type-annotations @@ -44,16 +44,26 @@ repos: rev: "5.12.0" hooks: - id: isort - args: ["--profile", "black"] + args: [ "--profile", "black" ] - # Format Python code - - repo: https://github.com/psf/black - rev: 23.3.0 - hooks: - - id: black - language_version: python3 - types: [python] - args: ["--config", "black.cfg"] + - repo: https://github.com/google/pyink + rev: 23.3.0 + hooks: + - id: pyink + # It is recommended to specify the latest version of Python + # supported by your project here, or alternatively use + # pre-commit's default_language_version, see + # https://pre-commit.com/#top_level-default_language_version + language_version: python3 + types: [python] + +# # Format Python code +# - repo: https://github.com/psf/black +# rev: 23.3.0 +# hooks: +# - id: black +# language_version: python3 +# types: [ python ] # Clang-format the C++ part of the code base automatically - repo: https://github.com/pre-commit/mirrors-clang-format @@ -62,10 +72,24 @@ repos: - id: clang-format types_or: [ c++, c, cuda ] - # CMake format and lint the CMakeLists.txt files + # CMake format the CMakeLists.txt files - repo: https://github.com/cheshirekow/cmake-format-precommit rev: v0.6.13 hooks: - id: cmake-format additional_dependencies: - pyyaml + + - repo: local + hooks: + - id: pylint + name: pylint + entry: pylint + language: system + types: [ python ] + args: + [ + "-rn", # Only display messages + "-sn", # Don't display the score + "--rcfile=.pylintrc", + ] diff --git a/.pylintrc b/.pylintrc new file mode 100644 index 0000000000..140a876ec0 --- /dev/null +++ b/.pylintrc @@ -0,0 +1,429 @@ +# This Pylint rcfile contains a best-effort configuration to uphold the +# best-practices and style described in the Google Python style guide: +# https://google.github.io/styleguide/pyguide.html +# +# Its canonical open-source location is: +# https://google.github.io/styleguide/pylintrc + +[MASTER] + +# Files or directories to be skipped. They should be base names, not paths. +ignore=third_party + +# 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=no + +# List of plugins (as comma separated values of python modules names) to load, +# usually to register additional checkers. +load-plugins= + +# Use multiple processes to speed up Pylint. +jobs=4 + +# Allow loading of arbitrary C extensions. Extensions are imported into the +# active Python interpreter and may run arbitrary code. +unsafe-load-any-extension=no + + +[MESSAGES CONTROL] + +# Only show warnings with the listed confidence levels. Leave empty to show +# 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 +# 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=abstract-method, + apply-builtin, + arguments-differ, + attribute-defined-outside-init, + backtick, + bad-option-value, + basestring-builtin, + buffer-builtin, + c-extension-no-member, + consider-using-enumerate, + cmp-builtin, + cmp-method, + coerce-builtin, + coerce-method, + delslice-method, + div-method, + duplicate-code, + eq-without-hash, + execfile-builtin, + file-builtin, + filter-builtin-not-iterating, + fixme, + getslice-method, + global-statement, + hex-method, + idiv-method, + implicit-str-concat, + import-error, + import-self, + import-star-module-level, + inconsistent-return-statements, + input-builtin, + intern-builtin, + invalid-str-codec, + locally-disabled, + long-builtin, + long-suffix, + map-builtin-not-iterating, + misplaced-comparison-constant, + missing-function-docstring, + metaclass-assignment, + next-method-called, + next-method-defined, + no-absolute-import, + no-else-break, + no-else-continue, + no-else-raise, + no-else-return, + no-init, # added + no-member, + no-name-in-module, + no-self-use, + nonzero-method, + oct-method, + old-division, + old-ne-operator, + old-octal-literal, + old-raise-syntax, + parameter-unpacking, + print-statement, + raising-string, + range-builtin-not-iterating, + raw_input-builtin, + rdiv-method, + reduce-builtin, + relative-import, + reload-builtin, + round-builtin, + setslice-method, + signature-differs, + standarderror-builtin, + suppressed-message, + sys-max-int, + too-few-public-methods, + too-many-ancestors, + too-many-arguments, + too-many-boolean-expressions, + too-many-branches, + too-many-instance-attributes, + too-many-locals, + too-many-nested-blocks, + too-many-public-methods, + too-many-return-statements, + too-many-statements, + trailing-newlines, + unichr-builtin, + unicode-builtin, + unnecessary-pass, + unpacking-in-except, + useless-else-on-loop, + useless-object-inheritance, + useless-suppression, + using-cmp-argument, + wrong-import-order, + xrange-builtin, + zip-builtin-not-iterating, + + +[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 + +# Tells whether to display a full report or only the messages +reports=no + +# 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= + + +[BASIC] + +# Good variable names which should always be accepted, separated by a comma +good-names=main,_ + +# Bad variable names which should always be refused, separated by a comma +bad-names= + +# 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 + +# 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,cached_property.cached_property,cached_property.threaded_cached_property,cached_property.cached_property_with_ttl,cached_property.threaded_cached_property_with_ttl + +# Regular expression matching correct function names +function-rgx=^(?:(?PsetUp|tearDown|setUpModule|tearDownModule)|(?P_?[A-Z][a-zA-Z0-9]*)|(?P_?[a-z][a-z0-9_]*))$ + +# Regular expression matching correct variable names +variable-rgx=^[a-z][a-z0-9_]*$ + +# Regular expression matching correct constant names +const-rgx=^(_?[A-Z][A-Z0-9_]*|__[a-z0-9_]+__|_?[a-z][a-z0-9_]*)$ + +# Regular expression matching correct attribute names +attr-rgx=^_{0,2}[a-z][a-z0-9_]*$ + +# Regular expression matching correct argument names +argument-rgx=^[a-z][a-z0-9_]*$ + +# Regular expression matching correct class attribute names +class-attribute-rgx=^(_?[A-Z][A-Z0-9_]*|__[a-z0-9_]+__|_?[a-z][a-z0-9_]*)$ + +# Regular expression matching correct inline iteration names +inlinevar-rgx=^[a-z][a-z0-9_]*$ + +# Regular expression matching correct class names +class-rgx=^_?[A-Z][a-zA-Z0-9]*$ + +# Regular expression matching correct module names +module-rgx=^(_?[a-z][a-z0-9_]*|__init__)$ + +# Regular expression matching correct method names +method-rgx=(?x)^(?:(?P_[a-z0-9_]+__|runTest|setUp|tearDown|setUpTestCase|tearDownTestCase|setupSelf|tearDownClass|setUpClass|(test|assert)_*[A-Z0-9][a-zA-Z0-9_]*|next)|(?P_{0,2}[A-Z][a-zA-Z0-9_]*)|(?P_{0,2}[a-z][a-z0-9_]*))$ + +# Regular expression which should only match function or class names that do +# not require a docstring. +no-docstring-rgx=(__.*__|main|test.*|.*test|.*Test)$ + +# Minimum line length for functions/classes that require docstrings, shorter +# ones are exempt. +docstring-min-length=10 + + +[TYPECHECK] + +# 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,contextlib2.contextmanager + +# 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 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= + +# 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 + +# 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= + + +[FORMAT] + +# Maximum number of characters on a single line. +max-line-length=80 + +# TODO(https://github.com/PyCQA/pylint/issues/3352): Direct pylint to exempt +# lines made too long by directives to pytype. + +# Regexp for a line that is allowed to be longer than the limit. +ignore-long-lines=(?x)( + ^\s*(\#\ )??$| + ^\s*(from\s+\S+\s+)?import\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=yes + +# Maximum number of lines in a module +max-module-lines=99999 + +# String used as indentation unit. The internal Google style guide mandates 2 +# spaces. Google's externaly-published style guide says 4, consistent with +# PEP 8. Here, we use 2 spaces, for conformity with many open-sourced Google +# projects (like TensorFlow). +indent-string=' ' + +# Number of spaces of indent required inside a hanging or continued line. +indent-after-paren=4 + +# Expected format of line ending, e.g. empty (any line ending), LF or CRLF. +expected-line-ending-format= + + +[MISCELLANEOUS] + +# List of note tags to take in consideration, separated by a comma. +notes=TODO + + +[STRING] + +# 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=yes + + +[VARIABLES] + +# 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=^\*{0,2}(_$|unused_|dummy_) + +# List of additional names supposed to be defined in builtins. Remember that +# you should avoid to define new builtins when possible. +additional-builtins= + +# 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 + +# List of qualified module names which can have objects that can redefine +# builtins. +redefining-builtins-modules=six,six.moves,past.builtins,future.builtins,functools + + +[LOGGING] + +# Logging modules to check that the string format arguments are in logging +# function parameter format +logging-modules=logging,absl.logging,tensorflow.io.logging + + +[SIMILARITIES] + +# Minimum lines number of a similarity. +min-similarity-lines=4 + +# Ignore comments when computing similarities. +ignore-comments=yes + +# Ignore docstrings when computing similarities. +ignore-docstrings=yes + +# Ignore imports when computing similarities. +ignore-imports=no + + +[SPELLING] + +# Spelling dictionary name. Available dictionaries: none. To make it working +# install python-enchant package. +spelling-dict= + +# List of comma separated words that should not be checked. +spelling-ignore-words= + +# A path to a file that contains private dictionary; one word per line. +spelling-private-dict-file= + +# 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 + + +[IMPORTS] + +# Deprecated modules which should not be used, separated by a comma +deprecated-modules=regsub, + TERMIOS, + Bastion, + rexec, + sets + +# Create a graph of every (i.e. internal and external) dependencies in the +# given file (report RP0402 must not be disabled) +import-graph= + +# Create a graph of external dependencies in 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) +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, absl + +# 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 + + +[CLASSES] + +# List of method names used to declare (i.e. assign) instance attributes. +defining-attr-methods=__init__, + __new__, + setUp + +# 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, + class_ + +# 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=builtins.StandardError, + builtins.Exception, + builtins.BaseException diff --git a/black.cfg b/black.cfg deleted file mode 100644 index f323685739..0000000000 --- a/black.cfg +++ /dev/null @@ -1,17 +0,0 @@ -[tool.black] -include = '\.pyi?$' -exclude = ''' -/( -\.eggs -| \.git -| \.hg -| \.mypy_cache -| \.nox -| \.tox -| \.venv -| _build -| buck-out -| build -| dist -)/ -''' diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 0000000000..4e914c37f8 --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,83 @@ +[build-system] +requires = ["setuptools>=61", "cmake>=3.17"] +build-backend = "setuptools.build_meta" + +[project] +name = "open_spiel" +version = "1.2" +license = { file = "LICENSE" } +description = "A Framework for Reinforcement Learning in Games" +requires-python = ">=3.7" +authors = [ + { name = "The OpenSpiel authors", email = "open_spiel@google.com" }, +] +dependencies = [ + "pip >= 20.0.2", + "attrs >= 19.3.0", + "absl-py >= 0.10.0", + "numpy >= 1.21.5", + "scipy >= 1.10.1" +] +dynamic = ["readme"] + +[project.urls] +homepage = "https://github.com/deepmind/open_spiel" + +[tool.setuptools] +zip-safe = false + +[tool.setuptools.dynamic] +readme = { file = "README.md" } + +[project.optional-dependencies] +dev = [ + "pre-commit", + "pylint" +] + +[tool.setuptools.packages.find] +where = ["."] +include = ["open_spiel", "open_spiel.*"] + + +[tool.pyink] +line-length = 80 +pyink-indentation = 2 +include = '\.pyi?$' +exclude = ''' +/( +\.eggs +| \.git +| \.hg +| \.mypy_cache +| \.nox +| \.tox +| \.venv +| _build +| buck-out +| build +| dist +)/ +''' + +[tool.black] +line-length = 80 +include = '\.pyi?$' +exclude = ''' +/( +\.eggs +| \.git +| \.hg +| \.mypy_cache +| \.nox +| \.tox +| \.venv +| _build +| buck-out +| build +| dist +)/ +''' + +[tool.isort] +profile = "black" diff --git a/setup.py b/setup.py index cc29bcc214..ec5bdb0a52 100644 --- a/setup.py +++ b/setup.py @@ -14,8 +14,7 @@ """The setup script for setuptools. -See https://setuptools.readthedocs.io/en/latest/setuptools.html -""" +See https://setuptools.readthedocs.io/en/latest/setuptools.html""" import os import subprocess @@ -49,13 +48,15 @@ def run(self): self.build_extension(ext) def _check_build_environment(self): - """Check for required build tools: CMake, C++ compiler, and python dev.""" + """ + Check for required build tools: CMake, C++ compiler, and python dev. + """ try: subprocess.check_call(["cmake", "--version"]) except OSError as e: ext_names = ", ".join(e.name for e in self.extensions) raise RuntimeError( - f"CMake must be installed to build the following extensions: {ext_names}" + f"CMake must be installed to build the following extensions: {ext_names}" # pylint: disable=line-too-long ) from e print("Found CMake") @@ -67,15 +68,16 @@ def _check_build_environment(self): except OSError as e: ext_names = ", ".join(e.name for e in self.extensions) raise RuntimeError( - "A C++ compiler that supports c++17 must be installed to build the " - + "following extensions: {}".format(ext_names) - + ". We recommend: Clang version >= 7.0.0." + f"A C++ compiler that supports c++17 must be installed to build" + f" the following extensions: {ext_names}." + f"We recommend: Clang version >= 7.0.0." ) from e - print("Found C++ compiler: {}".format(cxx)) + print(f"Found C++ compiler: {cxx}") def build_extension(self, ext): extension_dir = os.path.abspath( - os.path.dirname(self.get_ext_fullpath(ext.name))) + os.path.dirname(self.get_ext_fullpath(ext.name)) + ) cxx = "clang++" if os.environ.get("CXX") is not None: cxx = os.environ.get("CXX") @@ -88,58 +90,31 @@ def build_extension(self, ext): if not os.path.exists(self.build_temp): os.makedirs(self.build_temp) subprocess.check_call( - ["cmake", ext.sourcedir] + cmake_args, cwd=self.build_temp, - env=env) + ["cmake", ext.sourcedir] + cmake_args, + cwd=self.build_temp, + env=env, + ) if os.environ.get("OPEN_SPIEL_BUILD_ALL") is not None: # Build everything (necessary for nox tests) - subprocess.check_call(["make", f"-j{os.cpu_count()}"], - cwd=self.build_temp, - env=env) + subprocess.check_call( + ["make", f"-j{os.cpu_count()}"], + cwd=self.build_temp, + env=env, + ) else: # Build only pyspiel (for pip package) - subprocess.check_call(["make", "pyspiel", f"-j{os.cpu_count()}"], - cwd=self.build_temp, - env=env) + subprocess.check_call( + [ + "make", + "pyspiel", + f"-j{os.cpu_count()}", + ], + cwd=self.build_temp, + env=env, + ) -def _get_requirements(requirements_file): # pylint: disable=g-doc-args - """Returns a list of dependencies for setup() from requirements.txt. - - Currently a requirements.txt is being used to specify dependencies. In order - to avoid specifying it in two places, we're going to use that file as the - source of truth. - """ - with open(requirements_file) as f: - return [_parse_line(line) for line in f if line] - - -def _parse_line(s): - """Parses a line of a requirements.txt file.""" - requirement, *_ = s.split("#") - return requirement.strip() - - -# Get the requirements from file. During nox tests, this is in the current -# directory, but when installing from pip it is in the parent directory -req_file = "" -if os.path.exists("requirements.txt"): - req_file = "requirements.txt" -else: - req_file = "../requirements.txt" - setuptools.setup( - name="open_spiel", - version="1.2", - license="Apache 2.0", - author="The OpenSpiel authors", - author_email="open_spiel@google.com", - description="A Framework for Reinforcement Learning in Games", - long_description=open("README.md").read(), - long_description_content_type="text/markdown", - url="https://github.com/deepmind/open_spiel", - install_requires=_get_requirements(req_file), - python_requires=">=3.7", ext_modules=[CMakeExtension("pyspiel", sourcedir="open_spiel")], cmdclass={"build_ext": BuildExt}, - zip_safe=False, - packages=setuptools.find_packages(include=["open_spiel", "open_spiel.*"])) +) From 149788ea48ab5eb904786777f6d9f62b14ea8e76 Mon Sep 17 00:00:00 2001 From: Michael Aichmueller Date: Fri, 19 May 2023 11:30:50 +0200 Subject: [PATCH 6/8] load dependencies from requirements.txt, comment on black pre-commit take clang-format from google repo --- .clang-format | 202 ++++++++++------------------------------ .pre-commit-config.yaml | 25 ++--- pyproject.toml | 23 ++--- 3 files changed, 72 insertions(+), 178 deletions(-) diff --git a/.clang-format b/.clang-format index 4c73e88302..635974a340 100644 --- a/.clang-format +++ b/.clang-format @@ -1,155 +1,53 @@ -BasedOnStyle: Chromium -Language: Cpp -AccessModifierOffset: -1 -AlignAfterOpenBracket: BlockIndent -#AlignConsecutiveMacros: true -AlignConsecutiveAssignments: false -AlignConsecutiveDeclarations: false -AlignEscapedNewlines: Left -AlignOperands: true -AlignTrailingComments: false -AllowAllArgumentsOnNextLine: true -AllowAllConstructorInitializersOnNextLine: true -AllowAllParametersOfDeclarationOnNextLine: false -AllowShortBlocksOnASingleLine: true -AllowShortCaseLabelsOnASingleLine: true -AllowShortFunctionsOnASingleLine: Inline -AllowShortLambdasOnASingleLine: All -AllowShortIfStatementsOnASingleLine: Never -AllowShortLoopsOnASingleLine: false -AlwaysBreakAfterDefinitionReturnType: None -AlwaysBreakAfterReturnType: None -AlwaysBreakBeforeMultilineStrings: true -AlwaysBreakTemplateDeclarations: Yes -BinPackArguments: false -BinPackParameters: false -BreakBeforeBraces: Custom -BraceWrapping: - AfterCaseLabel: false - AfterClass: false - AfterControlStatement: false - AfterEnum: false - AfterFunction: true - AfterNamespace: false - AfterObjCDeclaration: false - AfterStruct: false - AfterUnion: false - AfterExternBlock: false - BeforeCatch: false - BeforeElse: false - IndentBraces: false - SplitEmptyFunction: true - SplitEmptyRecord: true - SplitEmptyNamespace: true -BreakBeforeBinaryOperators: NonAssignment -BreakBeforeInheritanceComma: false -BreakInheritanceList: AfterColon -BreakBeforeTernaryOperators: true -BreakConstructorInitializersBeforeComma: false -BreakConstructorInitializers: BeforeColon -BreakAfterJavaFieldAnnotations: false -BreakStringLiterals: true -ColumnLimit: 100 -CommentPragmas: '^ IWYU pragma:' -CompactNamespaces: false -ConstructorInitializerAllOnOneLineOrOnePerLine: true -ConstructorInitializerIndentWidth: 4 -ContinuationIndentWidth: 3 -Cpp11BracedListStyle: true -DerivePointerAlignment: true -DisableFormat: false -ExperimentalAutoDetectBinPacking: false -FixNamespaceComments: true -ForEachMacros: - - foreach - - Q_FOREACH - - BOOST_FOREACH -IncludeBlocks: Regroup -IncludeCategories: - - Regex: '^' - Priority: 2 - - Regex: '^<.*\.h>' - Priority: 1 - - Regex: '^<.*' - Priority: 2 - - Regex: '.*' - Priority: 3 -IncludeIsMainRegex: '([-_](test|unittest))?$' -IndentCaseLabels: true -IndentPPDirectives: BeforeHash -IndentWidth: 3 -IndentWrappedFunctionNames: false -JavaScriptQuotes: Leave -JavaScriptWrapImports: true -KeepEmptyLinesAtTheStartOfBlocks: false -MacroBlockBegin: '' -MacroBlockEnd: '' -MaxEmptyLinesToKeep: 1 -NamespaceIndentation: None -ObjCBinPackProtocolList: Never -ObjCBlockIndentWidth: 2 -ObjCSpaceAfterProperty: false -ObjCSpaceBeforeProtocolList: true -PenaltyBreakAssignment: 1000 -PenaltyBreakBeforeFirstCallParameter: 0 -PenaltyBreakComment: 300 -PenaltyBreakFirstLessLess: 120 -PenaltyBreakString: 1000 -PenaltyBreakTemplateDeclaration: 10 -PenaltyExcessCharacter: 1000000 -PenaltyReturnTypeOnItsOwnLine: 200 +# clang-format file taken from: +# https://github.com/googleapis/google-cloud-cpp + +# Use the Google style in this project. +BasedOnStyle: Google + +# Some folks prefer to write "int& foo" while others prefer "int &foo". The +# Google Style Guide only asks for consistency within a project, we chose +# "int& foo" for this project: +DerivePointerAlignment: false PointerAlignment: Left + +# The Google Style Guide only asks for consistency w.r.t. "east const" vs. +# "const west" alignment of cv-qualifiers. In this project we use "east const". +QualifierAlignment: Right + +IncludeBlocks: Merge +IncludeCategories: + # Matches common headers first, but sorts them after project includes + - Regex: '^\"google/cloud/internal/disable_deprecation_warnings.inc\"$' + Priority: -1 + - Regex: '^\"google/cloud/(internal/|grpc_utils/|testing_util/|[^/]+\.h)' + Priority: 1000 + - Regex: '^\"google/cloud/' # project includes should sort first + Priority: 500 + - Regex: '^\"generator/' # project includes should sort first + Priority: 500 + - Regex: '^\"generator/internal/' # project internals second + Priority: 1000 + - Regex: '^\"generator/testing/' # testing helpers third + Priority: 1100 + - Regex: '^\"' # And then includes from other projects or the system + Priority: 1500 + - Regex: '^' + Priority: 4000 + - Regex: '^<[^/]*>' + Priority: 5000 + +# Format raw string literals with a `pb` or `proto` tag as proto. RawStringFormats: - - Language: Cpp - Delimiters: - - cc - - CC - - cpp - - Cpp - - CPP - - 'c++' - - 'C++' - CanonicalDelimiter: '' - BasedOnStyle: google - - Language: TextProto + - Language: TextProto Delimiters: - - pb - - PB - - proto - - PROTO - EnclosingFunctions: - - EqualsProto - - EquivToProto - - PARSE_PARTIAL_TEXT_PROTO - - PARSE_TEST_PROTO - - PARSE_TEXT_PROTO - - ParseTextOrDie - - ParseTextProtoOrDie - CanonicalDelimiter: '' - BasedOnStyle: google -ReflowComments: true -SortIncludes: true -SortUsingDeclarations: false -SpaceAfterCStyleCast: true -SpaceAfterLogicalNot: true -SpaceAfterTemplateKeyword: true -SpaceBeforeAssignmentOperators: true -SpaceBeforeCpp11BracedList: false -SpaceBeforeCtorInitializerColon: true -SpaceBeforeInheritanceColon: false -SpaceBeforeParens: Never -SpaceBeforeRangeBasedForLoopColon: true -SpaceInEmptyParentheses: false -SpacesBeforeTrailingComments: 2 -SpacesInAngles: true -SpacesInContainerLiterals: false -SpacesInCStyleCastParentheses: false -SpacesInParentheses: false -SpacesInSquareBrackets: false -Standard: Auto -StatementMacros: - - Q_UNUSED - - QT_REQUIRE_VERSION -TabWidth: 8 -UseTab: Never -... + - 'pb' + - 'proto' + BasedOnStyle: Google + +CommentPragmas: '(@copydoc|@copybrief|@see|@overload)' diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 092a50039b..e785a143e0 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -46,18 +46,10 @@ repos: - id: isort args: [ "--profile", "black" ] - - repo: https://github.com/google/pyink - rev: 23.3.0 - hooks: - - id: pyink - # It is recommended to specify the latest version of Python - # supported by your project here, or alternatively use - # pre-commit's default_language_version, see - # https://pre-commit.com/#top_level-default_language_version - language_version: python3 - types: [python] - -# # Format Python code +# # Format Python code with black +# black uses an uncompromisable 4-indent as the formatting basis of +# python files which clashes with google's pylint configuration. +# That's why we are using pyink instead which allows 2-indent. # - repo: https://github.com/psf/black # rev: 23.3.0 # hooks: @@ -65,6 +57,14 @@ repos: # language_version: python3 # types: [ python ] + # Format Python code with pyink + - repo: https://github.com/google/pyink + rev: 23.3.0 + hooks: + - id: pyink + language_version: python3 + types: [python] + # Clang-format the C++ part of the code base automatically - repo: https://github.com/pre-commit/mirrors-clang-format rev: "v16.0.3" @@ -80,6 +80,7 @@ repos: additional_dependencies: - pyyaml + # Lint python code with PyLint - repo: local hooks: - id: pylint diff --git a/pyproject.toml b/pyproject.toml index 4e914c37f8..e3191c4f44 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -11,23 +11,11 @@ requires-python = ">=3.7" authors = [ { name = "The OpenSpiel authors", email = "open_spiel@google.com" }, ] -dependencies = [ - "pip >= 20.0.2", - "attrs >= 19.3.0", - "absl-py >= 0.10.0", - "numpy >= 1.21.5", - "scipy >= 1.10.1" -] -dynamic = ["readme"] - -[project.urls] -homepage = "https://github.com/deepmind/open_spiel" - -[tool.setuptools] -zip-safe = false +dynamic = ["readme", "dependencies"] [tool.setuptools.dynamic] readme = { file = "README.md" } +dependencies = { file = "requirements.txt" } [project.optional-dependencies] dev = [ @@ -35,6 +23,13 @@ dev = [ "pylint" ] +[project.urls] +homepage = "https://github.com/deepmind/open_spiel" + +[tool.setuptools] +zip-safe = false + + [tool.setuptools.packages.find] where = ["."] include = ["open_spiel", "open_spiel.*"] From e2ed6280865790191e356c6be6165fca74cad65d Mon Sep 17 00:00:00 2001 From: Michael Aichmueller Date: Fri, 19 May 2023 11:49:08 +0200 Subject: [PATCH 7/8] let pyrpojecttoml define isort profile --- .pre-commit-config.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index e785a143e0..0bea622108 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -28,7 +28,7 @@ repos: - id: requirements-txt-fixer - id: trailing-whitespace - # Check for common mistakes + # Check for basic python "dont's" - repo: https://github.com/pre-commit/pygrep-hooks rev: "v1.10.0" hooks: @@ -44,7 +44,6 @@ repos: rev: "5.12.0" hooks: - id: isort - args: [ "--profile", "black" ] # # Format Python code with black # black uses an uncompromisable 4-indent as the formatting basis of From 82fa486ce83eee33a12d31a2999eec33e28ee2c0 Mon Sep 17 00:00:00 2001 From: Michael Aichmueller Date: Thu, 25 May 2023 11:43:22 +0200 Subject: [PATCH 8/8] add missing content type declaration to readme field --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index e3191c4f44..026feeea28 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -14,7 +14,7 @@ authors = [ dynamic = ["readme", "dependencies"] [tool.setuptools.dynamic] -readme = { file = "README.md" } +readme = { file = "README.md", content-type = "text/markdown"} dependencies = { file = "requirements.txt" } [project.optional-dependencies]