From 5d1b0d0f52389a2e19f9ff3fb72fa201a149796b Mon Sep 17 00:00:00 2001 From: avandras Date: Mon, 24 Feb 2025 10:41:54 +0100 Subject: [PATCH 1/2] Use psycopg 3 instead of the now-broken psycopg2-binary --- make.ps1 | 4 ++-- src/install.ps1 | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/make.ps1 b/make.ps1 index 5fe4271..b5dcaed 100644 --- a/make.ps1 +++ b/make.ps1 @@ -102,7 +102,7 @@ function Get-PatroniPackages { Write-Host "`n--- Download PATRONI packages ---" -ForegroundColor blue Set-Location "$MD\patroni" & $PIP download -r requirements.txt -d .patroni-packages - & $PIP download pip pip_install setuptools wheel cdiff psycopg2-binary -d .patroni-packages + & $PIP download pip pip_install setuptools wheel cdiff psycopg-binary -d .patroni-packages Set-Location -Path "..\.." Write-Host "`n--- PATRONI packages downloaded ---" -ForegroundColor green } @@ -144,4 +144,4 @@ Update-PythonAndPIP Get-PatroniPackages Get-WinSW Export-Assets -Write-Host "`n--- PACKAGING FINISHED ---" -ForegroundColor green \ No newline at end of file +Write-Host "`n--- PACKAGING FINISHED ---" -ForegroundColor green diff --git a/src/install.ps1 b/src/install.ps1 index eaa39f1..e1c32b3 100644 --- a/src/install.ps1 +++ b/src/install.ps1 @@ -21,7 +21,7 @@ Write-Host "--- Python runtime installed ---`n" -ForegroundColor green Write-Host "--- Installing Patroni packages ---" -ForegroundColor blue pip3.exe install --no-index --find-links .patroni-packages -r requirements.txt -pip3.exe install --no-index --find-links .patroni-packages psycopg2-binary +pip3.exe install --no-index --find-links .patroni-packages psycopg-binary pip3.exe install --no-index --find-links .patroni-packages cdiff Set-Location '..' Write-Host "--- Patroni packages installed ---`n" -ForegroundColor green @@ -74,4 +74,4 @@ netsh advfirewall firewall add rule name="postgresql" dir=in action=allow progra netsh advfirewall firewall add rule name="python" dir=in action=allow program="$python" enable=yes Write-Host "--- Firewall rules sucessfully installed ---" -ForegroundColor green -Write-Host "--- Installation sucessfully finished ---" -ForegroundColor green \ No newline at end of file +Write-Host "--- Installation sucessfully finished ---" -ForegroundColor green From cd943dec75df2cbfba409aa594f62b1077e57783 Mon Sep 17 00:00:00 2001 From: avandras Date: Mon, 24 Feb 2025 10:42:12 +0100 Subject: [PATCH 2/2] Bump Postgres and other versions --- env.ps1 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/env.ps1 b/env.ps1 index 3f4b6fc..4a6600c 100644 --- a/env.ps1 +++ b/env.ps1 @@ -1,16 +1,16 @@ $MD = "PES" $VCREDIST_REF = "https://aka.ms/vs/17/release/vc_redist.x64.exe" -$ETCD_REF = "https://github.com/etcd-io/etcd/releases/download/v3.5.17/etcd-v3.5.17-windows-amd64.zip" -$PATRONI_REF = "https://github.com/patroni/patroni/archive/refs/tags/v4.0.4.zip" +$ETCD_REF = "https://github.com/etcd-io/etcd/releases/download/v3.5.18/etcd-v3.5.18-windows-amd64.zip" +$PATRONI_REF = "https://github.com/patroni/patroni/archive/refs/tags/v4.0.5.zip" $MICRO_REF = "https://github.com/zyedidia/micro/releases/download/v2.0.14/micro-2.0.14-win64.zip" $WINSW_REF = "https://github.com/winsw/winsw/releases/download/v2.12.0/WinSW.NET461.exe" $VIP_REF = "https://github.com/cybertec-postgresql/vip-manager/releases/download/v3.0.0/vip-manager_3.0.0_Windows_x86_64.zip" -$PGSQL_REF = "https://get.enterprisedb.com/postgresql/postgresql-17.2-1-windows-x64-binaries.zip" -$PYTHON_REF = "https://www.python.org/ftp/python/3.13.1/python-3.13.1-amd64.exe" +$PGSQL_REF = "https://get.enterprisedb.com/postgresql/postgresql-17.4-1-windows-x64-binaries.zip" +$PYTHON_REF = "https://www.python.org/ftp/python/3.13.2/python-3.13.2-amd64.exe" # one should change python version in github action workflows when changed here $SEVENZIP = "C:\Program Files\7-Zip\7z.exe" $INNOTOOL = "C:\Program Files (x86)\Inno Setup 6" $ISCC = Join-Path $INNOTOOL "iscc.exe" -$ISSFile = "installer\patroni.iss" \ No newline at end of file +$ISSFile = "installer\patroni.iss"