From 711eadf5155688166fc9aa39ddf59048bd681320 Mon Sep 17 00:00:00 2001
From: Xylar Asay-Davis <xylarstorm@gmail.com>
Date: Tue, 31 Jan 2023 20:20:53 -0700
Subject: [PATCH 1/2] Add flake8 to github workflows

---
 .github/workflows/lint.yml | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 .github/workflows/lint.yml

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
new file mode 100644
index 0000000..49e533e
--- /dev/null
+++ b/.github/workflows/lint.yml
@@ -0,0 +1,27 @@
+name: Lint
+
+on:
+  pull_request:
+    branches: [main]
+    paths:
+      - '*.py'
+
+jobs:
+  flake8:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Setup Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.10'
+          architecture: x64
+      - name: Checkout pyremap
+        uses: actions/checkout@v3
+      - name: Install flake8
+        run: pip install flake8
+      - name: Run flake8
+        uses: suo/flake8-github-action@releases/v1
+        with:
+          checkName: 'flake8'   # NOTE: this needs to be the same as the job name
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

From 9ac8f699db062356544aad6e72eaf31225cb9e19 Mon Sep 17 00:00:00 2001
From: Xylar Asay-Davis <xylarstorm@gmail.com>
Date: Tue, 31 Jan 2023 20:33:17 -0700
Subject: [PATCH 2/2] Fix azure

---
 azure-pipelines.yml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 66fb0df..baf3725 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -34,8 +34,11 @@ jobs:
       eval "$(conda shell.bash hook)"
       conda config --add channels conda-forge
       conda config --set channel_priority strict
-      conda install --yes conda conda-build mamba boa
-      conda update --all --yes
+      conda update --yes --all
+      conda install --yes mamba
+      # workaround based on recent failures
+      rm /usr/share/miniconda/pkgs/cache/*.json
+      mamba install --yes conda-build boa
     displayName: Update conda base environment
 
   - bash: |
@@ -161,8 +164,9 @@ jobs:
       eval "$(conda shell.bash hook)"
       conda config --add channels conda-forge
       conda config --set channel_priority strict
-      conda install --yes conda conda-build mamba boa
-      conda update --all --yes
+      conda update --yes --all
+      conda install --yes mamba
+      mamba install --yes conda-build boa
     displayName: Update conda base environment
 
   - bash: |