From a365bfd27cdaabd98fc517e7e685f3f4549aa886 Mon Sep 17 00:00:00 2001 From: Bob Date: Tue, 11 Jun 2024 14:11:20 +0100 Subject: [PATCH 01/17] temporarily? use the orthogroup-tree-table branch of web-monorepo --- Site/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Site/package.json b/Site/package.json index 32cc3d8..e974792 100644 --- a/Site/package.json +++ b/Site/package.json @@ -2,6 +2,6 @@ "name": "ortho-site-deployer", "private": true, "dependencies": { - "@veupathdb/ortho-site": "^1.0.49" + "@veupathdb/ortho-site": "1.0.156" } } From 9e99abddc967be66cc9dc00bd0b5cddb1b36b54f Mon Sep 17 00:00:00 2001 From: Dave Falke Date: Tue, 11 Jun 2024 09:46:57 -0400 Subject: [PATCH 02/17] yarn.lock changes --- Site/yarn.lock | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/Site/yarn.lock b/Site/yarn.lock index d69003c..586a558 100644 --- a/Site/yarn.lock +++ b/Site/yarn.lock @@ -2,7 +2,14 @@ # yarn lockfile v1 -"@veupathdb/ortho-site@^1.0.49": - version "1.0.155" - resolved "https://registry.yarnpkg.com/@veupathdb/ortho-site/-/ortho-site-1.0.155.tgz#b2a3ba285000e4c9d08a9acd7aac72e9595e1a8a" - integrity sha512-KjdknDNlgWylopOo8yNpGG+aPFyUxYAVU/WjHS1PmaFkdT3lDM8TTD7cSg9N0yy2k5xMxRTqS6KI8DlYnEF2mg== +"@veupathdb/ortho-site@1.0.156": + version "1.0.156" + resolved "https://registry.yarnpkg.com/@veupathdb/ortho-site/-/ortho-site-1.0.156.tgz#392a045591f841b95e0baa558b9c1c417ec82b18" + integrity sha512-k5I9HauDYadhQuWdewtqQ3PiHtSq/lUorrL9uoMpOrd4lkY7V9wKEEVHmm1dMqk0xLZXvjLOARv4r+Ftoizf7A== + dependencies: + patristic "^0.6.0" + +patristic@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/patristic/-/patristic-0.6.0.tgz#7cb52065621d4c63a372056debf294d5244be5e2" + integrity sha512-t1r7vXgfq+aF6/REmsln0B34OuPXAflOwiRlW0zmvaPgWKNt0MhOXpYf0n+AdBcgQFvGH6f8pDDtxSiiGwr9xQ== From 47c0f5ee4eb9f62ad60bc23d5804202946148d22 Mon Sep 17 00:00:00 2001 From: Bob Date: Tue, 25 Jun 2024 12:20:52 +0100 Subject: [PATCH 03/17] upgraded to web-monorepo/orthosite 1.0.156-orthotree.1 --- Site/package.json | 2 +- Site/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Site/package.json b/Site/package.json index e974792..e975d4c 100644 --- a/Site/package.json +++ b/Site/package.json @@ -2,6 +2,6 @@ "name": "ortho-site-deployer", "private": true, "dependencies": { - "@veupathdb/ortho-site": "1.0.156" + "@veupathdb/ortho-site": "1.0.156-orthotree.1" } } diff --git a/Site/yarn.lock b/Site/yarn.lock index 586a558..b9eeb4f 100644 --- a/Site/yarn.lock +++ b/Site/yarn.lock @@ -2,10 +2,10 @@ # yarn lockfile v1 -"@veupathdb/ortho-site@1.0.156": - version "1.0.156" - resolved "https://registry.yarnpkg.com/@veupathdb/ortho-site/-/ortho-site-1.0.156.tgz#392a045591f841b95e0baa558b9c1c417ec82b18" - integrity sha512-k5I9HauDYadhQuWdewtqQ3PiHtSq/lUorrL9uoMpOrd4lkY7V9wKEEVHmm1dMqk0xLZXvjLOARv4r+Ftoizf7A== +"@veupathdb/ortho-site@1.0.156-orthotree.1": + version "1.0.156-orthotree.1" + resolved "https://registry.yarnpkg.com/@veupathdb/ortho-site/-/ortho-site-1.0.156-orthotree.1.tgz#599a1807e34774f9481bacbf9ed0961c39eb585e" + integrity sha512-Nlkb/9Ofj6wUt4oA8bgk8pVADjT8Gba77mdZeN5V4WyQRjUuIoIHtoYMKA06PoP35VOsAN+dpP61Rc/sbaLnbg== dependencies: patristic "^0.6.0" From 279f24d11e22a3573328d49cf5882c4da5a7eabb Mon Sep 17 00:00:00 2001 From: Bob Date: Thu, 18 Jul 2024 13:05:04 +0100 Subject: [PATCH 04/17] update frontend to 1.0.162-orthotree.2 --- Site/package.json | 2 +- Site/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Site/package.json b/Site/package.json index e975d4c..95c68ca 100644 --- a/Site/package.json +++ b/Site/package.json @@ -2,6 +2,6 @@ "name": "ortho-site-deployer", "private": true, "dependencies": { - "@veupathdb/ortho-site": "1.0.156-orthotree.1" + "@veupathdb/ortho-site": "1.0.162-orthotree.2" } } diff --git a/Site/yarn.lock b/Site/yarn.lock index b9eeb4f..b00cd13 100644 --- a/Site/yarn.lock +++ b/Site/yarn.lock @@ -2,10 +2,10 @@ # yarn lockfile v1 -"@veupathdb/ortho-site@1.0.156-orthotree.1": - version "1.0.156-orthotree.1" - resolved "https://registry.yarnpkg.com/@veupathdb/ortho-site/-/ortho-site-1.0.156-orthotree.1.tgz#599a1807e34774f9481bacbf9ed0961c39eb585e" - integrity sha512-Nlkb/9Ofj6wUt4oA8bgk8pVADjT8Gba77mdZeN5V4WyQRjUuIoIHtoYMKA06PoP35VOsAN+dpP61Rc/sbaLnbg== +"@veupathdb/ortho-site@1.0.162-orthotree.2": + version "1.0.162-orthotree.2" + resolved "https://registry.yarnpkg.com/@veupathdb/ortho-site/-/ortho-site-1.0.162-orthotree.2.tgz#8539520f88875c2c27417a4ef63d3a212e9abbda" + integrity sha512-re8Yhn4h7KvTuEMlRIsmm/vinXJtNQz7FiXixykhgxSs87lU42P7oHj1ALB2IkKBwR4Cn8FSoxYLGEvrSZTRLg== dependencies: patristic "^0.6.0" From cd65b945cfa5c2e1a455845a8c581c2cae46fee2 Mon Sep 17 00:00:00 2001 From: Bob Date: Fri, 19 Jul 2024 19:37:08 +0100 Subject: [PATCH 05/17] update to orthotree.3 --- Site/package.json | 2 +- Site/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Site/package.json b/Site/package.json index 95c68ca..2d6bbbe 100644 --- a/Site/package.json +++ b/Site/package.json @@ -2,6 +2,6 @@ "name": "ortho-site-deployer", "private": true, "dependencies": { - "@veupathdb/ortho-site": "1.0.162-orthotree.2" + "@veupathdb/ortho-site": "1.0.162-orthotree.3" } } diff --git a/Site/yarn.lock b/Site/yarn.lock index b00cd13..a6a84aa 100644 --- a/Site/yarn.lock +++ b/Site/yarn.lock @@ -2,10 +2,10 @@ # yarn lockfile v1 -"@veupathdb/ortho-site@1.0.162-orthotree.2": - version "1.0.162-orthotree.2" - resolved "https://registry.yarnpkg.com/@veupathdb/ortho-site/-/ortho-site-1.0.162-orthotree.2.tgz#8539520f88875c2c27417a4ef63d3a212e9abbda" - integrity sha512-re8Yhn4h7KvTuEMlRIsmm/vinXJtNQz7FiXixykhgxSs87lU42P7oHj1ALB2IkKBwR4Cn8FSoxYLGEvrSZTRLg== +"@veupathdb/ortho-site@1.0.162-orthotree.3": + version "1.0.162-orthotree.3" + resolved "https://registry.yarnpkg.com/@veupathdb/ortho-site/-/ortho-site-1.0.162-orthotree.3.tgz#80852363fc3f0d58be1c2656cea62dc4c2469ecf" + integrity sha512-3pX3Fv+4C/I7ckp85Z2WZ1KjM9ckJ76ZOWuFZ9gKW2TQk1idYHNRngz8M3Ipa0EBStGS+QUapi9IigMeiftVBw== dependencies: patristic "^0.6.0" From 61e4ac27b55da4b1b18bc2233c69265b49062c35 Mon Sep 17 00:00:00 2001 From: Bob MacCallum Date: Sat, 3 Aug 2024 16:41:24 +0100 Subject: [PATCH 06/17] bump to web-monorepo v1.0.162-orthotree.5 --- Site/package.json | 2 +- Site/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Site/package.json b/Site/package.json index 2d6bbbe..062b5c0 100644 --- a/Site/package.json +++ b/Site/package.json @@ -2,6 +2,6 @@ "name": "ortho-site-deployer", "private": true, "dependencies": { - "@veupathdb/ortho-site": "1.0.162-orthotree.3" + "@veupathdb/ortho-site": "1.0.162-orthotree.5" } } diff --git a/Site/yarn.lock b/Site/yarn.lock index a6a84aa..d7251a6 100644 --- a/Site/yarn.lock +++ b/Site/yarn.lock @@ -2,10 +2,10 @@ # yarn lockfile v1 -"@veupathdb/ortho-site@1.0.162-orthotree.3": - version "1.0.162-orthotree.3" - resolved "https://registry.yarnpkg.com/@veupathdb/ortho-site/-/ortho-site-1.0.162-orthotree.3.tgz#80852363fc3f0d58be1c2656cea62dc4c2469ecf" - integrity sha512-3pX3Fv+4C/I7ckp85Z2WZ1KjM9ckJ76ZOWuFZ9gKW2TQk1idYHNRngz8M3Ipa0EBStGS+QUapi9IigMeiftVBw== +"@veupathdb/ortho-site@1.0.162-orthotree.5": + version "1.0.162-orthotree.5" + resolved "https://registry.yarnpkg.com/@veupathdb/ortho-site/-/ortho-site-1.0.162-orthotree.5.tgz#faf4b78585d8cbbc3e277efdb75fc24770f1eb2c" + integrity sha512-4IHcWmnS1iGd8dkbfh0Ws/tnFfkAP4RJKdCKzECSwXFZ3+PgWtqGNQ31lxrth73sn4kGfs13bUtGVZ5m8N0TFw== dependencies: patristic "^0.6.0" From edda834832817e604ecd8b9551b95570bbb890da Mon Sep 17 00:00:00 2001 From: Bob Date: Wed, 14 Aug 2024 15:27:56 +0100 Subject: [PATCH 07/17] update to v1.1.7-orthotree.6 --- Site/package.json | 2 +- Site/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Site/package.json b/Site/package.json index 062b5c0..bf06555 100644 --- a/Site/package.json +++ b/Site/package.json @@ -2,6 +2,6 @@ "name": "ortho-site-deployer", "private": true, "dependencies": { - "@veupathdb/ortho-site": "1.0.162-orthotree.5" + "@veupathdb/ortho-site": "1.1.7-orthotree.6" } } diff --git a/Site/yarn.lock b/Site/yarn.lock index d7251a6..fcb3330 100644 --- a/Site/yarn.lock +++ b/Site/yarn.lock @@ -2,10 +2,10 @@ # yarn lockfile v1 -"@veupathdb/ortho-site@1.0.162-orthotree.5": - version "1.0.162-orthotree.5" - resolved "https://registry.yarnpkg.com/@veupathdb/ortho-site/-/ortho-site-1.0.162-orthotree.5.tgz#faf4b78585d8cbbc3e277efdb75fc24770f1eb2c" - integrity sha512-4IHcWmnS1iGd8dkbfh0Ws/tnFfkAP4RJKdCKzECSwXFZ3+PgWtqGNQ31lxrth73sn4kGfs13bUtGVZ5m8N0TFw== +"@veupathdb/ortho-site@1.1.7-orthotree.6": + version "1.1.7-orthotree.6" + resolved "https://registry.yarnpkg.com/@veupathdb/ortho-site/-/ortho-site-1.1.7-orthotree.6.tgz#56f650021efba82a15938310c34c07f04d7c53ee" + integrity sha512-P1N0QZi17eI3V+6va+v3hmb7xYOmLf6ZwLKxTUaWXCl5dvgj5C53Nn0f+MQG6p1AQdUIUQWyjedSwPqJ0+qJug== dependencies: patristic "^0.6.0" From 5f84d41487d93412ac4d6260509b145e0e99deed Mon Sep 17 00:00:00 2001 From: Bob Date: Fri, 30 Aug 2024 14:07:13 +0100 Subject: [PATCH 08/17] upped to v1.1.10-orthotree.7 --- Site/package.json | 2 +- Site/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Site/package.json b/Site/package.json index bf06555..de9fb4c 100644 --- a/Site/package.json +++ b/Site/package.json @@ -2,6 +2,6 @@ "name": "ortho-site-deployer", "private": true, "dependencies": { - "@veupathdb/ortho-site": "1.1.7-orthotree.6" + "@veupathdb/ortho-site": "1.1.10-orthotree.7" } } diff --git a/Site/yarn.lock b/Site/yarn.lock index fcb3330..11dd9df 100644 --- a/Site/yarn.lock +++ b/Site/yarn.lock @@ -2,10 +2,10 @@ # yarn lockfile v1 -"@veupathdb/ortho-site@1.1.7-orthotree.6": - version "1.1.7-orthotree.6" - resolved "https://registry.yarnpkg.com/@veupathdb/ortho-site/-/ortho-site-1.1.7-orthotree.6.tgz#56f650021efba82a15938310c34c07f04d7c53ee" - integrity sha512-P1N0QZi17eI3V+6va+v3hmb7xYOmLf6ZwLKxTUaWXCl5dvgj5C53Nn0f+MQG6p1AQdUIUQWyjedSwPqJ0+qJug== +"@veupathdb/ortho-site@1.1.10-orthotree.7": + version "1.1.10-orthotree.7" + resolved "https://registry.yarnpkg.com/@veupathdb/ortho-site/-/ortho-site-1.1.10-orthotree.7.tgz#708e45b80900106b0efee9da8a1617bfd77d31c0" + integrity sha512-r1s4MQttJkRaX4tezJPXLMVivomMh7M7H3xhN4IFxB3avQReMauZ8eEfFmzMSojoYMgNAb3yUGj/r1IjZMzpDw== dependencies: patristic "^0.6.0" From 68506a74fb7a877d149f2d2c3e7a6c40bad09b2b Mon Sep 17 00:00:00 2001 From: Bob Date: Thu, 26 Sep 2024 12:09:36 +0100 Subject: [PATCH 09/17] use latest ortho web code with hidden section control --- Site/package.json | 2 +- Site/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Site/package.json b/Site/package.json index de9fb4c..d236039 100644 --- a/Site/package.json +++ b/Site/package.json @@ -2,6 +2,6 @@ "name": "ortho-site-deployer", "private": true, "dependencies": { - "@veupathdb/ortho-site": "1.1.10-orthotree.7" + "@veupathdb/ortho-site": "1.1.10-orthotree.10" } } diff --git a/Site/yarn.lock b/Site/yarn.lock index 11dd9df..f451304 100644 --- a/Site/yarn.lock +++ b/Site/yarn.lock @@ -2,10 +2,10 @@ # yarn lockfile v1 -"@veupathdb/ortho-site@1.1.10-orthotree.7": - version "1.1.10-orthotree.7" - resolved "https://registry.yarnpkg.com/@veupathdb/ortho-site/-/ortho-site-1.1.10-orthotree.7.tgz#708e45b80900106b0efee9da8a1617bfd77d31c0" - integrity sha512-r1s4MQttJkRaX4tezJPXLMVivomMh7M7H3xhN4IFxB3avQReMauZ8eEfFmzMSojoYMgNAb3yUGj/r1IjZMzpDw== +"@veupathdb/ortho-site@1.1.10-orthotree.10": + version "1.1.10-orthotree.10" + resolved "https://registry.yarnpkg.com/@veupathdb/ortho-site/-/ortho-site-1.1.10-orthotree.10.tgz#b2df704af17f3851a9fb72f15cfd9b23c0f1c52f" + integrity sha512-Osb05ckYXdi/utS6NLu25SFtb6CqrIut8dWRzvZtaCV5kV9/z1Sdc3UPf26esQ5zbyhw7tk+5DoSdtooxgzQRw== dependencies: patristic "^0.6.0" From 1eac936f1b5172bdb4cec5703fd74153cd5d092a Mon Sep 17 00:00:00 2001 From: Dave Falke Date: Fri, 18 Oct 2024 13:57:46 -0400 Subject: [PATCH 10/17] Add expected ant target, which fixed using `wb site`. --- build.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build.xml b/build.xml index 82c5c80..9d7434c 100644 --- a/build.xml +++ b/build.xml @@ -19,7 +19,9 @@ + OrthoMCLService-WebInstallation, + OrthoMCLWebsite/Site-WebInstallation"/> + From bf0beb47f47dc770c1bfb5b9ffa71fbfbdc61697 Mon Sep 17 00:00:00 2001 From: Dave Falke Date: Fri, 18 Oct 2024 14:57:33 -0400 Subject: [PATCH 11/17] upgrade client package --- Site/package.json | 2 +- Site/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Site/package.json b/Site/package.json index d236039..5454780 100644 --- a/Site/package.json +++ b/Site/package.json @@ -2,6 +2,6 @@ "name": "ortho-site-deployer", "private": true, "dependencies": { - "@veupathdb/ortho-site": "1.1.10-orthotree.10" + "@veupathdb/ortho-site": "1.1.10-orthotree.11" } } diff --git a/Site/yarn.lock b/Site/yarn.lock index f451304..283befd 100644 --- a/Site/yarn.lock +++ b/Site/yarn.lock @@ -2,10 +2,10 @@ # yarn lockfile v1 -"@veupathdb/ortho-site@1.1.10-orthotree.10": - version "1.1.10-orthotree.10" - resolved "https://registry.yarnpkg.com/@veupathdb/ortho-site/-/ortho-site-1.1.10-orthotree.10.tgz#b2df704af17f3851a9fb72f15cfd9b23c0f1c52f" - integrity sha512-Osb05ckYXdi/utS6NLu25SFtb6CqrIut8dWRzvZtaCV5kV9/z1Sdc3UPf26esQ5zbyhw7tk+5DoSdtooxgzQRw== +"@veupathdb/ortho-site@1.1.10-orthotree.11": + version "1.1.10-orthotree.11" + resolved "https://registry.yarnpkg.com/@veupathdb/ortho-site/-/ortho-site-1.1.10-orthotree.11.tgz#17b9929d5076f6e0b3d8eaa6a1b3a6be061f8a61" + integrity sha512-rKVzipxOxTYqxadMK1GjzmvfOlqKuTMMWAVbYtZ3BnaWEgMoyLSPnSS64Gp5EsyuIn4yPtgqyX+npw9s5vUBiw== dependencies: patristic "^0.6.0" From 27a2760ec0e1b0cf6fce9b72ce8dd99d77514d0b Mon Sep 17 00:00:00 2001 From: Dave Falke Date: Tue, 22 Oct 2024 15:56:34 -0400 Subject: [PATCH 12/17] upgrade client package --- Site/package.json | 2 +- Site/yarn.lock | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Site/package.json b/Site/package.json index d004902..04cec6b 100644 --- a/Site/package.json +++ b/Site/package.json @@ -3,6 +3,6 @@ "private": true, "dependencies": { - "@veupathdb/ortho-site": "1.1.10-orthotree.11" + "@veupathdb/ortho-site": "1.1.10-orthotree.12" } } diff --git a/Site/yarn.lock b/Site/yarn.lock index c1cb906..08ce98b 100644 --- a/Site/yarn.lock +++ b/Site/yarn.lock @@ -2,11 +2,10 @@ # yarn lockfile v1 - -"@veupathdb/ortho-site@1.1.10-orthotree.11": - version "1.1.10-orthotree.11" - resolved "https://registry.yarnpkg.com/@veupathdb/ortho-site/-/ortho-site-1.1.10-orthotree.11.tgz#17b9929d5076f6e0b3d8eaa6a1b3a6be061f8a61" - integrity sha512-rKVzipxOxTYqxadMK1GjzmvfOlqKuTMMWAVbYtZ3BnaWEgMoyLSPnSS64Gp5EsyuIn4yPtgqyX+npw9s5vUBiw== +"@veupathdb/ortho-site@1.1.10-orthotree.12": + version "1.1.10-orthotree.12" + resolved "https://registry.yarnpkg.com/@veupathdb/ortho-site/-/ortho-site-1.1.10-orthotree.12.tgz#fdc3896ee4c44bda7b51e26bfce0f309205da10f" + integrity sha512-H47dFs09oFykyR8aHDgFsC6WePWvH4UyVXa+xAZCXpMB7A3VXqJ+k625gCiF2GYgDrQwWwT7+a6SJ5rgbrxUoA== dependencies: patristic "^0.6.0" From cc2636ea931d4f631c5114b4b91148c4cd1a5186 Mon Sep 17 00:00:00 2001 From: Dave Falke Date: Tue, 22 Oct 2024 16:58:08 -0400 Subject: [PATCH 13/17] upgrade client package --- Site/package.json | 2 +- Site/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Site/package.json b/Site/package.json index 04cec6b..31a996c 100644 --- a/Site/package.json +++ b/Site/package.json @@ -3,6 +3,6 @@ "private": true, "dependencies": { - "@veupathdb/ortho-site": "1.1.10-orthotree.12" + "@veupathdb/ortho-site": "1.1.10-orthotree.13" } } diff --git a/Site/yarn.lock b/Site/yarn.lock index 08ce98b..2b6844d 100644 --- a/Site/yarn.lock +++ b/Site/yarn.lock @@ -2,10 +2,10 @@ # yarn lockfile v1 -"@veupathdb/ortho-site@1.1.10-orthotree.12": - version "1.1.10-orthotree.12" - resolved "https://registry.yarnpkg.com/@veupathdb/ortho-site/-/ortho-site-1.1.10-orthotree.12.tgz#fdc3896ee4c44bda7b51e26bfce0f309205da10f" - integrity sha512-H47dFs09oFykyR8aHDgFsC6WePWvH4UyVXa+xAZCXpMB7A3VXqJ+k625gCiF2GYgDrQwWwT7+a6SJ5rgbrxUoA== +"@veupathdb/ortho-site@1.1.10-orthotree.13": + version "1.1.10-orthotree.13" + resolved "https://registry.yarnpkg.com/@veupathdb/ortho-site/-/ortho-site-1.1.10-orthotree.13.tgz#ba3abff77d983828f722072cad2478f583893487" + integrity sha512-3etyyt//IX8ZA22rmh4egfVeVNqFIb6r/nJqA4wH6CHP1tuhaum5K0ekUcC2dydrbkR0/YBWTuYQ+sryjK7z9w== dependencies: patristic "^0.6.0" From 394a18e4fe5b4d7cb4bb5cbfa2f6778a0d5ec8ac Mon Sep 17 00:00:00 2001 From: Dave Falke Date: Wed, 30 Oct 2024 09:24:34 -0400 Subject: [PATCH 14/17] upgrade client package --- Site/package.json | 2 +- Site/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Site/package.json b/Site/package.json index 31a996c..34b408d 100644 --- a/Site/package.json +++ b/Site/package.json @@ -3,6 +3,6 @@ "private": true, "dependencies": { - "@veupathdb/ortho-site": "1.1.10-orthotree.13" + "@veupathdb/ortho-site": "1.1.10-orthotree.14" } } diff --git a/Site/yarn.lock b/Site/yarn.lock index 2b6844d..dc8d08c 100644 --- a/Site/yarn.lock +++ b/Site/yarn.lock @@ -2,10 +2,10 @@ # yarn lockfile v1 -"@veupathdb/ortho-site@1.1.10-orthotree.13": - version "1.1.10-orthotree.13" - resolved "https://registry.yarnpkg.com/@veupathdb/ortho-site/-/ortho-site-1.1.10-orthotree.13.tgz#ba3abff77d983828f722072cad2478f583893487" - integrity sha512-3etyyt//IX8ZA22rmh4egfVeVNqFIb6r/nJqA4wH6CHP1tuhaum5K0ekUcC2dydrbkR0/YBWTuYQ+sryjK7z9w== +"@veupathdb/ortho-site@1.1.10-orthotree.14": + version "1.1.10-orthotree.14" + resolved "https://registry.yarnpkg.com/@veupathdb/ortho-site/-/ortho-site-1.1.10-orthotree.14.tgz#d0f3b7dc008f3f39d034263d3a12af688bd0a8e1" + integrity sha512-fqJgiWpcRds/a80mARM/QAKUgT/tbryG+feciFdBXF93bSPyIcfiU+Vz56A4B+NL/6QmGw9f74eNdx4HIQCYRw== dependencies: patristic "^0.6.0" From 83347db5d0d7456882373e5502adae0cff3cbbc6 Mon Sep 17 00:00:00 2001 From: Dave Falke Date: Fri, 1 Nov 2024 10:23:16 -0400 Subject: [PATCH 15/17] upgrade client package --- Site/package.json | 2 +- Site/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Site/package.json b/Site/package.json index 34b408d..9ed52b7 100644 --- a/Site/package.json +++ b/Site/package.json @@ -3,6 +3,6 @@ "private": true, "dependencies": { - "@veupathdb/ortho-site": "1.1.10-orthotree.14" + "@veupathdb/ortho-site": "1.1.10-orthotree.15" } } diff --git a/Site/yarn.lock b/Site/yarn.lock index dc8d08c..ca0d551 100644 --- a/Site/yarn.lock +++ b/Site/yarn.lock @@ -2,10 +2,10 @@ # yarn lockfile v1 -"@veupathdb/ortho-site@1.1.10-orthotree.14": - version "1.1.10-orthotree.14" - resolved "https://registry.yarnpkg.com/@veupathdb/ortho-site/-/ortho-site-1.1.10-orthotree.14.tgz#d0f3b7dc008f3f39d034263d3a12af688bd0a8e1" - integrity sha512-fqJgiWpcRds/a80mARM/QAKUgT/tbryG+feciFdBXF93bSPyIcfiU+Vz56A4B+NL/6QmGw9f74eNdx4HIQCYRw== +"@veupathdb/ortho-site@1.1.10-orthotree.15": + version "1.1.10-orthotree.15" + resolved "https://registry.yarnpkg.com/@veupathdb/ortho-site/-/ortho-site-1.1.10-orthotree.15.tgz#47ed2e27bdf9a1e3602d051820cba2484f0e8f8a" + integrity sha512-VgctYF44V43ODhzKB8V8mviIK7o5mqR8oswIWsQ4KmgjeRkaGPAYHoCMT2COV2RaPdoqS6mieWUe7nBP5+7zrQ== dependencies: patristic "^0.6.0" From 3214be02e404e1734890bdd1945e1eefb7f62f83 Mon Sep 17 00:00:00 2001 From: Dave Falke Date: Sun, 10 Nov 2024 14:04:07 -0500 Subject: [PATCH 16/17] upgrade client package --- Site/package.json | 3 +-- Site/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Site/package.json b/Site/package.json index 9ed52b7..14f0f5d 100644 --- a/Site/package.json +++ b/Site/package.json @@ -2,7 +2,6 @@ "name": "ortho-site-deployer", "private": true, "dependencies": { - - "@veupathdb/ortho-site": "1.1.10-orthotree.15" + "@veupathdb/ortho-site": ">=1.1.10-orthotree.1 <1.1.10" } } diff --git a/Site/yarn.lock b/Site/yarn.lock index ca0d551..76aa37a 100644 --- a/Site/yarn.lock +++ b/Site/yarn.lock @@ -2,10 +2,10 @@ # yarn lockfile v1 -"@veupathdb/ortho-site@1.1.10-orthotree.15": - version "1.1.10-orthotree.15" - resolved "https://registry.yarnpkg.com/@veupathdb/ortho-site/-/ortho-site-1.1.10-orthotree.15.tgz#47ed2e27bdf9a1e3602d051820cba2484f0e8f8a" - integrity sha512-VgctYF44V43ODhzKB8V8mviIK7o5mqR8oswIWsQ4KmgjeRkaGPAYHoCMT2COV2RaPdoqS6mieWUe7nBP5+7zrQ== +"@veupathdb/ortho-site@>=1.1.10-orthotree.1 <1.1.10": + version "1.1.10-orthotree.16" + resolved "https://registry.yarnpkg.com/@veupathdb/ortho-site/-/ortho-site-1.1.10-orthotree.16.tgz#e120daa4026e655ab267998d02fb5b3d83a149a8" + integrity sha512-ZR6KT93PL2gsHF8DbXfCJbV+VYTUBCeq5we/vkR6EUd9EBAind5Imup21YmjBdaQPDlVTkIfVcUuKUNKTXClBA== dependencies: patristic "^0.6.0" From 63e0be836fa38152bad69744907e62a599361b11 Mon Sep 17 00:00:00 2001 From: aurreco-uga Date: Wed, 13 Nov 2024 15:13:37 -0500 Subject: [PATCH 17/17] set beta.ortho on master static content --- .../vars/OrthoMCL/production/default.yml | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 Model/lib/conifer/roles/conifer/vars/OrthoMCL/production/default.yml diff --git a/Model/lib/conifer/roles/conifer/vars/OrthoMCL/production/default.yml b/Model/lib/conifer/roles/conifer/vars/OrthoMCL/production/default.yml new file mode 100644 index 0000000..1bce293 --- /dev/null +++ b/Model/lib/conifer/roles/conifer/vars/OrthoMCL/production/default.yml @@ -0,0 +1,26 @@ +# $SourceFileURL$ +--- +modelconfig_adminEmail: + - "{{ 'aurreco$uga.edu'|replace('$', '@') }}" + - "{{ 'dfalke$uga.edu'|replace('$', '@') }}" + - "{{ 'sfischer$pcbi.upenn.edu'|replace('$', '@') }}" + - "{{ 'dmgaldi$upenn.edu'|replace('$', '@') }}" + + +modelprop: + COMMUNITY_SITE: "//{{ community_env_map[prefix]|default(community_env_map['default']) }}" + + +# the below extends the w_ q_ prefix pattern used for workspace_env_map, which +# # really feels like a bad idea. please don't let this cancer spread. Find a +# # generalized way to do this in the future... +community_env_map: + w_prefix: static-content.veupathdb.org/ + b_prefix: qa.static-content.veupathdb.org/ + default: qa.static-content.veupathdb.org/ + +# construct a prefix from hostname, like w_prefix, q_prefix +prefix: "{{ hostname | regex_replace('^([a-z])[0-9].*','\\1_prefix') }}" + + +