From ddcb0c48933ea4585a587216fd16c40d6a82ec18 Mon Sep 17 00:00:00 2001 From: Adam Liddell Date: Fri, 24 Nov 2023 16:38:36 +0000 Subject: [PATCH] Replace pylint+flake8 etc with ruff --- .flake8 | 20 -- .github/workflows/ci.yml | 10 +- noxfile.py | 18 +- pylintrc | 510 --------------------------------------- ruff.toml | 51 ++++ s2cell/__init__.py | 2 +- s2cell/s2cell.py | 44 ++-- setup.py | 4 +- tests/test_s2cell.py | 2 +- 9 files changed, 82 insertions(+), 579 deletions(-) delete mode 100644 .flake8 delete mode 100644 pylintrc create mode 100644 ruff.toml diff --git a/.flake8 b/.flake8 deleted file mode 100644 index dd7c888..0000000 --- a/.flake8 +++ /dev/null @@ -1,20 +0,0 @@ -[flake8] -max-line-length = 100 -ignore = - # Ignore line break before binary operator - W503, -per-file-ignores = - __init__.py: - # Ignore unused imports in __init__.py files - F401, - # Ignore 'from module import *' in __init__.py files - F403, - test_*.py: - # Ignore line too long in tests - E501, - # Ignore pydocstyle in tests - D100,D101,D102,D103 - conftest.py: - # Ignore line too long in tests setup - E501, -exclude = .ipynb_checkpoints diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fa2328e..7af9576 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ jobs: strategy: matrix: os: [macos-latest, ubuntu-latest, windows-latest] - python-version: [3.9, '3.10', '3.11', '3.12'] + python-version: ['3.9', '3.10', '3.11', '3.12'] steps: - uses: actions/checkout@v4 @@ -40,9 +40,5 @@ jobs: python-version: '3.11' - name: Install nox run: pip install nox - - name: Run flake8 - run: nox -s flake8 - - name: Run pylint - run: nox -s pylint - - name: Run pydocstyle - run: nox -s pydocstyle + - name: Run Ruff + run: nox -s ruff diff --git a/noxfile.py b/noxfile.py index 9cad0d2..01d7890 100644 --- a/noxfile.py +++ b/noxfile.py @@ -3,7 +3,7 @@ nox.options.error_on_external_run = True nox.options.reuse_existing_virtualenvs = True -nox.options.sessions = ['coverage', 'docs', 'flake8', 'pylint', 'pydocstyle'] +nox.options.sessions = ['coverage', 'docs', 'ruff'] @nox.session() @@ -15,19 +15,9 @@ def coverage(session): ) @nox.session() -def flake8(session): - session.install('-e', '.[dev]') - session.run('flake8', 's2cell', 'tests', *session.posargs) - -@nox.session() -def pylint(session): - session.install('-e', '.[dev]') - session.run('pylint', 's2cell', *session.posargs) - -@nox.session() -def pydocstyle(session): - session.install('-e', '.[dev]') - session.run('pydocstyle', 's2cell', *session.posargs) +def ruff(session): + session.install('.[dev]') + session.run('ruff', 'check', 's2cell', 'tests', *session.posargs) @nox.session() def test(session): diff --git a/pylintrc b/pylintrc deleted file mode 100644 index c27656e..0000000 --- a/pylintrc +++ /dev/null @@ -1,510 +0,0 @@ -[MASTER] - -# 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= - -# Specify a score threshold to be exceeded before program exits with error. -fail-under=10.0 - -# Add files or directories to the blacklist. 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. -ignore-patterns= - -# Python code to execute, usually for sys.path manipulation such as -# pygtk.require(). -#init-hook= - -# Use multiple processes to speed up Pylint. Specifying 0 will auto-detect the -# number of processors available to use. -jobs=0 - -# 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= - -# 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 - - -[MESSAGES CONTROL] - -# Only show warnings with the listed confidence levels. Leave empty to show -# all. Valid levels: HIGH, INFERENCE, INFERENCE_FAILURE, UNDEFINED. -confidence= - -# 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=consider-using-f-string - -# 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] - -# 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 - -# Tells whether to display a full report or only the messages. -reports=no - -# Activate the evaluation score. -score=yes - - -[REFACTORING] - -# Maximum number of nested blocks for function / method body -max-nested-blocks=5 - -# Complete name of functions that never returns. When checking for -# inconsistent-return-statements if a never returning function is called then -# it will be considered as an explicit return statement and no message will be -# printed. -never-returning-functions=sys.exit - - -[SPELLING] - -# Limits count of emitted suggestions for spelling mistakes. -max-spelling-suggestions=4 - -# Spelling dictionary name. Available dictionaries: none. To make it work, -# install the 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 the private dictionary; one word per line. -spelling-private-dict-file= - -# 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 - - -[VARIABLES] - -# 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 - -# List of strings which can identify a callback function by name. A callback -# name must start or end with one of those strings. -callbacks=cb_, - _cb - -# A regular expression matching the name of dummy variables (i.e. expected to -# not be used). -dummy-variables-rgx=_+$|(_[a-zA-Z0-9_]*[a-zA-Z0-9]+?$)|dummy|^ignored_|^unused_ - -# Argument names that match this expression will be ignored. Default to name -# with leading underscore. -ignored-argument-names=_.*|^ignored_|^unused_ - -# Tells whether we should check for unused import in __init__ files. -init-import=no - -# List of qualified module names which can have objects that can redefine -# builtins. -redefining-builtins-modules=six.moves,past.builtins,future.builtins,builtins,io - - -[LOGGING] - -# The type of string formatting that logging methods do. `old` means using % -# formatting, `new` is for `{}` formatting. -logging-format-style=old - -# Logging modules to check that the string format arguments are in logging -# function parameter format. -logging-modules=logging - - -[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 - -# This flag controls whether the implicit-str-concat should generate a warning -# on implicit string concatenation in sequences defined over several lines. -check-str-concat-over-line-jumps=no - - -[TYPECHECK] - -# List of decorators that produce context managers, such as -# contextlib.contextmanager. Add to this list to register other decorators that -# produce valid context managers. -contextmanager-decorators=contextlib.contextmanager - -# List of members which are set dynamically and missed by pylint inference -# system, and so shouldn't trigger E1101 when accessed. Python regular -# expressions are accepted. -generated-members= - -# Tells whether 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 - -# Tells whether to warn about missing members when the owner of the attribute -# is inferred to be None. -ignore-none=yes - -# This flag controls whether pylint should warn about no-member and similar -# checks whenever an opaque object is returned when inferring. The inference -# can return multiple potential results while evaluating a Python object, but -# some branches might not be evaluated, which results in partial inference. In -# that case, it might be useful to still emit no-member and other checks for -# the rest of the inferred objects. -ignore-on-opaque-inference=yes - -# List of 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 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= - -# 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 - -# The minimum edit distance a name should have in order to be considered a -# similar match for a missing member name. -missing-member-hint-distance=1 - -# The total number of similar names that should be taken in consideration when -# showing a hint for a missing member. -missing-member-max-choices=1 - -# List of decorators that change the signature of a decorated function. -signature-mutators= - - -[BASIC] - -# Naming style matching correct argument names. -argument-naming-style=snake_case - -# Regular expression matching correct argument names. Overrides argument- -# naming-style. -#argument-rgx= - -# Naming style matching correct attribute names. -attr-naming-style=snake_case - -# Regular expression matching correct attribute names. Overrides attr-naming- -# style. -#attr-rgx= - -# Bad variable names which should always be refused, separated by a comma. -bad-names=foo, - bar, - baz, - toto, - tutu, - tata - -# Bad variable names regexes, separated by a comma. If names match any regex, -# they will always be refused -bad-names-rgxs= - -# Naming style matching correct class attribute names. -class-attribute-naming-style=any - -# Regular expression matching correct class attribute names. Overrides class- -# attribute-naming-style. -#class-attribute-rgx= - -# Naming style matching correct class names. -class-naming-style=PascalCase - -# Regular expression matching correct class names. Overrides class-naming- -# style. -#class-rgx= - -# Naming style matching correct constant names. -const-naming-style=UPPER_CASE - -# Regular expression matching correct constant names. Overrides const-naming- -# style. -#const-rgx= - -# Minimum line length for functions/classes that require docstrings, shorter -# ones are exempt. -docstring-min-length=-1 - -# Naming style matching correct function names. -function-naming-style=snake_case - -# Regular expression matching correct function names. Overrides function- -# naming-style. -#function-rgx= - -# Good variable names which should always be accepted, separated by a comma. -good-names=i, - j, - k, - ex, - Run, - _ - -# Good variable names regexes, separated by a comma. If names match any regex, -# they will always be accepted -good-names-rgxs= - -# Include a hint for the correct naming format with invalid-name. -include-naming-hint=no - -# Naming style matching correct inline iteration names. -inlinevar-naming-style=any - -# Regular expression matching correct inline iteration names. Overrides -# inlinevar-naming-style. -#inlinevar-rgx= - -# Naming style matching correct method names. -method-naming-style=snake_case - -# Regular expression matching correct method names. Overrides method-naming- -# style. -#method-rgx= - -# Naming style matching correct module names. -module-naming-style=snake_case - -# Regular expression matching correct module names. Overrides module-naming- -# style. -#module-rgx= - -# Colon-delimited sets of names that determine each other's naming style when -# the name regexes allow several styles. -name-group= - -# Regular expression which should only match function or class names that do -# not require a docstring. -no-docstring-rgx=^_ - -# 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 - -# Naming style matching correct variable names. -variable-naming-style=snake_case - -# Regular expression matching correct variable names. Overrides variable- -# naming-style. -#variable-rgx= - - -[FORMAT] - -# Expected format of line ending, e.g. empty (any line ending), LF or CRLF. -expected-line-ending-format= - -# Regexp for a line that is allowed to be longer than the limit. -ignore-long-lines=^\s*(# )??$ - -# Number of spaces of indent required inside a hanging or continued line. -indent-after-paren=4 - -# String used as indentation unit. This is usually " " (4 spaces) or "\t" (1 -# tab). -indent-string=' ' - -# Maximum number of characters on a single line. -max-line-length=100 - -# Maximum number of lines in a module. -max-module-lines=1000 - -# 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 - - -[MISCELLANEOUS] - -# List of note tags to take in consideration, separated by a comma. -notes=FIXME, - XXX, - TODO - -# Regular expression of note tags to take in consideration. -#notes-rgx= - - -[SIMILARITIES] - -# Ignore comments when computing similarities. -ignore-comments=yes - -# Ignore docstrings when computing similarities. -ignore-docstrings=yes - -# Ignore imports when computing similarities. -ignore-imports=no - -# Minimum lines number of a similarity. -min-similarity-lines=4 - - -[IMPORTS] - -# List of modules that can be imported at any level, not just the top level -# one. -allow-any-import-level= - -# Allow wildcard imports from modules that define __all__. -allow-wildcard-with-all=no - -# 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). -ext-import-graph= - -# 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 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 - -# Couples of modules and preferred modules, separated by a comma. -preferred-modules= - - -[DESIGN] - -# Maximum number of arguments for function / method. -max-args=5 - -# 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=20 - -# 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 - - -[CLASSES] - -# 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 - - -[EXCEPTIONS] - -# Exceptions that will emit a warning when being caught. Defaults to -# "BaseException, Exception". -overgeneral-exceptions=BaseException, - Exception diff --git a/ruff.toml b/ruff.toml new file mode 100644 index 0000000..73be786 --- /dev/null +++ b/ruff.toml @@ -0,0 +1,51 @@ +line-length = 100 + +extend-select = [ + "E", "F", "B", "Q", "D", "N", "ASYNC", "BLE", "B", "A", "C4", "DTZ", "ISC", "T20", + "RSE", "RET", "SLF", "SLOT", "SIM", "TID", "ARG", "PTH", "NPY", "PERF", "LOG", "RUF", "W", +] +extend-ignore = [ + # Ignore 'Multi-line docstring summary should start at the first line' + "D212", + + # Allow elif after return/raise/continue + "RET505", "RET506", "RET507", + + # Allow 'return None' + "RET501", + + # Ignore warnings.warn missing stacklevel arg + "B028", +] + +extend-exclude = [".ipynb_checkpoints"] + +[extend-per-file-ignores] +"__init__.py" = ["F401"] # Ignore unused imports in __init__.py files +"test_*.py" = [ + # Ignore line too long in tests + "E501", + + # Ignore pydocstyle in tests + "D100", "D101", "D102", "D103", + + # Ignore use of assert in tests + "S101", + + # Allow tests to access private members + "SLF001", + + # Allow tests to have unused args + "ARG001", "ARG004", +] +"conftest.py" = ["E501"] # Ignore line too long in tests setup + +[pydocstyle] +convention = "google" + +[flake8-quotes] +inline-quotes = "single" +multiline-quotes = "single" + +[isort] +force-single-line = true # Match pre-commit behaviour diff --git a/s2cell/__init__.py b/s2cell/__init__.py index 072265f..5e11018 100644 --- a/s2cell/__init__.py +++ b/s2cell/__init__.py @@ -14,6 +14,6 @@ """Minimal Python S2 Geometry cell ID, token and lat/lon conversion library.""" -from .s2cell import * +from .s2cell import * # noqa: F403 __version__ = '1.7.1' diff --git a/s2cell/s2cell.py b/s2cell/s2cell.py index 35a1983..a6a9884 100644 --- a/s2cell/s2cell.py +++ b/s2cell/s2cell.py @@ -12,8 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -# pylint: disable=too-many-lines - """Minimal Python S2 Geometry cell ID, token and lat/lon conversion library.""" import math @@ -25,11 +23,11 @@ # s2cell exceptions # -class InvalidCellID(Exception): +class InvalidCellID(Exception): # noqa: N818 """Exception type for invalid cell IDs.""" -class InvalidToken(Exception): +class InvalidToken(Exception): # noqa: N818 """Exception type for invalid tokens.""" @@ -229,18 +227,18 @@ def _s2_xyz_to_face_uv(s2_point: Tuple[float, float, float]) -> Tuple[int, float # The negation of the the two components is then selected: # U: (face in [1, 2, 5]) ? -1: 1 # V: (face in [2, 4, 5])) ? -1: 1 - uv = ( # pylint: disable=invalid-name + uv = ( s2_point[1 - ((face + 1) >> 1)] / s2_point[face % 3], # U s2_point[2 - (face >> 1)] / s2_point[face % 3] # V ) if face in (1, 2, 5): - uv = (-uv[0], uv[1]) # Negate U # pylint: disable=invalid-name + uv = (-uv[0], uv[1]) # Negate U if face in (2, 4, 5): - uv = (uv[0], -uv[1]) # Negate V # pylint: disable=invalid-name + uv = (uv[0], -uv[1]) # Negate V return face, uv[0], uv[1] -def _s2_face_uv_to_xyz( # pylint: disable=invalid-name +def _s2_face_uv_to_xyz( face: int, uv: Tuple[float, float] ) -> Tuple[float, float, float]: """ @@ -299,7 +297,7 @@ def _s2_init_lookups() -> None: See s2geometry/blob/c59d0ca01ae3976db7f8abdc83fcc871a3a95186/src/s2/s2cell_id.cc#L75-L109 """ - global _S2_LOOKUP_POS, _S2_LOOKUP_IJ # pylint: disable=global-statement + global _S2_LOOKUP_POS, _S2_LOOKUP_IJ if _S2_LOOKUP_POS is None or _S2_LOOKUP_IJ is None: # pragma: no branch # Initialise empty lookup tables lookup_length = 1 << int(2 * _S2_LOOKUP_BITS + 2) # = 1024 @@ -314,7 +312,7 @@ def _s2_init_lookups() -> None: # the fastest since it does not reuse the common ancestor of neighbouring positions, but # is simpler to read for pos in range(4 ** 4): # 4 levels of sub-divisions - ij = 0 # Has pattern iiiijjjj, not ijijijij # pylint: disable=invalid-name + ij = 0 # Has pattern iiiijjjj, not ijijijij orientation = base_orientation # Walk the pairs of bits of pos, from most significant to least, getting IJ and @@ -326,7 +324,7 @@ def _s2_init_lookups() -> None: # Get the I and J for the sub-cell index. These need to be spread into iiiijjjj # by inserting as bit positions 4 and 0 ij_bits = _S2_POS_TO_IJ[orientation][bit_pair] - ij = ( # pylint: disable=invalid-name + ij = ( (ij << 1) # Free up position 4 and 0 from old IJ | ((ij_bits & 2) << 3) # I bit in position 4 | (ij_bits & 1) # J bit in position 0 @@ -336,7 +334,7 @@ def _s2_init_lookups() -> None: orientation = orientation ^ _S2_POS_TO_ORIENTATION_MASK[bit_pair] # Shift IJ and position to allow orientation bits in LSBs of lookup - ij <<= 2 # pylint: disable=invalid-name + ij <<= 2 pos <<= 2 # Write lookups @@ -501,7 +499,7 @@ def _s2_face_ij_to_cell_id(face: int, i: int, j: int, level: int) -> int: least_significant_bit_mask = 1 << (2 * (_S2_MAX_LEVEL - level)) cell_id = (cell_id & -least_significant_bit_mask) | least_significant_bit_mask - return cell_id + return cell_id # noqa: RET504 def _s2_face_ij_to_wrapped_cell_id(face: int, i: int, j: int, level: int) -> int: @@ -624,7 +622,7 @@ def token_to_cell_id(token: str) -> int: # Encode functions # -def lat_lon_to_cell_id( # pylint: disable=too-many-locals +def lat_lon_to_cell_id( lat: float, lon: float, level: int = 30 ) -> int: """ @@ -667,11 +665,11 @@ def lat_lon_to_cell_id( # pylint: disable=too-many-locals # Project cube-space UV to cell-space ST # See s2geometry/blob/2c02e21040e0b82aa5719e96033d02b8ce7c0eff/src/s2/s2coords.h#L317-L320 - s, t = _s2_uv_to_st(u), _s2_uv_to_st(v) # pylint: disable=invalid-name + s, t = _s2_uv_to_st(u), _s2_uv_to_st(v) # Convert ST to IJ integers # See s2geometry/blob/2c02e21040e0b82aa5719e96033d02b8ce7c0eff/src/s2/s2coords.h#L333-L336 - i, j = (_s2_st_to_ij(s), _s2_st_to_ij(t)) # pylint: disable=invalid-name + i, j = (_s2_st_to_ij(s), _s2_st_to_ij(t)) return _s2_face_ij_to_cell_id(face, i, j, level) @@ -707,7 +705,7 @@ def lat_lon_to_token(lat: float, lon: float, level: int = 30) -> str: # Decode functions # -def cell_id_to_lat_lon( # pylint: disable=too-many-locals +def cell_id_to_lat_lon( cell_id: int ) -> Tuple[float, float]: """ @@ -741,16 +739,16 @@ def cell_id_to_lat_lon( # pylint: disable=too-many-locals is_leaf = bool(cell_id & 1) # Cell is leaf cell when trailing one bit is in LSB apply_correction = not is_leaf and ((i ^ (cell_id >> 2)) & 1) correction_delta = 1 if is_leaf else (2 if apply_correction else 0) - si = (i << 1) + correction_delta # pylint: disable=invalid-name - ti = (j << 1) + correction_delta # pylint: disable=invalid-name + si = (i << 1) + correction_delta + ti = (j << 1) + correction_delta # Convert integer si/ti to double ST # See s2geometry/blob/c59d0ca01ae3976db7f8abdc83fcc871a3a95186/src/s2/s2coords.h#L338-L341 - st = (_s2_si_ti_to_st(si), _s2_si_ti_to_st(ti)) # pylint: disable=invalid-name + st = (_s2_si_ti_to_st(si), _s2_si_ti_to_st(ti)) # Project cell-space ST to cube-space UV # See s2geometry/blob/c59d0ca01ae3976db7f8abdc83fcc871a3a95186/src/s2/s2coords.h#L312-L315 - uv = (_s2_st_to_uv(st[0]), _s2_st_to_uv(st[1])) # pylint: disable=invalid-name + uv = (_s2_st_to_uv(st[0]), _s2_st_to_uv(st[1])) # Convert face + UV to S2Point XYZ # See s2geometry/blob/c59d0ca01ae3976db7f8abdc83fcc871a3a95186/src/s2/s2coords.h#L348-L357 @@ -874,7 +872,7 @@ def cell_id_is_valid(cell_id: int) -> bool: # Check trailing 1 bit is in one of the even bit positions allowed for the 30 levels, using the # mask: 0b0001010101010101010101010101010101010101010101010101010101010101 = 0x1555555555555555 - lowest_set_bit = cell_id & (~cell_id + 1) # pylint: disable=invalid-unary-operand-type + lowest_set_bit = cell_id & (~cell_id + 1) if not lowest_set_bit & 0x1555555555555555: return False @@ -1037,7 +1035,7 @@ def cell_id_to_parent_cell_id( least_significant_bit_mask = 1 << (2 * (_S2_MAX_LEVEL - level)) cell_id = (cell_id & -least_significant_bit_mask) | least_significant_bit_mask - return cell_id + return cell_id # noqa: RET504 def token_to_parent_token(token: str, level: Optional[int] = None) -> str: diff --git a/setup.py b/setup.py index 3c57524..55c29c9 100644 --- a/setup.py +++ b/setup.py @@ -32,15 +32,13 @@ install_requires=[], extras_require={ 'dev': [ - 'flake8~=6.1.0', 'furo==2023.9.10', 'nox~=2023.4.22', - 'pydocstyle~=6.3.0', - 'pylint~=3.0.2', 'pytest~=7.4.3', 'pytest-cov~=4.1.0', 'pytest-instafail~=0.5.0', 'pytest-xdist~=3.3.1', + 'ruff~=0.1.6', 'Sphinx~=7.2.6', 'sphinx-notfound-page~=1.0.0', 'sphinx-sitemap==2.5.1', diff --git a/tests/test_s2cell.py b/tests/test_s2cell.py index 313435a..d9b0ca1 100644 --- a/tests/test_s2cell.py +++ b/tests/test_s2cell.py @@ -209,7 +209,7 @@ def test_invalid_cell_id_to_level(): with pytest.raises(TypeError, match=re.escape("Cannot decode S2 cell ID from type: ")): s2cell.cell_id_to_level(1.0) - with pytest.raises(s2cell.InvalidCellID, match=re.escape("Cannot decode invalid S2 cell ID: 0")): + with pytest.raises(s2cell.InvalidCellID, match=re.escape('Cannot decode invalid S2 cell ID: 0')): s2cell.cell_id_to_level(0)