Fix some parts of cron-ci workflow (RustPython#6724)

moreal · claude · youknowone · terryluan12 · commit ffc0d8a9a713 · 2026-01-14T19:15:52.000-05:00
* Use shared PYTHON_VERSION in cron-ci benchmark job * Correct extra-tests/jsontests.py script When the `extra_tests/jsontests.py` script was added, it was presumably during the time when Python versions 3.5 to 3.8 were in use. At that time, `test.libregrtest.runtest` was a valid path, but from CPython version 3.11 onwards, the path changed to `test.libregrtest.findtests`. * Use ssl-rustls feature instead of ssl in cron-ci workflow Replace the ssl feature with ssl-rustls in both the CARGO_ARGS environment variable and the cargo-llvm-cov test command to fix the cron-ci workflow. Since 1a783fc, it is disallowed to use ssl manually. * Replace inspect.getargspec with inspect.getfullargspec in custom_text_test_runner inspect.getargspec() was removed in Python 3.11, causing jsontests.py to fail with "TypeError: 'NoneType' object is not iterable" when running on RustPython (which targets Python 3.13). The get_function_args() function was silently catching the AttributeError and returning None, which then caused the error in store_class_fields() when trying to iterate over None. > https://docs.python.org/3/whatsnew/3.11.html > The getargspec() function, deprecated since Python 3.0; use > inspect.signature() or inspect.getfullargspec() instead. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * Exclude rustpython-venvlauncher in cron-ci workflow Since rustpython-venvlauncher is Windows-only, it disables the project in the cron-ci workflow. * Apply suggestion from @fanninpm Co-authored-by: fanninpm <luxverdans@sbcglobal.net> * Trigger cron-ci workflow in pull_request --------- Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com> Co-authored-by: Jeong, YunWon <69878+youknowone@users.noreply.github.com> Co-authored-by: fanninpm <luxverdans@sbcglobal.net>
diff --git a/.github/workflows/cron-ci.yaml b/.github/workflows/cron-ci.yaml
@@ -5,11 +5,14 @@ on:
   push:
     paths:
       - .github/workflows/cron-ci.yaml
+  pull_request:
+    paths:
+      - .github/workflows/cron-ci.yaml
 
 name: Periodic checks/tasks
 
 env:
-  CARGO_ARGS: --no-default-features --features stdlib,importlib,encodings,ssl,jit
+  CARGO_ARGS: --no-default-features --features stdlib,importlib,encodings,ssl-rustls,jit
   PYTHON_VERSION: "3.13.1"
 
 jobs:
@@ -29,7 +32,7 @@ jobs:
           python-version: ${{ env.PYTHON_VERSION }}
       - run: sudo apt-get update && sudo apt-get -y install lcov
       - name: Run cargo-llvm-cov with Rust tests.
-        run: cargo llvm-cov --no-report --workspace --exclude rustpython_wasm --verbose --no-default-features --features stdlib,importlib,encodings,ssl,jit
+        run: cargo llvm-cov --no-report --workspace --exclude rustpython_wasm --exclude rustpython-compiler-source --exclude rustpython-venvlauncher --verbose --no-default-features --features stdlib,importlib,encodings,ssl-rustls,jit
       - name: Run cargo-llvm-cov with Python snippets.
         run: python scripts/cargo-llvm-cov.py
         continue-on-error: true
@@ -39,6 +42,7 @@ jobs:
       - name: Prepare code coverage data
         run: cargo llvm-cov report --lcov --output-path='codecov.lcov'
       - name: Upload to Codecov
+        if: ${{ github.event_name != 'pull_request' }}
         uses: codecov/codecov-action@v5
         with:
           file: ./codecov.lcov
@@ -58,6 +62,7 @@ jobs:
         env:
           RUSTPYTHONPATH: ${{ github.workspace }}/Lib
       - name: upload tests data to the website
+        if: ${{ github.event_name != 'pull_request' }}
         env:
           SSHKEY: ${{ secrets.ACTIONS_TESTS_DATA_DEPLOY_KEY }}
           GITHUB_ACTOR: ${{ github.actor }}
@@ -94,6 +99,7 @@ jobs:
         env:
           RUSTPYTHONPATH: ${{ github.workspace }}/Lib
       - name: Upload data to the website
+        if: ${{ github.event_name != 'pull_request' }}
         env:
           SSHKEY: ${{ secrets.ACTIONS_TESTS_DATA_DEPLOY_KEY }}
           GITHUB_ACTOR: ${{ github.actor }}
@@ -141,7 +147,7 @@ jobs:
       - uses: dtolnay/rust-toolchain@stable
       - uses: actions/setup-python@v6.1.0
         with:
-          python-version: 3.9
+          python-version: ${{ env.PYTHON_VERSION }}
       - run: cargo install cargo-criterion
       - name: build benchmarks
         run: cargo build --release --benches
@@ -162,6 +168,7 @@ jobs:
           mv reports/* .
           rmdir reports
       - name: upload benchmark data to the website
+        if: ${{ github.event_name != 'pull_request' }}
         env:
           SSHKEY: ${{ secrets.ACTIONS_TESTS_DATA_DEPLOY_KEY }}
         run: |
diff --git a/extra_tests/custom_text_test_runner.py b/extra_tests/custom_text_test_runner.py
@@ -112,7 +112,7 @@ def __call__(self, data_list, totals=None):
 
 def get_function_args(func_ref):
     try:
-        return [p for p in inspect.getargspec(func_ref).args if p != "self"]
+        return [p for p in inspect.getfullargspec(func_ref).args if p != "self"]
     except:
         return None
 
diff --git a/extra_tests/jsontests.py b/extra_tests/jsontests.py
@@ -2,7 +2,7 @@
 import unittest
 
 from custom_text_test_runner import CustomTextTestRunner as Runner
-from test.libregrtest.runtest import findtests
+from test.libregrtest.findtests import findtests
 
 testnames = findtests()
 # idk why this fixes the hanging, if it does
