Merge requirements files

These were previously separate to enforce the idea that the scoring
logic shouldn't depend on srcomp. However since we want to allow
for the scorer UI to be defined in the compstate and to have tests,
it's impractical to approach it this way. Merging these does allow
some risk of an unexpected dependency, however it's probably a
small enough risk not to be troublesome.

Author: PeterJCLaw

action.yml

@@ -20,9 +20,9 @@ runs:
         cache: pip
         cache-dependency-path: ${{ steps.copy-requirements.outputs.directory }}/**requirements.txt
 
-    - name: Install Test Dependencies
+    - name: Install Dependencies
       shell: bash
-      run: pip install -U -r ${{ steps.copy-requirements.outputs.directory }}/test-requirements.txt
+      run: pip install -U -r ${{ steps.copy-requirements.outputs.directory }}/requirements.txt
 
     - name: Run Scoring tests
       shell: bash
@@ -34,10 +34,6 @@ runs:
           python3 -m unittest discover --buffer scoring/tests/
         fi
 
-    - name: Install Dependencies
-      shell: bash
-      run: pip install -U -r ${{ steps.copy-requirements.outputs.directory }}/requirements.txt
-
     - name: Run Compstate Validation
       shell: bash
       run: ${{ github.action_path }}/validate.py .

requirements.txt

@@ -1 +1,2 @@
+PyYAML>5,<7
 sr.comp>=1.4,<2