You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2026/08/02 19:15:04 UTC
(lucene) branch main updated: build: autofix python issues and ignore the rest
This is an automated email from the ASF dual-hosted git repository.
rmuir pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/lucene.git
The following commit(s) were added to refs/heads/main by this push:
new ec950c6e401 build: autofix python issues and ignore the rest
ec950c6e401 is described below
commit ec950c6e40176c76bf157210f4602d5a9f81796c
Author: Robert Muir <rm...@apache.org>
AuthorDate: Sun Aug 2 15:14:28 2026 -0400
build: autofix python issues and ignore the rest
Missed the stragglers outside of dev-tools.
---
.ruff.toml | 10 ++++++++++
gradle/regenerate/moman/createLevAutomata.py | 9 +++------
gradle/regenerate/packed/gen_BulkOperation.py | 7 +++----
.../lucene/backward_codecs/lucene101/gen_ForUtil.py | 20 ++++++++++----------
.../lucene/backward_codecs/lucene103/gen_ForUtil.py | 20 ++++++++++----------
.../lucene/backward_codecs/lucene90/gen_ForUtil.py | 10 +++++-----
.../lucene/backward_codecs/lucene912/gen_ForUtil.py | 20 ++++++++++----------
.../lucene/backward_codecs/lucene99/gen_ForUtil.py | 10 +++++-----
.../apache/lucene/codecs/lucene104/gen_ForUtil.py | 20 ++++++++++----------
.../org/apache/lucene/util/automaton/UTF32ToUTF8.py | 4 ++--
.../apache/lucene/util/packed/gen_BulkOperation.py | 7 +++----
.../org/apache/lucene/util/makeEuroparlLineFile.py | 6 +++---
12 files changed, 74 insertions(+), 69 deletions(-)
diff --git a/.ruff.toml b/.ruff.toml
new file mode 100644
index 00000000000..ee371857202
--- /dev/null
+++ b/.ruff.toml
@@ -0,0 +1,10 @@
+[lint]
+ignore = [
+ "B023", # Function definition does not bind loop variable
+ "EXE001", # Shebang is present but file is not executable
+ "RUF059", # Unpacked variable is never used
+ "RUF046", # Value being cast to `int` is already an integer
+ "SIM102", # Use a single `if` statement instead of nested `if` statements
+ "SIM115", # Use a context manager for opening files
+ "UP031", # use format specifiers instead of percent format
+]
diff --git a/gradle/regenerate/moman/createLevAutomata.py b/gradle/regenerate/moman/createLevAutomata.py
index 8be9a68a8fe..e5cc7120356 100644
--- a/gradle/regenerate/moman/createLevAutomata.py
+++ b/gradle/regenerate/moman/createLevAutomata.py
@@ -22,7 +22,6 @@ import math
import os
import sys
-
MODE = "array"
PACKED = True
WORD = 64
@@ -619,15 +618,13 @@ def unpack(data, index, bitsPerValue):
bitStart = int(bitLoc & (WORD - 1))
if bitStart + bitsPerValue <= WORD:
# not split
- return int(((data[dataLoc] >> bitStart) & MASKS[bitsPerValue - 1]))
+ return int((data[dataLoc] >> bitStart) & MASKS[bitsPerValue - 1])
else:
# split
part = WORD - bitStart
return int(
- (
- ((data[dataLoc] >> bitStart) & MASKS[part - 1])
- + ((data[1 + dataLoc] & MASKS[bitsPerValue - part - 1]) << part)
- )
+ ((data[dataLoc] >> bitStart) & MASKS[part - 1])
+ + ((data[1 + dataLoc] & MASKS[bitsPerValue - part - 1]) << part)
)
diff --git a/gradle/regenerate/packed/gen_BulkOperation.py b/gradle/regenerate/packed/gen_BulkOperation.py
index c3dbbca3bfb..79c1ce44766 100644
--- a/gradle/regenerate/packed/gen_BulkOperation.py
+++ b/gradle/regenerate/packed/gen_BulkOperation.py
@@ -102,8 +102,7 @@ def casts(typ):
def hexNoLSuffix(n):
# On 32 bit Python values > (1 << 31)-1 will have L appended by hex function:
s = hex(n)
- if s.endswith("L"):
- s = s[:-1]
+ s = s.removesuffix("L")
return s
@@ -200,7 +199,7 @@ def p64_decode(bpv, f, bits):
)
f.write(" }\n")
else:
- for i in range(0, values):
+ for i in range(values):
block_offset = i * bpv // 64
bit_offset = (i * bpv) % 64
if bit_offset == 0:
@@ -289,7 +288,7 @@ def p64_decode(bpv, f, bits):
f.write(" }\n")
else:
f.write(" for (int i = 0; i < iterations; ++i) {\n")
- for i in range(0, byte_values):
+ for i in range(byte_values):
byte_start = i * bpv // 8
bit_start = (i * bpv) % 8
byte_end = ((i + 1) * bpv - 1) // 8
diff --git a/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene101/gen_ForUtil.py b/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene101/gen_ForUtil.py
index 333e6d8b2a8..1ad07beecb9 100644
--- a/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene101/gen_ForUtil.py
+++ b/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene101/gen_ForUtil.py
@@ -320,11 +320,11 @@ def writeDecode(bpv, f):
if __name__ == "__main__":
f = open(OUTPUT_FILE, "w")
f.write(HEADER)
- for primitive_size in PRIMITIVE_SIZE:
- f.write(
- " static final int[] MASKS%d = new int[%d];\n"
- % (primitive_size, primitive_size)
- )
+ f.writelines(
+ " static final int[] MASKS%d = new int[%d];\n"
+ % (primitive_size, primitive_size)
+ for primitive_size in PRIMITIVE_SIZE
+ )
f.write("\n")
f.write(" static {\n")
for primitive_size in PRIMITIVE_SIZE:
@@ -337,11 +337,11 @@ if __name__ == "__main__":
// used when the idx is a variable
""")
for primitive_size in PRIMITIVE_SIZE:
- for bpv in range(1, min(MAX_SPECIALIZED_BITS_PER_VALUE + 1, primitive_size)):
- f.write(
- " static final int MASK%d_%d = MASKS%d[%d];\n"
- % (primitive_size, bpv, primitive_size, bpv)
- )
+ f.writelines(
+ " static final int MASK%d_%d = MASKS%d[%d];\n"
+ % (primitive_size, bpv, primitive_size, bpv)
+ for bpv in range(1, min(MAX_SPECIALIZED_BITS_PER_VALUE + 1, primitive_size))
+ )
f.write("""
/** Decode 128 integers into {@code ints}. */
diff --git a/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene103/gen_ForUtil.py b/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene103/gen_ForUtil.py
index e8498c32c59..8c0a199f87d 100644
--- a/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene103/gen_ForUtil.py
+++ b/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene103/gen_ForUtil.py
@@ -321,11 +321,11 @@ def writeDecode(bpv, f):
if __name__ == "__main__":
f = open(OUTPUT_FILE, "w")
f.write(HEADER)
- for primitive_size in PRIMITIVE_SIZE:
- f.write(
- " static final int[] MASKS%d = new int[%d];\n"
- % (primitive_size, primitive_size)
- )
+ f.writelines(
+ " static final int[] MASKS%d = new int[%d];\n"
+ % (primitive_size, primitive_size)
+ for primitive_size in PRIMITIVE_SIZE
+ )
f.write("\n")
f.write(" static {\n")
for primitive_size in PRIMITIVE_SIZE:
@@ -338,11 +338,11 @@ if __name__ == "__main__":
// used when the idx is a variable
""")
for primitive_size in PRIMITIVE_SIZE:
- for bpv in range(1, min(MAX_SPECIALIZED_BITS_PER_VALUE + 1, primitive_size)):
- f.write(
- " static final int MASK%d_%d = MASKS%d[%d];\n"
- % (primitive_size, bpv, primitive_size, bpv)
- )
+ f.writelines(
+ " static final int MASK%d_%d = MASKS%d[%d];\n"
+ % (primitive_size, bpv, primitive_size, bpv)
+ for bpv in range(1, min(MAX_SPECIALIZED_BITS_PER_VALUE + 1, primitive_size))
+ )
f.write("""
/** Decode 128 integers into {@code ints}. */
diff --git a/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene90/gen_ForUtil.py b/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene90/gen_ForUtil.py
index f91c7789710..ac76975258e 100644
--- a/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene90/gen_ForUtil.py
+++ b/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene90/gen_ForUtil.py
@@ -406,11 +406,11 @@ def writeDecode(bpv, f):
if __name__ == "__main__":
f = open(OUTPUT_FILE, "w")
f.write(HEADER)
- for primitive_size in PRIMITIVE_SIZE:
- f.write(
- " private static final long[] MASKS%d = new long[%d];\n"
- % (primitive_size, primitive_size)
- )
+ f.writelines(
+ " private static final long[] MASKS%d = new long[%d];\n"
+ % (primitive_size, primitive_size)
+ for primitive_size in PRIMITIVE_SIZE
+ )
f.write("\n")
f.write(" static {\n")
for primitive_size in PRIMITIVE_SIZE:
diff --git a/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene912/gen_ForUtil.py b/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene912/gen_ForUtil.py
index 0e296442275..77ba0a1cf48 100644
--- a/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene912/gen_ForUtil.py
+++ b/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene912/gen_ForUtil.py
@@ -364,11 +364,11 @@ def writeDecode(bpv, f):
if __name__ == "__main__":
f = open(OUTPUT_FILE, "w")
f.write(HEADER)
- for primitive_size in PRIMITIVE_SIZE:
- f.write(
- " static final long[] MASKS%d = new long[%d];\n"
- % (primitive_size, primitive_size)
- )
+ f.writelines(
+ " static final long[] MASKS%d = new long[%d];\n"
+ % (primitive_size, primitive_size)
+ for primitive_size in PRIMITIVE_SIZE
+ )
f.write("\n")
f.write(" static {\n")
for primitive_size in PRIMITIVE_SIZE:
@@ -381,11 +381,11 @@ if __name__ == "__main__":
// used when the idx is a variable
""")
for primitive_size in PRIMITIVE_SIZE:
- for bpv in range(1, min(MAX_SPECIALIZED_BITS_PER_VALUE + 1, primitive_size)):
- f.write(
- " static final long MASK%d_%d = MASKS%d[%d];\n"
- % (primitive_size, bpv, primitive_size, bpv)
- )
+ f.writelines(
+ " static final long MASK%d_%d = MASKS%d[%d];\n"
+ % (primitive_size, bpv, primitive_size, bpv)
+ for bpv in range(1, min(MAX_SPECIALIZED_BITS_PER_VALUE + 1, primitive_size))
+ )
f.write("""
/** Decode 128 integers into {@code longs}. */
diff --git a/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene99/gen_ForUtil.py b/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene99/gen_ForUtil.py
index da914ae31ea..b48ca79e6ab 100644
--- a/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene99/gen_ForUtil.py
+++ b/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene99/gen_ForUtil.py
@@ -494,11 +494,11 @@ def writeDecode(bpv, f):
if __name__ == "__main__":
f = open(OUTPUT_FILE, "w")
f.write(HEADER)
- for primitive_size in PRIMITIVE_SIZE:
- f.write(
- " private static final long[] MASKS%d = new long[%d];\n"
- % (primitive_size, primitive_size)
- )
+ f.writelines(
+ " private static final long[] MASKS%d = new long[%d];\n"
+ % (primitive_size, primitive_size)
+ for primitive_size in PRIMITIVE_SIZE
+ )
f.write("\n")
f.write(" static {\n")
for primitive_size in PRIMITIVE_SIZE:
diff --git a/lucene/core/src/java/org/apache/lucene/codecs/lucene104/gen_ForUtil.py b/lucene/core/src/java/org/apache/lucene/codecs/lucene104/gen_ForUtil.py
index f3a5098ec3f..2841eb2f24c 100644
--- a/lucene/core/src/java/org/apache/lucene/codecs/lucene104/gen_ForUtil.py
+++ b/lucene/core/src/java/org/apache/lucene/codecs/lucene104/gen_ForUtil.py
@@ -317,11 +317,11 @@ def writeDecode(bpv, f):
if __name__ == "__main__":
f = open(OUTPUT_FILE, "w")
f.write(HEADER)
- for primitive_size in PRIMITIVE_SIZE:
- f.write(
- " static final int[] MASKS%d = new int[%d];\n"
- % (primitive_size, primitive_size)
- )
+ f.writelines(
+ " static final int[] MASKS%d = new int[%d];\n"
+ % (primitive_size, primitive_size)
+ for primitive_size in PRIMITIVE_SIZE
+ )
f.write("\n")
f.write(" static {\n")
for primitive_size in PRIMITIVE_SIZE:
@@ -334,11 +334,11 @@ if __name__ == "__main__":
// used when the idx is a variable
""")
for primitive_size in PRIMITIVE_SIZE:
- for bpv in range(1, min(MAX_SPECIALIZED_BITS_PER_VALUE + 1, primitive_size)):
- f.write(
- " static final int MASK%d_%d = MASKS%d[%d];\n"
- % (primitive_size, bpv, primitive_size, bpv)
- )
+ f.writelines(
+ " static final int MASK%d_%d = MASKS%d[%d];\n"
+ % (primitive_size, bpv, primitive_size, bpv)
+ for bpv in range(1, min(MAX_SPECIALIZED_BITS_PER_VALUE + 1, primitive_size))
+ )
f.write("""
/** Decode 256 integers into {@code ints}. */
diff --git a/lucene/core/src/java/org/apache/lucene/util/automaton/UTF32ToUTF8.py b/lucene/core/src/java/org/apache/lucene/util/automaton/UTF32ToUTF8.py
index d789ca5d427..4616aa8b1aa 100644
--- a/lucene/core/src/java/org/apache/lucene/util/automaton/UTF32ToUTF8.py
+++ b/lucene/core/src/java/org/apache/lucene/util/automaton/UTF32ToUTF8.py
@@ -13,10 +13,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-import types
import os
-import sys
import random
+import sys
+import types
MAX_UNICODE = 0x10FFFF
diff --git a/lucene/core/src/java/org/apache/lucene/util/packed/gen_BulkOperation.py b/lucene/core/src/java/org/apache/lucene/util/packed/gen_BulkOperation.py
index b4130322b6f..f911ee2cab2 100644
--- a/lucene/core/src/java/org/apache/lucene/util/packed/gen_BulkOperation.py
+++ b/lucene/core/src/java/org/apache/lucene/util/packed/gen_BulkOperation.py
@@ -102,8 +102,7 @@ def casts(typ):
def hexNoLSuffix(n):
# On 32 bit Python values > (1 << 31)-1 will have L appended by hex function:
s = hex(n)
- if s.endswith("L"):
- s = s[:-1]
+ s = s.removesuffix("L")
return s
@@ -200,7 +199,7 @@ def p64_decode(bpv, f, bits):
)
f.write(" }\n")
else:
- for i in range(0, values):
+ for i in range(values):
block_offset = i * bpv // 64
bit_offset = (i * bpv) % 64
if bit_offset == 0:
@@ -289,7 +288,7 @@ def p64_decode(bpv, f, bits):
f.write(" }\n")
else:
f.write(" for (int i = 0; i < iterations; ++i) {\n")
- for i in range(0, byte_values):
+ for i in range(byte_values):
byte_start = i * bpv // 8
bit_start = (i * bpv) % 8
byte_end = ((i + 1) * bpv - 1) // 8
diff --git a/lucene/core/src/test/org/apache/lucene/util/makeEuroparlLineFile.py b/lucene/core/src/test/org/apache/lucene/util/makeEuroparlLineFile.py
index 41dc3c5b89c..d2dfd744626 100644
--- a/lucene/core/src/test/org/apache/lucene/util/makeEuroparlLineFile.py
+++ b/lucene/core/src/test/org/apache/lucene/util/makeEuroparlLineFile.py
@@ -13,11 +13,11 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-import sys
-import glob
import datetime
-import tarfile
+import glob
import re
+import sys
+import tarfile
try:
sys.argv.remove("-verbose")