From 5378fac326396d5b198ed161b52e824a86859141 Mon Sep 17 00:00:00 2001
From: Tom Russell <tom.russell@ouce.ox.ac.uk>
Date: Tue, 15 Aug 2023 14:10:08 +0100
Subject: [PATCH] Bump python for CI, install psycopg2 from wheel

---
 .github/workflows/etl.yml          | 35 +++++++++++++++---------------
 etl/planning_data/requirements.txt |  2 +-
 etl/requirements.txt               |  2 +-
 maintenance/requirements.txt       |  4 ++--
 4 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/etl.yml b/.github/workflows/etl.yml
index c51c1b6b..ccba08ed 100644
--- a/.github/workflows/etl.yml
+++ b/.github/workflows/etl.yml
@@ -5,21 +5,20 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-python@v2
-      with:
-        python-version: '3.8'
-    - name:
-        Install dependencies
-      run: |
-        sudo apt-get install libgeos-dev
-        python -m pip install --upgrade pip
-        python -m pip install pytest
-        python -m pip install flake8
-        python -m pip install -r etl/requirements.txt
-    - name: Run Flake8
-      run: |
-        ls etl/*py | grep -v 'join_building_data' | xargs flake8 --exclude etl/__init__.py
-    - name: Run tests
-      run: |
-        python -m pytest
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2
+        with:
+          python-version: "3.11"
+      - name: Install dependencies
+        run: |
+          sudo apt-get install libgeos-dev
+          python -m pip install --upgrade pip
+          python -m pip install pytest
+          python -m pip install flake8
+          python -m pip install -r etl/requirements.txt
+      - name: Run Flake8
+        run: |
+          flake8 etl --ignore=E501
+      - name: Run tests
+        run: |
+          python -m pytest
diff --git a/etl/planning_data/requirements.txt b/etl/planning_data/requirements.txt
index 073368d2..731c082c 100644
--- a/etl/planning_data/requirements.txt
+++ b/etl/planning_data/requirements.txt
@@ -1,3 +1,3 @@
 # Python packages for planning data import
-psycopg2==2.8.6
+psycopg2-binary==2.9.7
 requests==2.31.0
diff --git a/etl/requirements.txt b/etl/requirements.txt
index fe49c08e..7ceb9e1a 100644
--- a/etl/requirements.txt
+++ b/etl/requirements.txt
@@ -1,7 +1,7 @@
 # Python packages for etl
 fiona
 osmnx==1.6.0
-psycopg2==2.7.5
+psycopg2-binary==2.9.7
 retrying==1.3.3
 requests==2.31.0
 shapely
diff --git a/maintenance/requirements.txt b/maintenance/requirements.txt
index d4ff7130..9e61f44e 100644
--- a/maintenance/requirements.txt
+++ b/maintenance/requirements.txt
@@ -1,2 +1,2 @@
-psycopg2==2.8.3
-requests==2.31.0
\ No newline at end of file
+psycopg2-binary==2.9.7
+requests==2.31.0