Merge branch '17047-centos-remove-rh-python-dependencies' into master

closes #17047
Arvados-DCO-1.1-Signed-off-by: Javier Bértoli <jbertoli@curii.com>

diff --combined build/run-library.sh
index a16535654f02aeed04991143d76c0abd734d4163,f33e2c5690548775c5c5af86f4715a83ae4a2c2c..b74ef3ae3092fd81e7bc72a5dffa212d94c16a84
--- 1/build/run-library.sh
--- 2/build/run-library.sh
+++ b/build/run-library.sh
@@@ -352,6 -352,7 +352,6 @@@ test_package_presence() 
        echo "Package $full_pkgname build forced with --force-build, building"
      elif [[ "$FORMAT" == "deb" ]]; then
        declare -A dd
 -      dd[debian9]=stretch
        dd[debian10]=buster
        dd[ubuntu1604]=xenial
        dd[ubuntu1804]=bionic
@@@ -431,7 -432,9 +431,7 @@@ handle_rails_package() 
      fi
      # For some reason fpm excludes need to not start with /.
      local exclude_root="${railsdir#/}"
 -    # .git and packages are for the SSO server, which is built from its
 -    # repository root.
 -    local -a exclude_list=(.git packages tmp log coverage Capfile\* \
 +    local -a exclude_list=(tmp log coverage Capfile\* \
                             config/deploy\* config/application.yml)
      # for arvados-workbench, we need to have the (dummy) config/database.yml in the package
      if  [[ "$pkgname" != "arvados-workbench" ]]; then
@@@ -472,12 -475,7 +472,7 @@@ fpm_build_virtualenv () 
    case "$PACKAGE_TYPE" in
      python3)
          python=python3
-         if [[ "$FORMAT" != "rpm" ]]; then
-           pip=pip3
-         else
-           # In CentOS, we use a different mechanism to get the right version of pip
-           pip=pip
-         fi
+         pip=pip3
          PACKAGE_PREFIX=$PYTHON3_PKG_PREFIX
          ;;
    esac

diff --combined doc/install/install-postgresql.html.textile.liquid
index 4f5ef87b0c7183eb5aa819f3380a28b7aa42eca6,7c094257ce9a291e6211333bc32ed6caf588cd84..60afa1e24fa51b50237c308128b708d006d71d24
--- 1/doc/install/install-postgresql.html.textile.liquid
--- 2/doc/install/install-postgresql.html.textile.liquid
+++ b/doc/install/install-postgresql.html.textile.liquid
@@@ -19,18 -19,20 +19,18 @@@ h3(#centos7). CentOS 
  {% include 'note_python_sc' %}
  
  # Install PostgreSQL
-   <notextile><pre># <span class="userinput">yum install rh-postgresql95 rh-postgresql95-postgresql-contrib</span>
- ~$ <span class="userinput">scl enable rh-postgresql95 bash</span></pre></notextile>
+   <notextile><pre># <span class="userinput">yum install rh-postgresql12 rh-postgresql12-postgresql-contrib</span>
+ ~$ <span class="userinput">scl enable rh-postgresql12 bash</span></pre></notextile>
  # Initialize the database
    <notextile><pre># <span class="userinput">postgresql-setup initdb</span></pre></notextile>
  # Configure the database to accept password connections
    <notextile><pre><code># <span class="userinput">sed -ri -e 's/^(host +all +all +(127\.0\.0\.1\/32|::1\/128) +)ident$/\1md5/' /var/lib/pgsql/data/pg_hba.conf</span></code></pre></notextile>
  # Configure the database to launch at boot and start now
-   <notextile><pre># <span class="userinput">systemctl enable --now rh-postgresql95-postgresql</span></pre></notextile>
+   <notextile><pre># <span class="userinput">systemctl enable --now rh-postgresql12-postgresql</span></pre></notextile>
  
  h3(#debian). Debian or Ubuntu
  
 -Debian 8 (Jessie) and Ubuntu 16.04 (Xenial) and later versions include a sufficiently recent version of Postgres.
 -
 -Ubuntu 14.04 (Trusty) requires an updated PostgreSQL version, see "the PostgreSQL ubuntu repository":https://www.postgresql.org/download/linux/ubuntu/
 +Debian 10 (Buster) and Ubuntu 16.04 (Xenial) and later versions include a sufficiently recent version of Postgres.
  
  # Install PostgreSQL
    <notextile><pre># <span class="userinput">apt-get --no-install-recommends install postgresql postgresql-contrib</span></pre></notextile>