diff --git a/requirements/base.in b/requirements/base.in index 8fce5cc217..ec62fcb4ed 100644 --- a/requirements/base.in +++ b/requirements/base.in @@ -1,4 +1,3 @@ -c constraints.txt -docker-compose # For launching the devstack Docker containers -PyYAML # For parsing configuration files while generating offline installers +PyYAML>=6.0.1 # For parsing configuration files while generating offline installers diff --git a/requirements/base.txt b/requirements/base.txt index 5f746bdb4d..a0fda06220 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -4,69 +4,5 @@ # # make upgrade # -attrs==23.1.0 - # via jsonschema -bcrypt==4.0.1 - # via paramiko -certifi==2023.7.22 - # via requests -cffi==1.15.1 - # via - # cryptography - # pynacl -charset-normalizer==3.2.0 - # via requests -cryptography==41.0.3 - # via paramiko -distro==1.8.0 - # via docker-compose -docker[ssh]==6.1.3 - # via docker-compose -docker-compose==1.29.2 +pyyaml==6.0.1 # via -r requirements/base.in -dockerpty==0.4.1 - # via docker-compose -docopt==0.6.2 - # via docker-compose -idna==3.4 - # via requests -jsonschema==3.2.0 - # via docker-compose -packaging==23.1 - # via docker -paramiko==3.3.1 - # via docker -pycparser==2.21 - # via cffi -pynacl==1.5.0 - # via paramiko -pyrsistent==0.19.3 - # via jsonschema -python-dotenv==0.21.1 - # via docker-compose -pyyaml==5.4.1 - # via - # -r requirements/base.in - # docker-compose -requests==2.31.0 - # via - # docker - # docker-compose -six==1.16.0 - # via - # dockerpty - # jsonschema - # websocket-client -texttable==1.6.7 - # via docker-compose -urllib3==2.0.4 - # via - # docker - # requests -websocket-client==0.59.0 - # via - # docker - # docker-compose - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/requirements/dev.txt b/requirements/dev.txt index 3ff53a1a5b..7d6e5ab75c 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -4,71 +4,16 @@ # # make upgrade # -attrs==23.1.0 - # via - # -r requirements/base.txt - # -r requirements/test.txt - # jsonschema -bcrypt==4.0.1 - # via - # -r requirements/base.txt - # -r requirements/test.txt - # paramiko build==1.0.0 # via # -r requirements/pip-tools.txt # pip-tools -certifi==2023.7.22 - # via - # -r requirements/base.txt - # -r requirements/test.txt - # requests -cffi==1.15.1 - # via - # -r requirements/base.txt - # -r requirements/test.txt - # cryptography - # pynacl -charset-normalizer==3.2.0 - # via - # -r requirements/base.txt - # -r requirements/test.txt - # requests click==8.1.7 # via # -r requirements/pip-tools.txt # pip-tools -cryptography==41.0.3 - # via - # -r requirements/base.txt - # -r requirements/test.txt - # paramiko distlib==0.3.7 # via virtualenv -distro==1.8.0 - # via - # -r requirements/base.txt - # -r requirements/test.txt - # docker-compose -docker[ssh]==6.1.3 - # via - # -r requirements/base.txt - # -r requirements/test.txt - # docker-compose -docker-compose==1.29.2 - # via - # -r requirements/base.txt - # -r requirements/test.txt -dockerpty==0.4.1 - # via - # -r requirements/base.txt - # -r requirements/test.txt - # docker-compose -docopt==0.6.2 - # via - # -r requirements/base.txt - # -r requirements/test.txt - # docker-compose exceptiongroup==1.1.3 # via # -r requirements/test.txt @@ -77,11 +22,6 @@ filelock==3.12.3 # via # tox # virtualenv -idna==3.4 - # via - # -r requirements/base.txt - # -r requirements/test.txt - # requests importlib-metadata==6.8.0 # via # -r requirements/pip-tools.txt @@ -90,25 +30,13 @@ iniconfig==2.0.0 # via # -r requirements/test.txt # pytest -jsonschema==3.2.0 - # via - # -r requirements/base.txt - # -r requirements/test.txt - # docker-compose packaging==23.1 # via - # -r requirements/base.txt # -r requirements/pip-tools.txt # -r requirements/test.txt # build - # docker # pytest # tox -paramiko==3.3.1 - # via - # -r requirements/base.txt - # -r requirements/test.txt - # docker pexpect==4.8.0 # via -r requirements/test.txt pip-tools==7.3.0 @@ -126,56 +54,18 @@ ptyprocess==0.7.0 # pexpect py==1.11.0 # via tox -pycparser==2.21 - # via - # -r requirements/base.txt - # -r requirements/test.txt - # cffi -pynacl==1.5.0 - # via - # -r requirements/base.txt - # -r requirements/test.txt - # paramiko pyproject-hooks==1.0.0 # via # -r requirements/pip-tools.txt # build -pyrsistent==0.19.3 - # via - # -r requirements/base.txt - # -r requirements/test.txt - # jsonschema pytest==7.4.1 # via -r requirements/test.txt -python-dotenv==0.21.1 - # via - # -r requirements/base.txt - # -r requirements/test.txt - # docker-compose -pyyaml==5.4.1 +pyyaml==6.0.1 # via # -r requirements/base.txt # -r requirements/test.txt - # docker-compose -requests==2.31.0 - # via - # -r requirements/base.txt - # -r requirements/test.txt - # docker - # docker-compose six==1.16.0 - # via - # -r requirements/base.txt - # -r requirements/test.txt - # dockerpty - # jsonschema - # tox - # websocket-client -texttable==1.6.7 - # via - # -r requirements/base.txt - # -r requirements/test.txt - # docker-compose + # via tox tomli==2.0.1 # via # -r requirements/pip-tools.txt @@ -194,20 +84,8 @@ tox-battery==0.6.2 # via -r requirements/dev.in typing-extensions==4.7.1 # via filelock -urllib3==2.0.4 - # via - # -r requirements/base.txt - # -r requirements/test.txt - # docker - # requests virtualenv==20.24.4 # via tox -websocket-client==0.59.0 - # via - # -r requirements/base.txt - # -r requirements/test.txt - # docker - # docker-compose wheel==0.41.2 # via # -r requirements/pip-tools.txt diff --git a/requirements/doc.txt b/requirements/doc.txt index 4806175b39..eb0767effb 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -8,59 +8,20 @@ accessible-pygments==0.0.4 # via pydata-sphinx-theme alabaster==0.7.13 # via sphinx -attrs==23.1.0 - # via - # -r requirements/base.txt - # jsonschema babel==2.12.1 # via # pydata-sphinx-theme # sphinx -bcrypt==4.0.1 - # via - # -r requirements/base.txt - # paramiko beautifulsoup4==4.12.2 # via pydata-sphinx-theme bleach==6.0.0 # via readme-renderer certifi==2023.7.22 - # via - # -r requirements/base.txt - # requests -cffi==1.15.1 - # via - # -r requirements/base.txt - # cryptography - # pynacl + # via requests charset-normalizer==3.2.0 - # via - # -r requirements/base.txt - # requests -cryptography==41.0.3 - # via - # -r requirements/base.txt - # paramiko -distro==1.8.0 - # via - # -r requirements/base.txt - # docker-compose + # via requests doc8==1.1.1 # via -r requirements/doc.in -docker[ssh]==6.1.3 - # via - # -r requirements/base.txt - # docker-compose -docker-compose==1.29.2 - # via -r requirements/base.txt -dockerpty==0.4.1 - # via - # -r requirements/base.txt - # docker-compose -docopt==0.6.2 - # via - # -r requirements/base.txt - # docker-compose docutils==0.19 # via # doc8 @@ -69,37 +30,21 @@ docutils==0.19 # restructuredtext-lint # sphinx idna==3.4 - # via - # -r requirements/base.txt - # requests + # via requests imagesize==1.4.1 # via sphinx importlib-metadata==6.8.0 # via sphinx jinja2==3.1.2 # via sphinx -jsonschema==3.2.0 - # via - # -r requirements/base.txt - # docker-compose markupsafe==2.1.3 # via jinja2 packaging==23.1 # via - # -r requirements/base.txt - # docker # pydata-sphinx-theme # sphinx -paramiko==3.3.1 - # via - # -r requirements/base.txt - # docker pbr==5.11.1 # via stevedore -pycparser==2.21 - # via - # -r requirements/base.txt - # cffi pydata-sphinx-theme==0.13.3 # via sphinx-book-theme pygments==2.16.1 @@ -109,41 +54,18 @@ pygments==2.16.1 # pydata-sphinx-theme # readme-renderer # sphinx -pynacl==1.5.0 - # via - # -r requirements/base.txt - # paramiko -pyrsistent==0.19.3 - # via - # -r requirements/base.txt - # jsonschema -python-dotenv==0.21.1 - # via - # -r requirements/base.txt - # docker-compose pytz==2023.3.post1 # via babel -pyyaml==5.4.1 - # via - # -r requirements/base.txt - # docker-compose +pyyaml==6.0.1 + # via -r requirements/base.txt readme-renderer==41.0 # via -r requirements/doc.in requests==2.31.0 - # via - # -r requirements/base.txt - # docker - # docker-compose - # sphinx + # via sphinx restructuredtext-lint==1.4.0 # via doc8 six==1.16.0 - # via - # -r requirements/base.txt - # bleach - # dockerpty - # jsonschema - # websocket-client + # via bleach snowballstemmer==2.2.0 # via sphinx soupsieve==2.5 @@ -169,28 +91,13 @@ sphinxcontrib-serializinghtml==1.1.5 # via sphinx stevedore==5.1.0 # via doc8 -texttable==1.6.7 - # via - # -r requirements/base.txt - # docker-compose tomli==2.0.1 # via doc8 typing-extensions==4.7.1 # via pydata-sphinx-theme urllib3==2.0.4 - # via - # -r requirements/base.txt - # docker - # requests + # via requests webencodings==0.5.1 # via bleach -websocket-client==0.59.0 - # via - # -r requirements/base.txt - # docker - # docker-compose zipp==3.16.2 # via importlib-metadata - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/requirements/test.txt b/requirements/test.txt index caf1c195d1..dc33211a25 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -4,125 +4,21 @@ # # make upgrade # -attrs==23.1.0 - # via - # -r requirements/base.txt - # jsonschema -bcrypt==4.0.1 - # via - # -r requirements/base.txt - # paramiko -certifi==2023.7.22 - # via - # -r requirements/base.txt - # requests -cffi==1.15.1 - # via - # -r requirements/base.txt - # cryptography - # pynacl -charset-normalizer==3.2.0 - # via - # -r requirements/base.txt - # requests -cryptography==41.0.3 - # via - # -r requirements/base.txt - # paramiko -distro==1.8.0 - # via - # -r requirements/base.txt - # docker-compose -docker[ssh]==6.1.3 - # via - # -r requirements/base.txt - # docker-compose -docker-compose==1.29.2 - # via -r requirements/base.txt -dockerpty==0.4.1 - # via - # -r requirements/base.txt - # docker-compose -docopt==0.6.2 - # via - # -r requirements/base.txt - # docker-compose exceptiongroup==1.1.3 # via pytest -idna==3.4 - # via - # -r requirements/base.txt - # requests iniconfig==2.0.0 # via pytest -jsonschema==3.2.0 - # via - # -r requirements/base.txt - # docker-compose packaging==23.1 - # via - # -r requirements/base.txt - # docker - # pytest -paramiko==3.3.1 - # via - # -r requirements/base.txt - # docker + # via pytest pexpect==4.8.0 # via -r requirements/test.in pluggy==1.3.0 # via pytest ptyprocess==0.7.0 # via pexpect -pycparser==2.21 - # via - # -r requirements/base.txt - # cffi -pynacl==1.5.0 - # via - # -r requirements/base.txt - # paramiko -pyrsistent==0.19.3 - # via - # -r requirements/base.txt - # jsonschema pytest==7.4.1 # via -r requirements/test.in -python-dotenv==0.21.1 - # via - # -r requirements/base.txt - # docker-compose -pyyaml==5.4.1 - # via - # -r requirements/base.txt - # docker-compose -requests==2.31.0 - # via - # -r requirements/base.txt - # docker - # docker-compose -six==1.16.0 - # via - # -r requirements/base.txt - # dockerpty - # jsonschema - # websocket-client -texttable==1.6.7 - # via - # -r requirements/base.txt - # docker-compose +pyyaml==6.0.1 + # via -r requirements/base.txt tomli==2.0.1 # via pytest -urllib3==2.0.4 - # via - # -r requirements/base.txt - # docker - # requests -websocket-client==0.59.0 - # via - # -r requirements/base.txt - # docker - # docker-compose - -# The following packages are considered to be unsafe in a requirements file: -# setuptools