Merge remote-tracking branch 'upstream/develop' into pathsec

Author: ekaf

.github/workflows/retest-pr.yml

@@ -0,0 +1,71 @@
+name: Retest PR
+
+on:
+  issue_comment:
+    types: [created]
+
+env:
+  FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
+
+jobs:
+  retest:
+    if: github.event.issue.pull_request && contains(github.event.comment.body, 'retest')
+    runs-on: ubuntu-latest
+    permissions:
+      actions: write
+      issues: write
+      pull-requests: read
+    steps:
+      - name: Check authorization and trigger phrase
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const assoc = context.payload.comment.author_association;
+            if (!['OWNER', 'MEMBER', 'COLLABORATOR'].includes(assoc)) {
+              core.setFailed('Not authorized (association: ' + assoc + ')');
+              return;
+            }
+            const body = context.payload.comment.body;
+            if (!body.includes('/retest') &&
+                !body.includes('[CI: retest]') &&
+                !body.includes('[ci: retest]')) {
+              core.setFailed('No recognized retest trigger found.');
+            }
+
+      - name: Get PR head SHA
+        id: pr
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const pr = (await github.rest.pulls.get({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              pull_number: context.issue.number,
+            })).data;
+            core.setOutput('sha', pr.head.sha);
+
+      - name: Re-run CI
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const runs = await github.rest.actions.listWorkflowRuns({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              workflow_id: 'ci.yml',
+              head_sha: '${{ steps.pr.outputs.sha }}',
+              per_page: 1,
+            });
+            if (runs.data.workflow_runs.length === 0) {
+              core.setFailed('No CI run found for this PR head SHA.');
+              return;
+            }
+            const run = runs.data.workflow_runs[0];
+            if (run.status === 'completed') {
+              await github.rest.actions.reRunWorkflow({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                run_id: run.id,
+              });
+            } else {
+              core.info('CI is already running (status: ' + run.status + '). Nothing to re-run.');
+            }

.github/workflows/retest.yml

@@ -8,23 +8,21 @@ repos:
       - id: requirements-txt-fixer
       - id: check-yaml
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.21.1
+    rev: v3.21.2
     hooks:
     - id: pyupgrade
-      args: ["--py38-plus"]
-  - repo: https://github.com/ambv/black
-    rev: 25.9.0
+      args: ["--py310-plus"]
+  - repo: https://github.com/psf/black
+    rev: 25.11.0
     hooks:
     - id: black
-  - repo: local
+  - repo: https://github.com/pycqa/isort
+    rev: 6.1.0
     hooks:
-      - id: isort
-        name: isort
-        entry: isort
-        require_serial: true
-        language: python
-        language_version: python3
-        types_or: [cython, pyi, python]
-        args: ['--filter-files']
-        minimum_pre_commit_version: '2.9.2'
-        additional_dependencies: ['isort==6.0.1']
+    - id: isort
+      args: ['--filter-files']
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.15.6
+    hooks:
+    - id: ruff
+      args: [--fix]

.pre-commit-config.yaml

@@ -611,7 +611,7 @@ def _synset_relations(word, synset, synset_relations):
     :rtype: str
     """
 
-    if not synset.name() in synset_relations:
+    if synset.name() not in synset_relations:
         return ""
     ref = Reference(word, synset_relations)
 

nltk/app/wordnet_app.py

@@ -110,7 +110,7 @@ def can_combine(self, function, argument):
         if not function.is_function():
             return False
 
-        return not function.arg().can_unify(argument) is None
+        return function.arg().can_unify(argument) is not None
 
     def combine(self, function, argument):
         if not function.is_function():
@@ -158,7 +158,7 @@ def can_combine(self, function, argument):
         if not (function.is_function() and argument.is_function()):
             return False
         if function.dir().can_compose() and argument.dir().can_compose():
-            return not function.arg().can_unify(argument.res()) is None
+            return function.arg().can_unify(argument.res()) is not None
         return False
 
     def combine(self, function, argument):

nltk/ccg/combinator.py

@@ -307,7 +307,7 @@ def cmp_chunks(correct, guessed):
         if ct == gt == "O":
             if not ellipsis:
                 print(f"  {ct:15} {gt:15} {w}")
-                print("  {:15} {:15} {2}".format("...", "...", "..."))
+                print("  {:15} {:15} {}".format("...", "...", "..."))
                 ellipsis = True
         else:
             ellipsis = False
@@ -323,7 +323,6 @@ class Maxent_NE_Chunker(NEChunkParser):
     """
 
     def __init__(self, fmt="multiclass"):
-        from nltk.data import find
 
         self._fmt = fmt
         self._tab_dir = find(f"chunkers/maxent_ne_chunker_tab/english_ace_{fmt}/")

nltk/chunk/named_entity.py

@@ -272,7 +272,7 @@ def partial_names_demo(trainer, features=names_demo_features):
         print()
         print("Unseen Names      P(Male)  P(Female)\n" + "-" * 40)
         for (name, is_male), pdist in zip(test, pdists)[:5]:
-            if is_male == True:
+            if is_male:
                 fmt = "  %-15s *%6.4f   %6.4f"
             else:
                 fmt = "  %-15s  %6.4f  *%6.4f"

nltk/classify/util.py

@@ -417,7 +417,8 @@ def iterate_from(self, index):
                 for iterator in iterators:
                     try:
                         elements.append(next(iterator))
-                    except:  # FIXME: What is this except really catching? StopIteration?
+                    # FIXME: What is this except really catching? StopIteration?
+                    except StopIteration:
                         elements.append(None)
                 if elements == [None] * len(self._lists):
                     return

nltk/collections.py

@@ -39,7 +39,6 @@
     QuadgramAssocMeasures,
     TrigramAssocMeasures,
 )
-from nltk.metrics.spearman import ranks_from_scores, spearman_correlation
 from nltk.probability import FreqDist
 from nltk.util import ngrams
 

nltk/collocations.py

@@ -440,7 +440,7 @@ def _get_words(
                     # relational
                     # the gold standard is stored in
                     # <mor></mor><mor type="trn"><gra type="grt">
-                    if relation == True:
+                    if relation:
                         for xmlstem_rel in xmlword.findall(
                             f".//{{{NS}}}mor/{{{NS}}}gra"
                         ):