Merge pull request #1 from TEParsons/main

Update from fork
psychopy · Apr 24, 2024 · 82c3ae4 · 82c3ae4
2 parents 843b2ab + bfe0529
commit 82c3ae4
Show file tree

Hide file tree

Showing 137 changed files with 356 additions and 840 deletions.
diff --git a/.github/.legacy/docs_md.yaml b/.github/.legacy/docs_md.yaml
diff --git a/.github/workflows/docs_sphinx.yaml → .github/workflows/docs.yaml b/.github/workflows/docs_sphinx.yaml → .github/workflows/docs.yaml
@@ -18,11 +18,11 @@ jobs:
 
     - name: Install package and dependencies
       run: |
-        python3 -m pip install -e .[docs-sphinx]
+        python3 -m pip install -e .[docs]
     
     - name: Build docs
       run: |
-        sphinx-build docs_sphinx docs -b dirhtml
+        sphinx-build docs_src docs -b dirhtml
     
     - name: Bypass Jekyll
       run: |

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -26,6 +26,27 @@ jobs:
     - name: Run tests
       run: |
         pytest
+  
+  windows-tests:
+    name: Run tests on Windows
+    runs-on: windows-latest
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+
+    - name: Set up Python
+      uses: actions/setup-python@v4
+      with:
+        python-version: "3.10"
+
+    - name: Install package and dependencies
+      run: |
+        python3 -m pip install -e .[tests]
+    
+    - name: Run tests
+      run: |
+        pytest
     
   linux-tests:
     name: Run tests on Linux

diff --git a/.gitignore b/.gitignore
@@ -11,6 +11,7 @@ __pycache__
 .idea
 .code-profile
 .vscode
+*.code-workspace
 # PIP
 .pdm-build
 *.egg-info
diff --git a/docs_mkdocs/SUMMARY.md b/docs_mkdocs/SUMMARY.md
diff --git a/docs_mkdocs/api/components/exampleComponent/index.md b/docs_mkdocs/api/components/exampleComponent/index.md
diff --git a/docs_mkdocs/api/components/index.md b/docs_mkdocs/api/components/index.md
diff --git a/docs_mkdocs/api/hardware/exampleDevice.md b/docs_mkdocs/api/hardware/exampleDevice.md
diff --git a/docs_mkdocs/api/hardware/exampleResponseDevice.md b/docs_mkdocs/api/hardware/exampleResponseDevice.md
diff --git a/docs_mkdocs/api/hardware/index.md b/docs_mkdocs/api/hardware/index.md
diff --git a/docs_mkdocs/api/index.md b/docs_mkdocs/api/index.md
diff --git a/docs_mkdocs/api/routines/exampleStandaloneRoutine/index.md b/docs_mkdocs/api/routines/exampleStandaloneRoutine/index.md
diff --git a/docs_mkdocs/api/routines/index.md b/docs_mkdocs/api/routines/index.md
diff --git a/docs_mkdocs/api/visual/exampleVisualStim.md b/docs_mkdocs/api/visual/exampleVisualStim.md
diff --git a/docs_mkdocs/api/visual/index.md b/docs_mkdocs/api/visual/index.md
diff --git a/docs_mkdocs/builder/components/ExampleComponent.md b/docs_mkdocs/builder/components/ExampleComponent.md
diff --git a/docs_mkdocs/builder/components/index.md b/docs_mkdocs/builder/components/index.md
diff --git a/docs_mkdocs/builder/index.md b/docs_mkdocs/builder/index.md
diff --git a/docs_mkdocs/builder/routines/ExampleStandaloneRoutine.md b/docs_mkdocs/builder/routines/ExampleStandaloneRoutine.md
diff --git a/docs_mkdocs/builder/routines/index.md b/docs_mkdocs/builder/routines/index.md
diff --git a/docs_mkdocs/coder/ExampleDevice.md b/docs_mkdocs/coder/ExampleDevice.md
diff --git a/docs_mkdocs/coder/ExampleResponseDevice.md b/docs_mkdocs/coder/ExampleResponseDevice.md
diff --git a/docs_mkdocs/coder/ExampleVisualStim.md b/docs_mkdocs/coder/ExampleVisualStim.md
diff --git a/docs_mkdocs/coder/index.md b/docs_mkdocs/coder/index.md
diff --git a/docs_mkdocs/generateAPI.py b/docs_mkdocs/generateAPI.py