Merge branch '19745-update-deps'
authorTom Clegg <tom@curii.com>
Wed, 16 Nov 2022 14:15:33 +0000 (09:15 -0500)
committerTom Clegg <tom@curii.com>
Wed, 16 Nov 2022 14:15:33 +0000 (09:15 -0500)
closes #19745

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>

1  2 
lib/install/deps.go
sdk/python/setup.py

diff --combined lib/install/deps.go
index 06b07ec6da060f982d6be87d59e16eb44038d482,8f80d763b5143f275a5ef1b815ac3b00d91fc6cd..1b4bf7266d29124dd56a92c9d9284828896cd706
@@@ -30,18 -30,18 +30,18 @@@ import 
  
  var Command cmd.Handler = &installCommand{}
  
- const goversion = "1.17.7"
+ const goversion = "1.18.8"
  
  const (
-       rubyversion             = "2.7.5"
+       rubyversion             = "2.7.6"
        bundlerversion          = "2.2.19"
        singularityversion      = "3.9.9"
        pjsversion              = "1.9.8"
        geckoversion            = "0.24.0"
        gradleversion           = "5.3.1"
-       nodejsversion           = "v12.22.11"
+       nodejsversion           = "v12.22.12"
        devtestDatabasePassword = "insecure_arvados_test"
-       workbench2version       = "2454ac35292a79594c32a80430740317ed5005cf"
+       workbench2version       = "e30e54d674c95ee15e296c71e471c1555bdc5a38" // 2.4.3
  )
  
  //go:embed arvados.service
@@@ -155,14 -155,17 +155,14 @@@ func (inst *installCommand) RunCommand(
                        "default-jre-headless",
                        "gettext",
                        "libattr1-dev",
 -                      "libcrypt-ssleay-perl",
                        "libfuse-dev",
                        "libgbm1", // cypress / workbench2 tests
                        "libgnutls28-dev",
 -                      "libjson-perl",
                        "libpam-dev",
                        "libpcre3-dev",
                        "libpq-dev",
                        "libreadline-dev",
                        "libssl-dev",
 -                      "libwww-perl",
                        "libxml2-dev",
                        "libxslt1-dev",
                        "linkchecker",
                }
                switch {
                case osv.Debian && osv.Major >= 11:
 -                      pkgs = append(pkgs, "g++", "libcurl4", "libcurl4-openssl-dev", "perl-modules-5.32")
 +                      pkgs = append(pkgs, "g++", "libcurl4", "libcurl4-openssl-dev")
                case osv.Debian && osv.Major >= 10:
 -                      pkgs = append(pkgs, "g++", "libcurl4", "libcurl4-openssl-dev", "perl-modules")
 +                      pkgs = append(pkgs, "g++", "libcurl4", "libcurl4-openssl-dev")
                case osv.Debian || osv.Ubuntu:
 -                      pkgs = append(pkgs, "g++", "libcurl3", "libcurl3-openssl-dev", "perl-modules")
 +                      pkgs = append(pkgs, "g++", "libcurl3", "libcurl3-openssl-dev")
                case osv.Centos:
                        pkgs = append(pkgs, "gcc", "gcc-c++", "libcurl-devel", "postgresql-devel")
                }
@@@ -507,6 -510,7 +507,7 @@@ setcap "cap_sys_admin+pei cap_sys_chroo
                } else {
                        err = inst.runBash(`
  NJS=`+nodejsversion+`
+ rm -rf /var/lib/arvados/node-*-linux-x64
  wget --progress=dot:giga -O- https://nodejs.org/dist/${NJS}/node-${NJS}-linux-x64.tar.xz | sudo tar -C /var/lib/arvados -xJf -
  ln -sfv /var/lib/arvados/node-${NJS}-linux-x64/bin/{node,npm} /usr/local/bin/
  `, stdout, stderr)
diff --combined sdk/python/setup.py
index 5b6ad45ed9a32218c7c5eb95a86eed6a057cc687,59d9f027c1c33de6769a6dfadff21b1ad477a986..d85e2a5cde56056416fee47ce85fa0197d6e757d
@@@ -48,16 -48,15 +48,17 @@@ setup(name='arvados-python-client'
        install_requires=[
            'ciso8601 >=2.0.0',
            'future',
+           'google-api-core <2.11.0', # 2.11.0rc1 is incompatible with google-auth<2
            'google-api-python-client >=1.6.2, <2',
            'google-auth<2',
            'httplib2 >=0.9.2, <0.20.2',
            'pycurl >=7.19.5.1, <7.45.0',
 -          'ruamel.yaml >=0.15.54, <0.17.11',
 +          'ruamel.yaml >=0.15.54, <0.17.22',
            'setuptools',
            'ws4py >=0.4.2',
 -          'protobuf<4.0.0dev'
 +          'protobuf<4.0.0dev',
 +          'pyparsing<3',
 +          'setuptools>=40.3.0',
        ],
        classifiers=[
            'Programming Language :: Python :: 3',