Mercurial > hg > orthanc-tests

changeset 791:5140a8917254 attach-custom-data

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merged default -> attach-custom-data
author Alain Mazy <am@orthanc.team>
date Mon, 10 Mar 2025 18:58:07 +0100
parents d08518883f2f (diff) 3da6edb11ee9 (current diff)
children 0572c2c12c70
files NewTests/PostgresUpgrades/docker-compose.yml NewTests/PostgresUpgrades/downgrade.sh NewTests/PostgresUpgrades/run-integ-tests-from-docker.sh NewTests/PostgresUpgrades/test_pg_upgrades.py NewTests/requirements.txt
diffstat 4 files changed, 12 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/NewTests/Concurrency/docker-compose-transfers-concurrency.yml	Tue Feb 25 19:27:02 2025 +0100
+++ b/NewTests/Concurrency/docker-compose-transfers-concurrency.yml	Mon Mar 10 18:58:07 2025 +0100
@@ -1,4 +1,3 @@
-version: "3"
 services:
 
   orthanc-pg-a:
--- a/NewTests/PostgresUpgrades/docker-compose.yml	Tue Feb 25 19:27:02 2025 +0100
+++ b/NewTests/PostgresUpgrades/docker-compose.yml	Mon Mar 10 18:58:07 2025 +0100
@@ -17,7 +17,7 @@
 
   # Orthanc previous version
   orthanc-pg-15-previous-revision:
-    image: orthancteam/orthanc:25.1.1
+    image: orthancteam/orthanc:25.2.0
     container_name: orthanc-pg-15-previous-revision
     depends_on: [pg-15]
     restart: unless-stopped
@@ -30,7 +30,7 @@
 
   # Orthanc previous version to run the integration tests
   orthanc-pg-15-previous-revision-for-integ-tests:
-    image: orthancteam/orthanc:25.1.1
+    image: orthancteam/orthanc:25.2.0
     container_name: orthanc-pg-15-previous-revision-for-integ-tests
     depends_on: [pg-15]
     restart: unless-stopped
--- a/NewTests/PostgresUpgrades/downgrade.sh	Tue Feb 25 19:27:02 2025 +0100
+++ b/NewTests/PostgresUpgrades/downgrade.sh	Mon Mar 10 18:58:07 2025 +0100
@@ -4,8 +4,11 @@
 
 apt-get update && apt-get install -y wget mercurial
 hg clone https://orthanc.uclouvain.be/hg/orthanc-databases
-hg update -r default
-psql -U postgres -f /scripts/orthanc-databases/PostgreSQL/Plugins/SQL/Downgrades/Rev4ToRev3.sql
+# TODO: change attach-custom-data by the plugin version number or "default" !
+pushd orthanc-databases
+hg update -r attach-custom-data
+
+psql -U postgres -f /scripts/orthanc-databases/PostgreSQL/Plugins/SQL/Downgrades/Rev5ToRev4.sql
 
 # if you want to test a downgrade procedure, you may use this code ...
 # psql -U postgres -f downgrade.sql
--- a/NewTests/requirements.txt	Tue Feb 25 19:27:02 2025 +0100
+++ b/NewTests/requirements.txt	Mon Mar 10 18:58:07 2025 +0100
@@ -1,3 +1,8 @@
+<<<<<<< working copy
+orthanc-api-client>=0.18.0
+orthanc-tools>=0.15.1
+=======
 orthanc-api-client>=0.18.4
 orthanc-tools>=0.13.0
+>>>>>>> merge rev
 uvicorn
\ No newline at end of file