f ci

Author: alongd

.github/workflows/ci.yml

@@ -199,32 +199,14 @@ jobs:
           print("cuda?    :", torch.cuda.is_available())
           PYEOF
 
-      # The RitS adapter test file (arc/job/adapters/ts/rits_test.py) imports
-      # ARC modules; ARC needs to be importable from the rits_env runner. We
-      # do NOT install ARC into rits_env (it would conflict with the locked
-      # torch/PyG stack), instead we run pytest with PYTHONPATH pointed at
-      # the ARC checkout so the test discovers `import arc.*` cleanly.
+      # NOTE: We do NOT run rits_test.py from rits_env. ARC's import chain
+      # (arc/__init__ → arc.main → arc.job.ssh → paramiko → … → rmgpy)
+      # requires the full arc_env dependency tree, which cannot be installed
+      # into rits_env without risking torch/PyG version conflicts.
       #
-      # Tier-2 e2e tests are gated on `_rits_environment_ready()` which
-      # checks for RITS_PYTHON / RITS_REPO_PATH / RITS_CKPT_PATH. On the CI
-      # runner all three are present after install_rits.sh, so the e2e
-      # tests run; on a developer laptop without rits_env they auto-skip.
-      - name: Install pytest + ARC import dependencies into rits_env
-        shell: bash -el {0}
-        run: |
-          # rits_env carries the heavy ML stack (torch/PyG/megalodon) but not
-          # ARC's own deps. The test imports arc.* via PYTHONPATH, which
-          # triggers arc/__init__.py → arc.main → IPython, plus other light
-          # deps ARC expects at import time. Install the minimum subset here
-          # so the import chain resolves without pulling in the full arc_env.
-          micromamba run -n rits_env python -m pip install --quiet \
-            pytest ipython pyyaml numpy scipy matplotlib
-
-      - name: Run RitS adapter tests
-        shell: bash -el {0}
-        working-directory: ${{ github.workspace }}
-        env:
-          PYTHONPATH: ${{ github.workspace }}/ARC
-        run: |
-          micromamba run -n rits_env python -m pytest \
-            ARC/arc/job/adapters/ts/rits_test.py -v --no-header
+      # Instead, rits_test.py is collected by the main build-and-test lane's
+      # `pytest arc/` which runs from arc_env. Tier-1 tests (helpers,
+      # instantiation, dedup, parser) pass without rits_env. Tier-2 e2e
+      # tests auto-skip via @unittest.skipUnless(HAS_RITS) because rits_env
+      # is not present on the main lane's runner. Full e2e coverage runs on
+      # developer machines where both envs coexist.