Merge pull request #90 from cybertec-postgresql/replace-psycopg2

Replace psycopg2-binary, bump versions
- PostgreSQL (fixed a CVE and a subsequent regression)
- etcd
- Patroni
- Python

Author: avandras

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"
+$ISSFile = "installer\patroni.iss"

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
+Write-Host "`n--- PACKAGING FINISHED ---" -ForegroundColor green

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
+Write-Host "--- Installation sucessfully finished ---" -ForegroundColor green