order ci script runs on proper set of r files

Joseph Damiba · nicolaskruchten · commit f8d55100159b · 2019-12-18T16:42:52.000-05:00
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -60,7 +60,7 @@ jobs:
             python front-matter-ci.py _posts
             python check-or-enforce-order.py _posts/python
             python check-or-enforce-order.py _posts/python-v3
-            python check-or-enforce-order.py _posts/r
+            python check-or-enforce-order.py _posts/r/md/r
             python check-or-enforce-order.py _posts/plotly_js
             bundle exec jekyll build
             mkdir snapshots
diff --git a/front-matter-ci.py b/front-matter-ci.py
@@ -53,11 +53,9 @@ def check_indexOverflow(meta_to_check):
     failures = []
     for meta in meta_to_check:
         # Check #4 - are there posts with order > 5 and 'page_type: example_index'?
-        if "display_as" in meta and meta["display_as"] in categories:
-            if "language" in meta and meta["language"] in languages:
-                if "order" in meta and meta["order"] > 5:
-                    if "page_type" in meta and meta["page_type"] == "example_index":
-                        failures.append(meta["permalink"])
+        if "order" in meta and meta["order"] > 5:
+            if "page_type" in meta and meta["page_type"] == "example_index":
+                failures.append(meta["permalink"])
     return "are there posts with order > 5 and 'page_type: example_index'?", failures
 
 
@@ -66,9 +64,7 @@ def check_postsWithNoThumbnail(meta_to_check):
     for meta in meta_to_check:
         # Check #5 - does every post have a thumbnail?
         if "thumbnail" not in meta:
-            if "display_as" in meta and meta["display_as"] in categories:
-                if "language" in meta and meta["language"] in languages:
-                    failures.append(meta["permalink"])
+            failures.append(meta["permalink"])
     return "does every post have a thumbnail?", failures
 
 
@@ -108,7 +104,10 @@ def check_noTrailingSlash(meta_to_check):
 for path in paths:
     post = frontmatter.load(str(path))
     if len(post.metadata.keys()) > 0 and "jupyter" not in post.metadata:
-        meta_to_check.append(post.metadata)
+        meta = post.metadata
+        if "display_as" in meta and meta["display_as"] in categories:
+            if "language" in meta and meta["language"] in languages:
+                meta_to_check.append(meta)
 
 
 print("Begin CI Checks!\n")
