From: Kefu Chai Date: Wed, 17 Jun 2020 13:39:11 +0000 (+0800) Subject: rename requirements3.txt to requirements.txt X-Git-Tag: 1.1.0~86^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F1510%2Fhead;p=teuthology.git rename requirements3.txt to requirements.txt since there is no need to differentiate requirements3.txt from requirements2.txt. Signed-off-by: Kefu Chai --- diff --git a/MANIFEST.in b/MANIFEST.in index b17781ba6..bb73d9626 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,2 +1,2 @@ include *.rst -include requirements3.txt +include requirements.txt diff --git a/bootstrap b/bootstrap index e4ccc2b31..ee5f93256 100755 --- a/bootstrap +++ b/bootstrap @@ -163,7 +163,7 @@ fi ./$VENV/bin/pip install setuptools --upgrade # Install all requirements -./$VENV/bin/pip install --upgrade -r requirements3.txt +./$VENV/bin/pip install --upgrade -r requirements.txt # Check to make sure requirements are met ./$VENV/bin/pip check diff --git a/docs/INSTALL.rst b/docs/INSTALL.rst index dc79174f6..c50993331 100644 --- a/docs/INSTALL.rst +++ b/docs/INSTALL.rst @@ -40,7 +40,7 @@ install dependencies. The instructions are given below:: virtualenv --python python3 ./virtualenv source virtualenv/bin/activate pip install --upgrade pip - pip install -r requirements3.txt + pip install -r requirements.txt python setup.py develop @@ -65,12 +65,12 @@ interacting with the services to schedule tests and to report the test results. Update Dependencies ------------------- -We track the dependencies using ``requirements2.txt`` and ``requirements3.txt`` +We track the dependencies using ``requirements.txt`` for python2 and python3 respectively. These packages are tested, and should work with teuthology. But if you want to bump up the versions of them, please use the following command to update these files. For python3 :: - pip-compile -qo- | sed '/^-e / d' > requirements3.txt + pip-compile -qo- | sed '/^-e / d' > requirements.txt Please upgrade pip-tool using following command :: diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 000000000..60bbd732f --- /dev/null +++ b/requirements.txt @@ -0,0 +1,106 @@ +# +# This file is autogenerated by pip-compile +# To update, run: +# +# pip-compile --output-file=requirements.txt +# +ansible==2.8.2 # via teuthology +apache-libcloud==2.8.0 # via teuthology +appdirs==1.4.3 # via os-client-config +argparse==1.4.0 # via teuthology +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 # via teuthology +bcrypt==3.1.6 # via paramiko +beanstalkc3==0.4.0 # via teuthology +boto3==1.9.161 # via teuthology +boto==2.46.1 # via teuthology +botocore==1.12.161 # via boto3, s3transfer +certifi==2019.3.9 # via requests +cffi==1.14.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 # via teuthology +configparser==3.5.0 # via teuthology +contextlib2==0.5.4 # via raven +cryptography==2.8 # via ansible, paramiko, pyopenssl, teuthology +debtcollector==1.13.0 # via oslo.config, oslo.utils, python-keystoneclient, python-neutronclient +deprecation==1.0 # via openstacksdk +docopt==0.6.2 # via teuthology +docutils==0.14 # via botocore +gevent==1.4.0 # via teuthology +greenlet==0.4.15 # via gevent +httplib2==0.10.3 # via teuthology +humanfriendly==8.1 # via teuthology +idna==2.5 # via requests +ipy==1.0 # via teuthology +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 # via teuthology +markupsafe==1.1.1 # via jinja2 +monotonic==1.3 # via oslo.utils +more-itertools==4.3.0 # via pytest +msgpack-python==0.4.8 # via oslo.serialization +ndg-httpsclient==0.4.2 # via teuthology +netaddr==0.7.19 # via oslo.config, oslo.utils, python-neutronclient, teuthology +netifaces==0.10.5 # via oslo.utils +nose==1.3.7 # via teuthology +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.7.1 # via teuthology +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.7.0 # via teuthology +pip-tools==4.3.0 # via teuthology +pluggy==0.7.1 # via pytest, tox +positional==1.1.1 # via keystoneauth1, python-keystoneclient +prettytable==0.7.2 # via cliff, python-cinderclient, python-glanceclient, python-novaclient, teuthology +psutil==5.2.2 # via teuthology +ptyprocess==0.5.1 # via pexpect +py==1.5.3 # via pytest, tox +pyasn1==0.2.3 # via teuthology +pycparser==2.17 # via cffi +pyjwt==1.7.1 # via teuthology +pynacl==1.3.0 # via paramiko +pyopenssl==19.0.0 # via ndg-httpsclient, teuthology +pyparsing==2.2.0 # via cliff, cmd2, oslo.utils +pytest==3.7.1 # via teuthology +python-cinderclient==2.0.1 # via python-openstackclient +python-dateutil==2.6.0 # via botocore, teuthology +python-glanceclient==2.6.0 # via python-openstackclient +python-keystoneclient==3.10.0 # via python-neutronclient, python-openstackclient +python-neutronclient==6.2.0 # via teuthology +python-novaclient==8.0.0 # via python-openstackclient, teuthology +python-openstackclient==3.9.0 # via teuthology +pytz==2017.2 # via babel, oslo.serialization, oslo.utils +pyyaml==5.1.2 # via ansible, cliff, os-client-config, teuthology +raven==6.0.0 # via teuthology +requests==2.22.0 # via apache-libcloud, keystoneauth1, python-cinderclient, python-glanceclient, python-keystoneclient, python-neutronclient, python-novaclient, teuthology +requestsexceptions==1.2.0 # via os-client-config +rfc3986==0.4.1 # via oslo.config +s3transfer==0.2.1 # via boto3 +simplejson==3.10.0 # via osc-lib, python-cinderclient, python-neutronclient, python-novaclient +six==1.14.0 # via bcrypt, cliff, cmd2, configobj, cryptography, debtcollector, keystoneauth1, more-itertools, openstacksdk, osc-lib, oslo.config, oslo.i18n, oslo.serialization, oslo.utils, pip-tools, pynacl, pyopenssl, pytest, python-cinderclient, python-dateutil, python-glanceclient, python-keystoneclient, python-neutronclient, python-novaclient, python-openstackclient, stevedore, teuthology, tox, warlock +stevedore==1.21.0 # via cliff, keystoneauth1, openstacksdk, osc-lib, oslo.config, python-keystoneclient +toml==0.10.1 # via teuthology +tox==3.0.0 # via teuthology +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 # via teuthology + +# The following packages are considered to be unsafe in a requirements file: +# setuptools diff --git a/requirements3.txt b/requirements3.txt deleted file mode 100644 index d6e0124c8..000000000 --- a/requirements3.txt +++ /dev/null @@ -1,106 +0,0 @@ -# -# This file is autogenerated by pip-compile -# To update, run: -# -# pip-compile --output-file=requirements3.txt -# -ansible==2.8.2 # via teuthology -apache-libcloud==2.8.0 # via teuthology -appdirs==1.4.3 # via os-client-config -argparse==1.4.0 # via teuthology -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 # via teuthology -bcrypt==3.1.6 # via paramiko -beanstalkc3==0.4.0 # via teuthology -boto3==1.9.161 # via teuthology -boto==2.46.1 # via teuthology -botocore==1.12.161 # via boto3, s3transfer -certifi==2019.3.9 # via requests -cffi==1.14.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 # via teuthology -configparser==3.5.0 # via teuthology -contextlib2==0.5.4 # via raven -cryptography==2.8 # via ansible, paramiko, pyopenssl, teuthology -debtcollector==1.13.0 # via oslo.config, oslo.utils, python-keystoneclient, python-neutronclient -deprecation==1.0 # via openstacksdk -docopt==0.6.2 # via teuthology -docutils==0.14 # via botocore -gevent==1.4.0 # via teuthology -greenlet==0.4.15 # via gevent -httplib2==0.10.3 # via teuthology -humanfriendly==8.1 # via teuthology -idna==2.5 # via requests -ipy==1.0 # via teuthology -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 # via teuthology -markupsafe==1.1.1 # via jinja2 -monotonic==1.3 # via oslo.utils -more-itertools==4.3.0 # via pytest -msgpack-python==0.4.8 # via oslo.serialization -ndg-httpsclient==0.4.2 # via teuthology -netaddr==0.7.19 # via oslo.config, oslo.utils, python-neutronclient, teuthology -netifaces==0.10.5 # via oslo.utils -nose==1.3.7 # via teuthology -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.7.1 # via teuthology -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.7.0 # via teuthology -pip-tools==4.3.0 # via teuthology -pluggy==0.7.1 # via pytest, tox -positional==1.1.1 # via keystoneauth1, python-keystoneclient -prettytable==0.7.2 # via cliff, python-cinderclient, python-glanceclient, python-novaclient, teuthology -psutil==5.2.2 # via teuthology -ptyprocess==0.5.1 # via pexpect -py==1.5.3 # via pytest, tox -pyasn1==0.2.3 # via teuthology -pycparser==2.17 # via cffi -pyjwt==1.7.1 # via teuthology -pynacl==1.3.0 # via paramiko -pyopenssl==19.0.0 # via ndg-httpsclient, teuthology -pyparsing==2.2.0 # via cliff, cmd2, oslo.utils -pytest==3.7.1 # via teuthology -python-cinderclient==2.0.1 # via python-openstackclient -python-dateutil==2.6.0 # via botocore, teuthology -python-glanceclient==2.6.0 # via python-openstackclient -python-keystoneclient==3.10.0 # via python-neutronclient, python-openstackclient -python-neutronclient==6.2.0 # via teuthology -python-novaclient==8.0.0 # via python-openstackclient, teuthology -python-openstackclient==3.9.0 # via teuthology -pytz==2017.2 # via babel, oslo.serialization, oslo.utils -pyyaml==5.1.2 # via ansible, cliff, os-client-config, teuthology -raven==6.0.0 # via teuthology -requests==2.22.0 # via apache-libcloud, keystoneauth1, python-cinderclient, python-glanceclient, python-keystoneclient, python-neutronclient, python-novaclient, teuthology -requestsexceptions==1.2.0 # via os-client-config -rfc3986==0.4.1 # via oslo.config -s3transfer==0.2.1 # via boto3 -simplejson==3.10.0 # via osc-lib, python-cinderclient, python-neutronclient, python-novaclient -six==1.14.0 # via bcrypt, cliff, cmd2, configobj, cryptography, debtcollector, keystoneauth1, more-itertools, openstacksdk, osc-lib, oslo.config, oslo.i18n, oslo.serialization, oslo.utils, pip-tools, pynacl, pyopenssl, pytest, python-cinderclient, python-dateutil, python-glanceclient, python-keystoneclient, python-neutronclient, python-novaclient, python-openstackclient, stevedore, teuthology, tox, warlock -stevedore==1.21.0 # via cliff, keystoneauth1, openstacksdk, osc-lib, oslo.config, python-keystoneclient -toml==0.10.1 # via teuthology -tox==3.0.0 # via teuthology -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 # via teuthology - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/tox.ini b/tox.ini index 130040233..5f02ff102 100644 --- a/tox.ini +++ b/tox.ini @@ -6,7 +6,7 @@ basepython=python3 install_command = pip install --upgrade {opts} {packages} passenv = HOME deps= - -r{toxinidir}/requirements3.txt + -r{toxinidir}/requirements.txt mock==2.0.0 fudge pytest-cov==2.8.1 @@ -27,7 +27,7 @@ basepython=python3 install_command = pip install --upgrade {opts} {packages} changedir=docs deps= - -r{toxinidir}/requirements3.txt + -r{toxinidir}/requirements.txt sphinx sphinxcontrib-programoutput mock==2.0.0 @@ -40,7 +40,7 @@ install_command = pip install --upgrade {opts} {packages} passenv = HOME OS_REGION_NAME OS_AUTH_URL OS_TENANT_ID OS_TENANT_NAME OS_PASSWORD OS_USERNAME sitepackages=True deps= - -r{toxinidir}/requirements3.txt + -r{toxinidir}/requirements.txt mock==2.0.0 commands=py.test -v {posargs:teuthology/openstack/test/test_openstack.py} @@ -50,7 +50,7 @@ basepython=python3 passenv = HOME OS_REGION_NAME OS_AUTH_URL OS_TENANT_ID OS_TENANT_NAME OS_PASSWORD OS_USERNAME basepython=python3 deps= - -r{toxinidir}/requirements3.txt + -r{toxinidir}/requirements.txt mock==2.0.0 commands= @@ -61,6 +61,6 @@ passenv = HOME OS_REGION_NAME OS_AUTH_URL OS_TENANT_ID OS_TENANT_NAME OS_PASSWOR basepython=python3 sitepackages=True deps= - -r{toxinidir}/requirements3.txt + -r{toxinidir}/requirements.txt commands={toxinidir}/openstack-delegate.sh