Merge remote-tracking branch 'origin/master' into AdamGleave/remove-m…

…ujoco-dependency
HumanCompatibleAI · Oct 5, 2023 · e14c27a · e14c27a
2 parents 79385c3 + cd76326
commit e14c27a
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -358,7 +358,10 @@ jobs:
           name: run tests
           command: |
             source ~/venv/bin/activate
-            TESTFILES=$(circleci tests glob tests/**/test*.py | circleci tests split --split-by=timings)
+            ALL_TESTFILES=$(circleci tests glob "tests/**/test*.py")
+            echo "All testfiles: ${ALL_TESTFILES}"
+            TESTFILES=$(circleci tests glob "tests/**/test*.py" | circleci tests split --split-by=timings)
+            echo "This shard testing: ${TESTFILES}"
             pytest -n auto --junitxml=/tmp/test-reports/junit.xml -vv $TESTFILES
 
       - save-pytest-cache

diff --git a/docs/requirements.txt b/docs/requirements.txt
diff --git a/readthedocs.yml b/readthedocs.yml
@@ -12,8 +12,6 @@ build:
 
 python:
   install:
-    # TODO(GH#707): remove docs/requirements.txt once Gym upgraded
-    - requirements: docs/requirements.txt
     - method: pip
       path: .
       extra_requirements:

diff --git a/tests/util/test_wb_logger.py b/tests/util/test_wb_logger.py
@@ -122,4 +122,4 @@ def test_wandb_module_import_error():
         with pytest.raises(ModuleNotFoundError, match=r"Trying to log data.*"):
             logger.configure(format_strs=["wandb"])
     finally:
-        sys.modules[wandb] = wandb_module
+        sys.modules["wandb"] = wandb_module