From 768f05b7830d034c85c9e24ebb6ee9f7b6a5a1b3 Mon Sep 17 00:00:00 2001
From: pacnpal <183241239+pacnpal@users.noreply.github.com>
Date: Thu, 6 Feb 2025 11:45:29 -0500
Subject: [PATCH] Improve CI workflow by setting up Python and upgrading pip,
 setuptools, and wheel before installing dependencies

---
 .github/workflows/django.yml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/django.yml b/.github/workflows/django.yml
index a389d16b..007041ff 100644
--- a/.github/workflows/django.yml
+++ b/.github/workflows/django.yml
@@ -48,13 +48,16 @@ jobs:
         gdal-config --libs
         echo "Python path:" $PYTHONPATH
         echo "Settings module:" $DJANGO_SETTINGS_MODULE
+    - name: Setup Python and pip
+      run: |
+        python -m ensurepip --upgrade
+        python -m pip install --upgrade pip setuptools wheel
     - name: Install Dependencies
       env:
         GDAL_LIBRARY_PATH: /usr/lib/x86_64-linux-gnu/libgdal.so
       run: |
-        python -m pip install --upgrade pip
-        pip install wheel setuptools
-        pip install GDAL==$(gdal-config --version) --global-option=build_ext --global-option="-I/usr/include/gdal"
+        GDAL_VERSION=$(gdal-config --version)
+        pip install GDAL==$GDAL_VERSION --global-option=build_ext --global-option="-I/usr/include/gdal"
         pip install -r requirements.txt
     - name: Verify GDAL Installation
       run: |