[arvados] updated: 2.1.0-2753-gd15f48590

[git repository hosting]

Summary of changes:
 lib/install/deps.go | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

       via  d15f485909cf84aeda62c0a843f384cb218e0125 (commit)
       via  7a58458d4a6cedc6bae454b351f1480c73df1523 (commit)
      from  a2d23c038780134c812249e74d9e6d1b7cad69b6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit d15f485909cf84aeda62c0a843f384cb218e0125
Author: Tom Clegg <tom at curii.com>
Date:   Wed Jul 20 14:42:30 2022 -0400

    17344: Drop accidental python2 dependency.
    
    debian:11 satisfies "python" with "python-is-python2".
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/lib/install/deps.go b/lib/install/deps.go
index 2c730b9a7..27b8d1dc8 100644
--- a/lib/install/deps.go
+++ b/lib/install/deps.go
@@ -860,7 +860,7 @@ func prodpkgs(osv osversion) []string {
 		"libcurl3-gnutls",
 		"libxslt1.1",
 		"nginx",
-		"python",
+		"python3",
 		"sudo",
 	}
 	if osv.Debian || osv.Ubuntu {

commit 7a58458d4a6cedc6bae454b351f1480c73df1523
Author: Tom Clegg <tom at curii.com>
Date:   Wed Jul 20 14:30:58 2022 -0400

    17344: Remove some -dev packages from runtime dependencies.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/lib/install/deps.go b/lib/install/deps.go
index 187bac4b4..2c730b9a7 100644
--- a/lib/install/deps.go
+++ b/lib/install/deps.go
@@ -190,6 +190,7 @@ func (inst *installCommand) RunCommand(prog string, args []string, stdin io.Read
 			"uuid-dev",
 			"wget",
 			"xvfb",
+			"zlib1g-dev", // services/api
 		)
 		if test {
 			if osv.Debian && osv.Major <= 10 {
@@ -204,11 +205,13 @@ func (inst *installCommand) RunCommand(prog string, args []string, stdin io.Read
 		}
 		switch {
 		case osv.Debian && osv.Major >= 11:
-			pkgs = append(pkgs, "libcurl4", "perl-modules-5.32")
+			pkgs = append(pkgs, "g++", "libcurl4", "libcurl4-openssl-dev", "perl-modules-5.32")
 		case osv.Debian && osv.Major >= 10:
-			pkgs = append(pkgs, "libcurl4", "perl-modules")
-		default:
-			pkgs = append(pkgs, "libcurl3", "perl-modules")
+			pkgs = append(pkgs, "g++", "libcurl4", "libcurl4-openssl-dev", "perl-modules")
+		case osv.Debian || osv.Ubuntu:
+			pkgs = append(pkgs, "g++", "libcurl3", "libcurl3-openssl-dev", "perl-modules")
+		case osv.Centos:
+			pkgs = append(pkgs, "gcc", "gcc-c++", "libcurl-devel", "postgresql-devel")
 		}
 		cmd := exec.CommandContext(ctx, "apt-get")
 		if inst.EatMyData {
@@ -867,21 +870,12 @@ func prodpkgs(osv osversion) []string {
 			pkgs = append(pkgs, "python3-distutils") // sdk/cwl
 		}
 		return append(pkgs,
-			"g++",
-			"libcurl4-openssl-dev", // services/api
-			"libpq-dev",
-			"libpython2.7", // services/fuse
 			"mime-support", // keep-web
-			"zlib1g-dev",   // services/api
 		)
 	} else if osv.Centos {
 		return append(pkgs,
 			"fuse-libs", // services/fuse
-			"gcc",
-			"gcc-c++",
-			"libcurl-devel",    // services/api
-			"mailcap",          // keep-web
-			"postgresql-devel", // services/api
+			"mailcap",   // keep-web
 		)
 	} else {
 		panic("os version not supported")

-----------------------------------------------------------------------


hooks/post-receive
--