From fa9f3ccc735b7c8a497871aaba7f32a643959162 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Breitbart?= <jerch@rockborn.de>
Date: Fri, 19 Jan 2024 15:31:51 +0100
Subject: [PATCH 1/2] fix docs build version deps, re-order task cases in CI

---
 .github/workflows/build.yml  | 48 ++++++++++++++++++------------------
 example/requirements-ci.txt  |  1 +
 example/requirements-rtd.txt |  1 +
 3 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9121e70..7821032 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -34,16 +34,16 @@ jobs:
       run: |
         ./example/manage.py makemigrations
         ./example/manage.py migrate
-    - name: Build docs
-      run: |
-        cd docs && make html
-        cd ../
     - name: Run tests
       run: |
         coverage run --parallel-mode --branch --source='computedfields' ./example/manage.py test exampleapp
         coverage run --parallel-mode --branch --source='computedfields' ./example/manage.py test test_full
         coverage combine
         coverage report
+    - name: Build docs
+      run: |
+        cd docs && make html
+        cd ../
     - name: Coveralls
       uses: AndreMiras/coveralls-python-action@develop
       with:
@@ -73,16 +73,16 @@ jobs:
       run: |
         ./example/manage.py makemigrations
         ./example/manage.py migrate
-    - name: Build docs
-      run: |
-        cd docs && make html
-        cd ../
     - name: Run tests
       run: |
         coverage run --parallel-mode --branch --source='computedfields' ./example/manage.py test exampleapp
         coverage run --parallel-mode --branch --source='computedfields' ./example/manage.py test test_full
         coverage combine
         coverage report
+    - name: Build docs
+      run: |
+        cd docs && make html
+        cd ../
     - name: Coveralls
       uses: AndreMiras/coveralls-python-action@develop
       with:
@@ -120,10 +120,6 @@ jobs:
         ./example/manage.py migrate
       env:
         DBENGINE: mysql
-    - name: Build docs
-      run: |
-        cd docs && make html
-        cd ../
     - name: Run tests
       run: |
         coverage run --parallel-mode --branch --source='computedfields' ./example/manage.py test exampleapp
@@ -132,6 +128,10 @@ jobs:
         coverage report
       env:
         DBENGINE: mysql
+    - name: Build docs
+      run: |
+        cd docs && make html
+        cd ../
     - name: Coveralls
       uses: AndreMiras/coveralls-python-action@develop
       with:
@@ -168,10 +168,6 @@ jobs:
         ./example/manage.py migrate
       env:
         DBENGINE: postgres
-    - name: Build docs
-      run: |
-        cd docs && make html
-        cd ../
     - name: Run tests
       run: |
         coverage run --parallel-mode --branch --source='computedfields' ./example/manage.py test exampleapp
@@ -180,6 +176,10 @@ jobs:
         coverage report
       env:
         DBENGINE: postgres
+    - name: Build docs
+      run: |
+        cd docs && make html
+        cd ../
     - name: Coveralls
       uses: AndreMiras/coveralls-python-action@develop
       with:
@@ -216,10 +216,6 @@ jobs:
         ./example/manage.py migrate
       env:
         DBENGINE: postgres
-    - name: Build docs
-      run: |
-        cd docs && make html
-        cd ../
     - name: Run tests
       run: |
         coverage run --parallel-mode --branch --source='computedfields' ./example/manage.py test exampleapp
@@ -228,6 +224,10 @@ jobs:
         coverage report
       env:
         DBENGINE: postgres
+    - name: Build docs
+      run: |
+        cd docs && make html
+        cd ../
     - name: Coveralls
       uses: AndreMiras/coveralls-python-action@develop
       with:
@@ -265,10 +265,6 @@ jobs:
         ./example/manage.py migrate
       env:
         DBENGINE: mysql
-    - name: Build docs
-      run: |
-        cd docs && make html
-        cd ../
     - name: Run tests
       run: |
         coverage run --parallel-mode --branch --source='computedfields' ./example/manage.py test exampleapp
@@ -277,6 +273,10 @@ jobs:
         coverage report
       env:
         DBENGINE: mysql
+    - name: Build docs
+      run: |
+        cd docs && make html
+        cd ../
     - name: Coveralls
       uses: AndreMiras/coveralls-python-action@develop
       with:
diff --git a/example/requirements-ci.txt b/example/requirements-ci.txt
index 77d4e5f..1da784b 100644
--- a/example/requirements-ci.txt
+++ b/example/requirements-ci.txt
@@ -10,3 +10,4 @@ mysqlclient==2.1.0
 psycopg2-binary==2.9.3
 tqdm==4.62.3
 django-fast-update
+alabaster==0.7.12
diff --git a/example/requirements-rtd.txt b/example/requirements-rtd.txt
index c57b974..f00e939 100644
--- a/example/requirements-rtd.txt
+++ b/example/requirements-rtd.txt
@@ -10,3 +10,4 @@ typing_extensions==4.0.1
 
 tqdm==4.62.3
 django-fast-update
+alabaster==0.7.12

From 567d334d63839dc25fffd66eae6c362f42e80c50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Breitbart?= <jerch@rockborn.de>
Date: Fri, 19 Jan 2024 15:35:56 +0100
Subject: [PATCH 2/2] add tagged package also to psycopg3 build

---
 example/requirements-ci-psycopg3.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/example/requirements-ci-psycopg3.txt b/example/requirements-ci-psycopg3.txt
index a9baadc..f89fd71 100644
--- a/example/requirements-ci-psycopg3.txt
+++ b/example/requirements-ci-psycopg3.txt
@@ -10,3 +10,4 @@ psycopg==3.1.8
 psycopg-binary==3.1.8
 tqdm==4.62.3
 django-fast-update
+alabaster==0.7.12