1. devstack
  2. Commit 16bccbcea410ce426f83b5086424080b5bfaf925
Browse code

Revert "install LIBS_FROM_GIT using python 2 and 3 where appropriate"

All the OpenStack projects should be able to run under Python 3 now so
the fallback installation of the Python 2 libraries should not be
needed any longer. This also avoids the problem of script files
installed by the libraries sometimes being overwritten by the Python 2
version leading to incorrect execution later, as discussed in
http://lists.openstack.org/pipermail/openstack-discuss/2019-September/009226.html

This reverts commit a2eb89417fbb6d61526b1819cbe3d0a60537eedd.

Change-Id: I1cdb7e4a209872f1620be556b7278879a4b86df5

Peter Penchev authored on 2019/09/09 21:14:11
Showing 1 changed files
inc/python
History View file @ 16bccbc
... ... 
@@ -380,16 +380,6 @@ function setup_dev_lib {
380 380 
     fi
381 381 
     local name=$1
382 382 
     local dir=${GITDIR[$name]}
383 
-    if python3_enabled; then
384 
-        # Turn off Python 3 mode and install the package again,
385 
-        # forcing a Python 2 installation. This ensures that all libs
386 
-        # being used for development are installed under both versions
387 
-        # of Python.
388 
-        echo "Installing $name again without Python 3 enabled"
389 
-        USE_PYTHON3=False
390 
-        setup_develop $bindep $dir
391 
-        USE_PYTHON3=True
392 
-    fi
393 383 
     setup_develop $bindep $dir
394 384 
 }
395 385