Merge pull request #16 from cisagov/improvement/upstream-changes

Pull in upstream changes

.github/workflows/build.yml

@@ -1,7 +1,10 @@
 ---
 name: build
 
-on: [push]
+on: [
+  push,
+  pull_request
+]
 
 env:
   IMAGE_NAME: cisagov/example

.isort.cfg

@@ -0,0 +1,12 @@
+[settings]
+combine_star=true
+force_sort_within_sections=true
+
+import_heading_stdlib=Standard Python Libraries
+import_heading_thirdparty=Third-Party Libraries
+import_heading_firstparty=cisagov Libraries
+
+# Should be auto-populated by seed-isort-config hook
+known_third_party=pytest
+# These must be manually set to correctly separate them from third party libraries
+known_first_party=

.pre-commit-config.yaml

@@ -71,6 +71,16 @@ repos:
     rev: 19.10b0
     hooks:
       - id: black
+  - repo: https://github.com/asottile/seed-isort-config
+    rev: v1.9.3
+    hooks:
+      - id: seed-isort-config
+  - repo: https://github.com/pre-commit/mirrors-isort
+    # pick the isort version you'd like to use from
+    # https://github.com/pre-commit/mirrors-isort/releases
+    rev: v4.3.21
+    hooks:
+      - id: isort
   - repo: https://github.com/ansible/ansible-lint.git
     rev: v4.1.1a5
     hooks:

tests/conftest.py

@@ -2,9 +2,9 @@
 
 https://docs.pytest.org/en/latest/writing_plugins.html#conftest-py-plugins
 """
+# Third-Party Libraries
 import pytest
 
-
 MAIN_SERVICE_NAME = "example"
 VERSION_SERVICE_NAME = f"{MAIN_SERVICE_NAME}-version"
 

tests/container_test.py

@@ -1,9 +1,11 @@
 #!/usr/bin/env pytest -vs
 """Tests for example container."""
 
+# Standard Python Libraries
 import os
 import time
 
+# Third-Party Libraries
 import pytest
 
 ENV_VAR = "ECHO_MESSAGE"