From 6736c2282651432f8963c116c4c2f4ff30999e44 Mon Sep 17 00:00:00 2001
From: Daniel Halperin <dan@intentionet.com>
Date: Tue, 28 Dec 2021 11:46:33 -0800
Subject: [PATCH] ci: restore isort with blocking virtualenv upgrade

Revert "ci: disable isort in attempt to workaround build failure (#805)"

This reverts commit c239cb61a8480aaef94053e9e41b2cc2fd224884.
---
 .buildkite/pipeline.sh  |  2 +-
 .pre-commit-config.yaml | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.buildkite/pipeline.sh b/.buildkite/pipeline.sh
index a4111e783..16a93b415 100755
--- a/.buildkite/pipeline.sh
+++ b/.buildkite/pipeline.sh
@@ -23,7 +23,7 @@ cat <<EOF
     command:
       - "python3 -m virtualenv .venv"
       - ". .venv/bin/activate"
-      - "python3 -m pip install pre-commit"
+      - "python3 -m pip install pre-commit 'virtualenv<20.11.0'"
       - "pre-commit run --all-files"
     plugins:
       - docker#${BATFISH_DOCKER_PLUGIN_VERSION}:
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 9c253af81..adc38b85e 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -11,11 +11,11 @@ repos:
     hooks:
     - id: black
 
-  #- repo: https://github.com/pycqa/isort
-  #  rev: 5.8.0
-  #  hooks:
-  #  - id: isort
-  #    args: ["--profile", "black", "--filter-files"]
+  - repo: https://github.com/pycqa/isort
+    rev: 5.8.0
+    hooks:
+    - id: isort
+      args: ["--profile", "black", "--filter-files"]
  
   - repo: https://github.com/humitos/mirrors-autoflake
     rev: v1.3