bootstrap: use separate requirements file for py3

Because pip-compile produces different set of packages
for different python versions it needs to have
a dedicated requirements.txt for py2 and py3.

Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>

diff --git a/bootstrap b/bootstrap
index 65a932ae75a49868582d81bd3c66e237e69ae0dd..d2cb94265c67164d688467cb1ce70b439273405e 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -133,6 +133,10 @@ if [ -z "$NO_CLOBBER" ] || [ ! -e ./$VENV ]; then
     virtualenv --python=$PYTHON --setuptools $VENV
 fi
 
+PVER=$(./$VENV/bin/python --version 2>&1 | grep Python)
+LVER=${PVER#* }
+SVER=${LVER%%.*}
+
 # Upgrade pip first
 ./$VENV/bin/pip install --upgrade pip
 
@@ -140,7 +144,7 @@ fi
 ./$VENV/bin/pip install setuptools --upgrade
 
 # Install all requirements
-./$VENV/bin/pip install --upgrade -r requirements.txt
+./$VENV/bin/pip install --upgrade -r requirements${SVER}.txt
 
 # Check to make sure requirements are met
 ./$VENV/bin/pip check

diff --git a/requirements.txt b/requirements.txt
deleted file mode 100644 (file)
index 169f298..0000000
--- a/requirements.txt
+++ /dev/null
@@ -1,111 +0,0 @@
-#
-# This file is autogenerated by pip-compile
-# To update, run:
-#
-#    pip-compile
-#
-ansible==2.8.2
-apache-libcloud==2.6.0
-appdirs==1.4.3            # via os-client-config
-argparse==1.4.0
-asn1crypto==0.22.0        # via cryptography
-atomicwrites==1.1.5       # via pytest
-attrs==18.1.0             # via pytest
-babel==2.4.0              # via osc-lib, oslo.i18n, python-cinderclient, python-glanceclient, python-neutronclient, python-novaclient, python-openstackclient
-backports.ssl-match-hostname==3.5.0.1
-bcrypt==3.1.6             # via paramiko
-beanstalkc3==0.4.0
-boto3==1.9.161
-boto==2.46.1
-botocore==1.12.161        # via boto3, s3transfer
-certifi==2019.3.9         # via requests
-cffi==1.10.0              # via bcrypt, cryptography, pynacl
-chardet==3.0.4            # via requests
-click==6.7                # via pip-tools
-cliff==2.5.0              # via osc-lib, python-neutronclient, python-openstackclient
-cmd2==0.7.0               # via cliff
-configobj==5.0.6
-configparser==3.5.0
-contextlib2==0.5.4        # via raven
-cryptography==2.7         # via ansible, paramiko, pyopenssl
-debtcollector==1.13.0     # via oslo.config, oslo.utils, python-keystoneclient, python-neutronclient
-deprecation==1.0          # via openstacksdk
-docopt==0.6.2
-docutils==0.14            # via botocore
-enum34==1.1.6             # via cryptography
-first==2.0.1              # via pip-tools
-funcsigs==1.0.2           # via debtcollector, oslo.utils, pytest
-functools32==3.2.3.post2  # via jsonschema
-futures==3.2.0            # via s3transfer
-gevent==1.4.0
-greenlet==0.4.15          # via gevent
-httplib2==0.10.3
-idna==2.5                 # via requests
-ipaddress==1.0.18         # via cryptography
-iso8601==0.1.11           # via keystoneauth1, oslo.utils, python-neutronclient, python-novaclient
-jinja2==2.10.1            # via ansible
-jmespath==0.9.4           # via boto3, botocore
-jsonpatch==1.15           # via warlock
-jsonpointer==1.10         # via jsonpatch
-jsonschema==2.6.0         # via warlock
-keystoneauth1==2.19.0     # via openstacksdk, os-client-config, osc-lib, python-cinderclient, python-glanceclient, python-keystoneclient, python-neutronclient, python-novaclient, python-openstackclient
-manhole==1.3.0
-markupsafe==1.0           # via jinja2
-monotonic==1.3            # via oslo.utils
-more-itertools==4.3.0     # via pytest
-msgpack-python==0.4.8     # via oslo.serialization
-mysqlclient==1.4.2
-ndg-httpsclient==0.4.2
-netaddr==0.7.19           # via oslo.config, oslo.utils, python-neutronclient
-netifaces==0.10.5         # via oslo.utils
-nose==1.3.7
-openstacksdk==0.9.15      # via python-openstackclient
-os-client-config==1.26.0  # via openstacksdk, osc-lib, python-neutronclient
-osc-lib==1.3.0            # via python-neutronclient, python-openstackclient
-oslo.config==3.24.0       # via python-keystoneclient
-oslo.i18n==3.15.0         # via osc-lib, oslo.config, oslo.utils, python-cinderclient, python-glanceclient, python-keystoneclient, python-neutronclient, python-novaclient, python-openstackclient
-oslo.serialization==2.18.0  # via python-keystoneclient, python-neutronclient, python-novaclient
-oslo.utils==3.25.0        # via osc-lib, oslo.serialization, python-cinderclient, python-glanceclient, python-keystoneclient, python-neutronclient, python-novaclient, python-openstackclient
-paramiko==2.4.2
-pathlib2==2.3.2           # via pytest
-pbr==2.0.0                # via cliff, debtcollector, keystoneauth1, openstacksdk, osc-lib, oslo.i18n, oslo.serialization, oslo.utils, positional, python-cinderclient, python-glanceclient, python-keystoneclient, python-neutronclient, python-novaclient, python-openstackclient, requestsexceptions, stevedore
-pexpect==4.2.1
-pip-tools==1.10.1
-pluggy==0.7.1             # via pytest, tox
-positional==1.1.1         # via keystoneauth1, python-keystoneclient
-prettytable==0.7.2
-psutil==5.2.2
-ptyprocess==0.5.1         # via pexpect
-py==1.5.3                 # via pytest, tox
-pyasn1==0.2.3
-pycparser==2.17           # via cffi
-pyjwt==1.7.1
-pynacl==1.3.0             # via paramiko
-pyopenssl==19.0.0
-pyparsing==2.2.0          # via cliff, cmd2, oslo.utils
-pytest==3.7.1
-python-cinderclient==2.0.1  # via python-openstackclient
-python-dateutil==2.6.0
-python-glanceclient==2.6.0  # via python-openstackclient
-python-keystoneclient==3.10.0  # via python-neutronclient, python-openstackclient
-python-neutronclient==6.2.0
-python-novaclient==8.0.0
-python-openstackclient==3.9.0
-pytz==2017.2              # via babel, oslo.serialization, oslo.utils
-PyYAML==5.1.2
-raven==6.0.0
-requests==2.22.0
-requestsexceptions==1.2.0  # via os-client-config
-rfc3986==0.4.1            # via oslo.config
-s3transfer==0.2.1         # via boto3
-scandir==1.8              # via pathlib2
-simplejson==3.10.0        # via osc-lib, python-cinderclient, python-neutronclient, python-novaclient
-six==1.10.0
-stevedore==1.21.0         # via cliff, keystoneauth1, openstacksdk, osc-lib, oslo.config, python-keystoneclient
-tox==3.0.0
-unicodecsv==0.14.1        # via cliff
-urllib3==1.25.3           # via botocore, requests
-virtualenv==15.1.0        # via tox
-warlock==1.2.0            # via python-glanceclient
-wrapt==1.10.10            # via debtcollector, positional, python-glanceclient
-xmltodict==0.12.0

diff --git a/requirements2.txt b/requirements2.txt
new file mode 100644 (file)
index 0000000..169f298
--- /dev/null
+++ b/requirements2.txt
@@ -0,0 +1,111 @@
+#
+# This file is autogenerated by pip-compile
+# To update, run:
+#
+#    pip-compile
+#
+ansible==2.8.2
+apache-libcloud==2.6.0
+appdirs==1.4.3            # via os-client-config
+argparse==1.4.0
+asn1crypto==0.22.0        # via cryptography
+atomicwrites==1.1.5       # via pytest
+attrs==18.1.0             # via pytest
+babel==2.4.0              # via osc-lib, oslo.i18n, python-cinderclient, python-glanceclient, python-neutronclient, python-novaclient, python-openstackclient
+backports.ssl-match-hostname==3.5.0.1
+bcrypt==3.1.6             # via paramiko
+beanstalkc3==0.4.0
+boto3==1.9.161
+boto==2.46.1
+botocore==1.12.161        # via boto3, s3transfer
+certifi==2019.3.9         # via requests
+cffi==1.10.0              # via bcrypt, cryptography, pynacl
+chardet==3.0.4            # via requests
+click==6.7                # via pip-tools
+cliff==2.5.0              # via osc-lib, python-neutronclient, python-openstackclient
+cmd2==0.7.0               # via cliff
+configobj==5.0.6
+configparser==3.5.0
+contextlib2==0.5.4        # via raven
+cryptography==2.7         # via ansible, paramiko, pyopenssl
+debtcollector==1.13.0     # via oslo.config, oslo.utils, python-keystoneclient, python-neutronclient
+deprecation==1.0          # via openstacksdk
+docopt==0.6.2
+docutils==0.14            # via botocore
+enum34==1.1.6             # via cryptography
+first==2.0.1              # via pip-tools
+funcsigs==1.0.2           # via debtcollector, oslo.utils, pytest
+functools32==3.2.3.post2  # via jsonschema
+futures==3.2.0            # via s3transfer
+gevent==1.4.0
+greenlet==0.4.15          # via gevent
+httplib2==0.10.3
+idna==2.5                 # via requests
+ipaddress==1.0.18         # via cryptography
+iso8601==0.1.11           # via keystoneauth1, oslo.utils, python-neutronclient, python-novaclient
+jinja2==2.10.1            # via ansible
+jmespath==0.9.4           # via boto3, botocore
+jsonpatch==1.15           # via warlock
+jsonpointer==1.10         # via jsonpatch
+jsonschema==2.6.0         # via warlock
+keystoneauth1==2.19.0     # via openstacksdk, os-client-config, osc-lib, python-cinderclient, python-glanceclient, python-keystoneclient, python-neutronclient, python-novaclient, python-openstackclient
+manhole==1.3.0
+markupsafe==1.0           # via jinja2
+monotonic==1.3            # via oslo.utils
+more-itertools==4.3.0     # via pytest
+msgpack-python==0.4.8     # via oslo.serialization
+mysqlclient==1.4.2
+ndg-httpsclient==0.4.2
+netaddr==0.7.19           # via oslo.config, oslo.utils, python-neutronclient
+netifaces==0.10.5         # via oslo.utils
+nose==1.3.7
+openstacksdk==0.9.15      # via python-openstackclient
+os-client-config==1.26.0  # via openstacksdk, osc-lib, python-neutronclient
+osc-lib==1.3.0            # via python-neutronclient, python-openstackclient
+oslo.config==3.24.0       # via python-keystoneclient
+oslo.i18n==3.15.0         # via osc-lib, oslo.config, oslo.utils, python-cinderclient, python-glanceclient, python-keystoneclient, python-neutronclient, python-novaclient, python-openstackclient
+oslo.serialization==2.18.0  # via python-keystoneclient, python-neutronclient, python-novaclient
+oslo.utils==3.25.0        # via osc-lib, oslo.serialization, python-cinderclient, python-glanceclient, python-keystoneclient, python-neutronclient, python-novaclient, python-openstackclient
+paramiko==2.4.2
+pathlib2==2.3.2           # via pytest
+pbr==2.0.0                # via cliff, debtcollector, keystoneauth1, openstacksdk, osc-lib, oslo.i18n, oslo.serialization, oslo.utils, positional, python-cinderclient, python-glanceclient, python-keystoneclient, python-neutronclient, python-novaclient, python-openstackclient, requestsexceptions, stevedore
+pexpect==4.2.1
+pip-tools==1.10.1
+pluggy==0.7.1             # via pytest, tox
+positional==1.1.1         # via keystoneauth1, python-keystoneclient
+prettytable==0.7.2
+psutil==5.2.2
+ptyprocess==0.5.1         # via pexpect
+py==1.5.3                 # via pytest, tox
+pyasn1==0.2.3
+pycparser==2.17           # via cffi
+pyjwt==1.7.1
+pynacl==1.3.0             # via paramiko
+pyopenssl==19.0.0
+pyparsing==2.2.0          # via cliff, cmd2, oslo.utils
+pytest==3.7.1
+python-cinderclient==2.0.1  # via python-openstackclient
+python-dateutil==2.6.0
+python-glanceclient==2.6.0  # via python-openstackclient
+python-keystoneclient==3.10.0  # via python-neutronclient, python-openstackclient
+python-neutronclient==6.2.0
+python-novaclient==8.0.0
+python-openstackclient==3.9.0
+pytz==2017.2              # via babel, oslo.serialization, oslo.utils
+PyYAML==5.1.2
+raven==6.0.0
+requests==2.22.0
+requestsexceptions==1.2.0  # via os-client-config
+rfc3986==0.4.1            # via oslo.config
+s3transfer==0.2.1         # via boto3
+scandir==1.8              # via pathlib2
+simplejson==3.10.0        # via osc-lib, python-cinderclient, python-neutronclient, python-novaclient
+six==1.10.0
+stevedore==1.21.0         # via cliff, keystoneauth1, openstacksdk, osc-lib, oslo.config, python-keystoneclient
+tox==3.0.0
+unicodecsv==0.14.1        # via cliff
+urllib3==1.25.3           # via botocore, requests
+virtualenv==15.1.0        # via tox
+warlock==1.2.0            # via python-glanceclient
+wrapt==1.10.10            # via debtcollector, positional, python-glanceclient
+xmltodict==0.12.0