From 0f1368a2434ae4fe7b09a1a74f46a6992da9b14e Mon Sep 17 00:00:00 2001
From: Christophe Bornet <cbornet@hotmail.com>
Date: Tue, 30 Jul 2024 15:39:36 +0200
Subject: [PATCH 1/4] Bump torch version to 2.4.0

---
 libs/colbert/pyproject.toml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/libs/colbert/pyproject.toml b/libs/colbert/pyproject.toml
index 5a6e4c615..cc9e4c94a 100644
--- a/libs/colbert/pyproject.toml
+++ b/libs/colbert/pyproject.toml
@@ -13,14 +13,10 @@ packages = [{ include = "ragstack_colbert" }]
 python = ">=3.9,<4.0"
 colbert-ai = "0.2.19"
 pyarrow = "14.0.1"
-torch = "2.2.1"
+torch = "2.4.0"
 cassio = "~0.1.7"
 pydantic = "^2.7.1"
 
-# Workaround for https://github.com/pytorch/pytorch/pull/127921
-# Remove when we upgrade to pytorch 2.4
-setuptools = { version = ">=70", python = ">=3.12" }
-
 [tool.poetry.group.dev.dependencies]
 mypy = "^1.11.0"
 

From 67a8073495071912cd9c8ba12ef6bc22992ccd9a Mon Sep 17 00:00:00 2001
From: Christophe Bornet <cbornet@hotmail.com>
Date: Tue, 30 Jul 2024 17:31:54 +0200
Subject: [PATCH 2/4] test

---
 libs/colbert/tox.ini | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libs/colbert/tox.ini b/libs/colbert/tox.ini
index b9281072e..8384cfee8 100644
--- a/libs/colbert/tox.ini
+++ b/libs/colbert/tox.ini
@@ -9,6 +9,7 @@ allowlist_externals = poetry
 commands_pre =
     poetry env use system
     poetry install
+    cat .tox/unit-tests/lib/python3.12/site-packages/torch-2.4.0.dist-info/METADATA
 
 [testenv:unit-tests]
 description = run unit tests

From eada2fccae5c8114f24a5cb8f7672c840b994c49 Mon Sep 17 00:00:00 2001
From: Christophe Bornet <cbornet@hotmail.com>
Date: Tue, 30 Jul 2024 17:44:22 +0200
Subject: [PATCH 3/4] test

---
 .github/workflows/ci-unit-tests.yml | 22 +++++++++++-----------
 libs/colbert/tox.ini                |  4 +++-
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/ci-unit-tests.yml b/.github/workflows/ci-unit-tests.yml
index 92851a0d0..b0bdeb341 100644
--- a/.github/workflows/ci-unit-tests.yml
+++ b/.github/workflows/ci-unit-tests.yml
@@ -115,9 +115,9 @@ jobs:
       matrix:
         python-version:
           - "3.12"
-          - "3.11"
-          - "3.10"
-          - "3.9"
+#          - "3.11"
+#          - "3.10"
+#          - "3.9"
     steps:
       - name: Check out the repo
         uses: actions/checkout@v4
@@ -127,14 +127,14 @@ jobs:
         with:
           python-version: "${{ matrix.python-version }}"
 
-      - name: "Unit tests (root)"
-        # yamllint disable-line rule:line-length
-        if: ${{ needs.preconditions.outputs.libs_langchain == 'true' || needs.preconditions.outputs.libs_colbert == 'true' || needs.preconditions.outputs.libs_llamaindex == 'true' }}
-        run: tox -e unit-tests && rm -rf .tox
-
-      - name: "Unit tests (ragulate)"
-        if: ${{ needs.preconditions.outputs.libs_ragulate == 'true' && matrix.python-version != '3.9' }}
-        run: tox -e unit-tests -c libs/ragulate && rm -rf libs/ragulate/.tox
+#      - name: "Unit tests (root)"
+#        # yamllint disable-line rule:line-length
+#        if: ${{ needs.preconditions.outputs.libs_langchain == 'true' || needs.preconditions.outputs.libs_colbert == 'true' || needs.preconditions.outputs.libs_llamaindex == 'true' }}
+#        run: tox -e unit-tests && rm -rf .tox
+#
+#      - name: "Unit tests (ragulate)"
+#        if: ${{ needs.preconditions.outputs.libs_ragulate == 'true' && matrix.python-version != '3.9' }}
+#        run: tox -e unit-tests -c libs/ragulate && rm -rf libs/ragulate/.tox
 
       - name: "Unit tests (colbert)"
         if: ${{ needs.preconditions.outputs.libs_colbert == 'true' }}
diff --git a/libs/colbert/tox.ini b/libs/colbert/tox.ini
index 8384cfee8..ffe73e136 100644
--- a/libs/colbert/tox.ini
+++ b/libs/colbert/tox.ini
@@ -5,7 +5,9 @@ envlist = type, unit-tests, integration-tests
 [testenv]
 description = install dependencies
 skip_install = true
-allowlist_externals = poetry
+allowlist_externals =
+    poetry
+    cat
 commands_pre =
     poetry env use system
     poetry install

From bc0b1dff8d90dcfc6d0ecfe2e85fe310f38666e6 Mon Sep 17 00:00:00 2001
From: Christophe Bornet <cbornet@hotmail.com>
Date: Tue, 30 Jul 2024 18:05:36 +0200
Subject: [PATCH 4/4] test

---
 libs/colbert/tox.ini         | 2 ++
 libs/testa/testa/__init__.py | 0
 2 files changed, 2 insertions(+)
 create mode 100644 libs/testa/testa/__init__.py

diff --git a/libs/colbert/tox.ini b/libs/colbert/tox.ini
index ffe73e136..a0d01394b 100644
--- a/libs/colbert/tox.ini
+++ b/libs/colbert/tox.ini
@@ -10,6 +10,8 @@ allowlist_externals =
     cat
 commands_pre =
     poetry env use system
+    poetry lock
+    poetry update -vvv
     poetry install
     cat .tox/unit-tests/lib/python3.12/site-packages/torch-2.4.0.dist-info/METADATA
 
diff --git a/libs/testa/testa/__init__.py b/libs/testa/testa/__init__.py
new file mode 100644
index 000000000..e69de29bb