From d16db2b02f29c4d67ecf4e7c714b8a19597b5450 Mon Sep 17 00:00:00 2001 From: harryob <55142896+harryob@users.noreply.github.com> Date: Tue, 17 Dec 2024 17:04:55 +0000 Subject: [PATCH 1/6] no wheel for 24.04 --- .github/workflows/ci_suite.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci_suite.yml b/.github/workflows/ci_suite.yml index 9636c6c48e1..b7a67d26e75 100644 --- a/.github/workflows/ci_suite.yml +++ b/.github/workflows/ci_suite.yml @@ -40,6 +40,7 @@ jobs: ${{ runner.os }}- - name: Install Tools run: | + apt-get install libgit2-dev libjpeg-dev -y pip3 install setuptools bash tools/ci/install_node.sh bash tools/ci/install_spaceman_dmm.sh dreamchecker From 811aea093127bcec548cbcff4205c1ca80c5404c Mon Sep 17 00:00:00 2001 From: harryob <55142896+harryob@users.noreply.github.com> Date: Tue, 17 Dec 2024 17:07:37 +0000 Subject: [PATCH 2/6] escalate privileges siiigh --- .github/workflows/ci_suite.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_suite.yml b/.github/workflows/ci_suite.yml index b7a67d26e75..97e95103154 100644 --- a/.github/workflows/ci_suite.yml +++ b/.github/workflows/ci_suite.yml @@ -40,7 +40,7 @@ jobs: ${{ runner.os }}- - name: Install Tools run: | - apt-get install libgit2-dev libjpeg-dev -y + sudo apt-get install libgit2-dev libjpeg-dev -y pip3 install setuptools bash tools/ci/install_node.sh bash tools/ci/install_spaceman_dmm.sh dreamchecker From c90e1f1e6d8c1ca252e3d5e5914016556c8e4ae7 Mon Sep 17 00:00:00 2001 From: harryob <55142896+harryob@users.noreply.github.com> Date: Tue, 17 Dec 2024 17:16:47 +0000 Subject: [PATCH 3/6] bump pygit2 --- tools/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/requirements.txt b/tools/requirements.txt index ff7d929d53c..b9179e2c3e3 100644 --- a/tools/requirements.txt +++ b/tools/requirements.txt @@ -1,4 +1,4 @@ -pygit2==1.7.2 +pygit2==1.16.0 bidict==0.22.0 Pillow==10.3.0 From 3f742a9e36c26f157369b686f0cd7c65533e3e80 Mon Sep 17 00:00:00 2001 From: harryob <55142896+harryob@users.noreply.github.com> Date: Tue, 17 Dec 2024 17:19:21 +0000 Subject: [PATCH 4/6] potentially redundant --- .github/workflows/ci_suite.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci_suite.yml b/.github/workflows/ci_suite.yml index 97e95103154..9636c6c48e1 100644 --- a/.github/workflows/ci_suite.yml +++ b/.github/workflows/ci_suite.yml @@ -40,7 +40,6 @@ jobs: ${{ runner.os }}- - name: Install Tools run: | - sudo apt-get install libgit2-dev libjpeg-dev -y pip3 install setuptools bash tools/ci/install_node.sh bash tools/ci/install_spaceman_dmm.sh dreamchecker From 5d04a6e31cc35548bfccf7831a31d8f6fc879cd2 Mon Sep 17 00:00:00 2001 From: Drulikar Date: Tue, 17 Dec 2024 17:24:57 -0600 Subject: [PATCH 5/6] bump pillow --- tools/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/requirements.txt b/tools/requirements.txt index b9179e2c3e3..cf2aeb0e955 100644 --- a/tools/requirements.txt +++ b/tools/requirements.txt @@ -1,6 +1,6 @@ pygit2==1.16.0 bidict==0.22.0 -Pillow==10.3.0 +Pillow==11.0.0 # changelogs PyYaml==6.0.1 From 3ceb3c7532ec8898c38e2434e7e4b15e71ed9faa Mon Sep 17 00:00:00 2001 From: Drulikar Date: Tue, 17 Dec 2024 17:28:58 -0600 Subject: [PATCH 6/6] Bump python too --- dependencies.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.sh b/dependencies.sh index e0da4aa75f6..bb865cf8d1c 100644 --- a/dependencies.sh +++ b/dependencies.sh @@ -18,4 +18,4 @@ export NODE_VERSION_LTS=20.12.0 export SPACEMAN_DMM_VERSION=suite-1.8 # Python version for mapmerge and other tools -export PYTHON_VERSION=3.9.0 +export PYTHON_VERSION=3.11.9