From 38ae3b970d054eeb61e1d3f4f45a7bd826e8e55d Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Wed, 17 Jun 2020 21:39:11 +0800 Subject: [PATCH] rename requirements3.txt to requirements.txt since there is no need to differentiate requirements3.txt from requirements2.txt. Signed-off-by: Kefu Chai --- MANIFEST.in | 2 +- bootstrap | 2 +- docs/INSTALL.rst | 6 +++--- requirements3.txt => requirements.txt | 2 +- tox.ini | 10 +++++----- 5 files changed, 11 insertions(+), 11 deletions(-) rename requirements3.txt => requirements.txt (99%) diff --git a/MANIFEST.in b/MANIFEST.in index b17781ba6d..bb73d96269 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 e4ccc2b314..ee5f93256d 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 dc79174f65..c509933313 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/requirements3.txt b/requirements.txt similarity index 99% rename from requirements3.txt rename to requirements.txt index d6e0124c89..60bbd732f9 100644 --- a/requirements3.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile --output-file=requirements3.txt +# pip-compile --output-file=requirements.txt # ansible==2.8.2 # via teuthology apache-libcloud==2.8.0 # via teuthology diff --git a/tox.ini b/tox.ini index 130040233f..5f02ff102b 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 -- 2.39.5