From 295fb47ad673a2837619a8bb718593f0df52203c Mon Sep 17 00:00:00 2001
From: Manish Maharjan <mmaharjan@ccdc.cam.ac.uk>
Date: Fri, 26 Sep 2025 15:54:08 +0100
Subject: [PATCH 1/7] DO-1298 upload conquest python to proget

---
 .github/workflows/build-conquest-python.yml | 32 +++++++++++++++++++--
 1 file changed, 29 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build-conquest-python.yml b/.github/workflows/build-conquest-python.yml
index 7e58ec9..f05743e 100644
--- a/.github/workflows/build-conquest-python.yml
+++ b/.github/workflows/build-conquest-python.yml
@@ -9,7 +9,8 @@ on:  # yamllint disable-line rule:truthy
         default: false
         type: boolean
       platforms:
-        description: 'Platform to build for, eg. '
+        description: "Platform to build for"
+        type: choice
         options:
           - 'rocky8'
           - 'ubuntu'
@@ -31,7 +32,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Set output
         id: set_output
@@ -64,7 +65,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Set up Python
         uses: actions/setup-python@v5
@@ -118,3 +119,28 @@ jobs:
           jfrog rt upload --flat \
             "${{ env.archive_path }}/${{ env.archive_filename }}" \
             "ccdc-3rdparty-python-interpreters/conquest_python/2.7/"
+
+      - name: Upload conquest python to ProGet
+        if: ${{ inputs.artifactory-push }}
+        shell: bash
+        env:
+          PROGET_API_KEY: ${{ secrets.PROGET_API_KEY }}
+          PROGET_BASE_URL: ${{ vars.PROGET_BASE_URL }}
+          PROGET_ASSET_DIRECTORY: ${{ vars.PROGET_ASSET_DIRECTORY }}
+        run: |
+          PROGET_ENDPOINT="${PROGET_BASE_URL}/endpoints/${PROGET_ASSET_DIRECTORY}/content/conquest_python/2.7/${{ env.archive_filename }}"
+
+          curl -X POST \
+            -H "Content-Type: application/octet-stream" \
+            -H "X-ApiKey: ${PROGET_API_KEY}" \
+            --data-binary "@${{ env.archive_path }}/${{ env.archive_filename }}" \
+            --fail-with-body \
+            "$PROGET_ENDPOINT"
+
+          if [ $? -eq 0 ]; then
+            echo "Successfully uploaded ${{ env.archive_filename }} to ProGet"
+          else
+            echo "Failed to upload ${{ env.archive_filename }} to ProGet"
+            exit 1
+          fi
+

From a636236e20a949aba4fc7d70bd5cfff55ca01f88 Mon Sep 17 00:00:00 2001
From: Manish Maharjan <mmaharjan@ccdc.cam.ac.uk>
Date: Mon, 6 Oct 2025 15:35:44 +0100
Subject: [PATCH 2/7] DO-1298 get everything from the 4th word onwards for
 artifact

---
 .github/workflows/build-conquest-python.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-conquest-python.yml b/.github/workflows/build-conquest-python.yml
index f05743e..e39a6ec 100644
--- a/.github/workflows/build-conquest-python.yml
+++ b/.github/workflows/build-conquest-python.yml
@@ -92,7 +92,7 @@ jobs:
         run: |
           output=$(${{ needs.setup.outputs.python }} build_conquest_python.py | grep Creating | tail -n 1)
           archive_filename=$(echo $output | awk '{print $2}')
-          archive_path=$(echo $output | awk '{print $NF}')
+          archive_path=$(echo $output | awk '{for(i=4;i<=NF;i++) printf "%s%s", $i, (i<NF ? " " : "")}')
           echo "archive_filename=$archive_filename" >> $GITHUB_ENV
           echo "archive_path=$archive_path" >> $GITHUB_ENV
 

From 954e520c1148ae509578599452c6ea186f861c1c Mon Sep 17 00:00:00 2001
From: Manish Maharjan <mmaharjan@ccdc.cam.ac.uk>
Date: Mon, 6 Oct 2025 15:44:26 +0100
Subject: [PATCH 3/7] DO-1298 use ifj.org for jpeg files

---
 .github/workflows/build-conquest-python.yml | 13 +++++++++++--
 build_conquest_python.py                    |  2 +-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build-conquest-python.yml b/.github/workflows/build-conquest-python.yml
index e39a6ec..9ee381f 100644
--- a/.github/workflows/build-conquest-python.yml
+++ b/.github/workflows/build-conquest-python.yml
@@ -90,9 +90,18 @@ jobs:
 
       - name: Build conquest python
         run: |
-          output=$(${{ needs.setup.outputs.python }} build_conquest_python.py | grep Creating | tail -n 1)
+          ${{ needs.setup.outputs.python }} build_conquest_python.py > build_output.log 2>&1
+          cat build_output.log
+          output=$(grep "Creating.*\.tar\.gz.*in" build_output.log | tail -n 1)
+          echo "Parsed output line: $output"
+          if [[ -z "$output" ]]; then
+            echo "Error: No 'Creating' line found in build output"
+            exit 1
+          fi
           archive_filename=$(echo $output | awk '{print $2}')
-          archive_path=$(echo $output | awk '{for(i=4;i<=NF;i++) printf "%s%s", $i, (i<NF ? " " : "")}')
+          archive_path=$(echo $output | sed 's/^Creating .* in //')
+          echo "Parsed filename: $archive_filename"
+          echo "Parsed path: $archive_path"
           echo "archive_filename=$archive_filename" >> $GITHUB_ENV
           echo "archive_path=$archive_path" >> $GITHUB_ENV
 
