Merge branch 'master' into Blendify/sphinx4

Author: agjohnson

.circleci/config.yml

@@ -17,13 +17,20 @@ commands:
       - run: pip install --user tox
       - run: tox -e "<<parameters.version>>-sphinx{<<parameters.sphinx-version>>}"
   run-build:
-    description: "Verify assets were built"
+    description: "Ensure built assets are up to date"
     steps:
       - checkout
       - run: npm ci
       - run: npm run build
-      - untracked_changes/check:
-          path: sphinx_rtd_theme/
+      - run:
+          name: Ensure built assets are up to date
+          command: |
+            if [[ `git status sphinx_rtd_theme/ --porcelain` ]]
+            then
+              echo "ERROR: assets are out of date. Make sure to run 'npm run build' on your branch."
+              git status sphinx_rtd_theme/ --porcelain
+              exit 1
+            fi
 
 jobs:
   build:
@@ -67,8 +74,18 @@ workflows:
   tests:
     jobs:
       - build
-      - py39
-      - py38
-      - py37
-      - py36
-      - py27
+      - py39:
+          requires:
+            - build
+      - py38:
+          requires:
+            - build
+      - py37:
+          requires:
+            - build
+      - py36:
+          requires:
+            - build
+      - py27:
+          requires:
+            - build