Update CI to use newer scripts/requirements-dev.txt

Author: PeterJCLaw

.circleci/config.yml

@@ -9,23 +9,18 @@ jobs:
       - checkout
 
         # Set up a cached virtualenv in which to install things
-      - run:
-          name: Merge requirements
-          command: |
-            cat scripts/linting/requirements.txt >> scripts/requirements.txt
-            cat scripts/typing/requirements.txt >> scripts/requirements.txt
       - restore_cache:
           name: Restore build dependency cache
-          key: deps-venv-{{ .Branch }}-{{ .Environment.CIRCLE_STAGE }}-{{ checksum "scripts/requirements.txt" }}
+          key: deps-venv-{{ .Branch }}-{{ .Environment.CIRCLE_STAGE }}-{{ checksum "scripts/requirements-dev.txt" }}
       - run:
           name: Install dependencies
           command: |
             python3 -m venv venv
             . venv/bin/activate
-            pip install -r scripts/requirements.txt
+            pip install -r scripts/requirements-dev.txt
       - save_cache:
           name: Save build dependency cache
-          key: deps-venv-{{ .Branch }}-{{ .Environment.CIRCLE_STAGE }}-{{ checksum "scripts/requirements.txt" }}
+          key: deps-venv-{{ .Branch }}-{{ .Environment.CIRCLE_STAGE }}-{{ checksum "scripts/requirements-dev.txt" }}
           paths:
             - "venv"