diff --git a/build_conquest_python.py b/build_conquest_python.py
index 8b8ec27..e4653c4 100755
--- a/build_conquest_python.py
+++ b/build_conquest_python.py
@@ -512,7 +512,7 @@ class JpegPackage(InstallInConquestPythonBaseMixin, AutoconfMixin, NoArchiveMixi
     @property
     def source_archives(self):
         return {
-            f'jpegsrc.v{self.version}.tar.gz': f'https://fossies.org/linux/misc/jpegsrc.v{self.version}.tar.gz'
+            f'jpegsrc.v{self.version}.tar.gz': f'https://www.ijg.org/files/jpegsrc.v{self.version}.tar.gz'
         }
 
 

From d37683e324ba8ed985f0817fa033b60b39a23cc7 Mon Sep 17 00:00:00 2001
From: Manish Maharjan <mmaharjan@ccdc.cam.ac.uk>
Date: Mon, 6 Oct 2025 16:15:12 +0100
Subject: [PATCH 4/7] DO-1298 revert to easier method

---
 .github/workflows/build-conquest-python.yml | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/build-conquest-python.yml b/.github/workflows/build-conquest-python.yml
index 9ee381f..f270b50 100644
--- a/.github/workflows/build-conquest-python.yml
+++ b/.github/workflows/build-conquest-python.yml
@@ -90,18 +90,9 @@ jobs:
 
       - name: Build conquest python
         run: |
-          ${{ needs.setup.outputs.python }} build_conquest_python.py > build_output.log 2>&1
-          cat build_output.log
-          output=$(grep "Creating.*\.tar\.gz.*in" build_output.log | tail -n 1)
-          echo "Parsed output line: $output"
-          if [[ -z "$output" ]]; then
-            echo "Error: No 'Creating' line found in build output"
-            exit 1
-          fi
+          output=$(${{ needs.setup.outputs.python }} build_conquest_python.py | grep Creating | tail -n 1)
           archive_filename=$(echo $output | awk '{print $2}')
-          archive_path=$(echo $output | sed 's/^Creating .* in //')
-          echo "Parsed filename: $archive_filename"
-          echo "Parsed path: $archive_path"
+          archive_path=$(echo $output | awk '{print $NF}')
           echo "archive_filename=$archive_filename" >> $GITHUB_ENV
           echo "archive_path=$archive_path" >> $GITHUB_ENV
 
@@ -152,4 +143,3 @@ jobs:
             echo "Failed to upload ${{ env.archive_filename }} to ProGet"
             exit 1
           fi
-

From 236186e28bb6823d9a039d21d185861f79e9d386 Mon Sep 17 00:00:00 2001
From: Manish Maharjan <mmaharjan@ccdc.cam.ac.uk>
Date: Tue, 7 Oct 2025 10:45:34 +0100
Subject: [PATCH 5/7] DO-1298 simplify upload

---
 .github/workflows/build-conquest-python.yml | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/.github/workflows/build-conquest-python.yml b/.github/workflows/build-conquest-python.yml
index f270b50..7184914 100644
--- a/.github/workflows/build-conquest-python.yml
+++ b/.github/workflows/build-conquest-python.yml
@@ -131,15 +131,6 @@ jobs:
           PROGET_ENDPOINT="${PROGET_BASE_URL}/endpoints/${PROGET_ASSET_DIRECTORY}/content/conquest_python/2.7/${{ env.archive_filename }}"
 
           curl -X POST \
-            -H "Content-Type: application/octet-stream" \
             -H "X-ApiKey: ${PROGET_API_KEY}" \
             --data-binary "@${{ env.archive_path }}/${{ env.archive_filename }}" \
-            --fail-with-body \
             "$PROGET_ENDPOINT"
-
-          if [ $? -eq 0 ]; then
-            echo "Successfully uploaded ${{ env.archive_filename }} to ProGet"
-          else
-            echo "Failed to upload ${{ env.archive_filename }} to ProGet"
-            exit 1
-          fi

From 0671872c66480e8d9e141f47d2e6be066dad364e Mon Sep 17 00:00:00 2001
From: Manish Maharjan <mmaharjan@ccdc.cam.ac.uk>
Date: Wed, 8 Oct 2025 00:55:47 +0100
Subject: [PATCH 6/7] DO-1298 add --fail-with-body for better errors

---
 .github/workflows/build-conquest-python.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/build-conquest-python.yml b/.github/workflows/build-conquest-python.yml
index 7184914..9f4e877 100644
--- a/.github/workflows/build-conquest-python.yml
+++ b/.github/workflows/build-conquest-python.yml
@@ -133,4 +133,5 @@ jobs:
           curl -X POST \
             -H "X-ApiKey: ${PROGET_API_KEY}" \
             --data-binary "@${{ env.archive_path }}/${{ env.archive_filename }}" \
+            --fail-with-body \
             "$PROGET_ENDPOINT"

From 56bcdf6a51745e8bf58d61bc8890bce0b28212ea Mon Sep 17 00:00:00 2001
From: Manish Maharjan <mmaharjan@ccdc.cam.ac.uk>
Date: Wed, 8 Oct 2025 00:57:00 +0100
Subject: [PATCH 7/7] DO-1298 use python 3.11

---
 .github/workflows/build-conquest-python.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-conquest-python.yml b/.github/workflows/build-conquest-python.yml
index 9f4e877..f269725 100644
--- a/.github/workflows/build-conquest-python.yml
+++ b/.github/workflows/build-conquest-python.yml
@@ -68,10 +68,10 @@ jobs:
         uses: actions/checkout@v5
 
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         if: ${{ needs.setup.outputs.python == 'python' }}
         with:
-          python-version: '3.9'
+          python-version: '3.11'
 
       - name: Set up Python environment
         run: |