From dc3445030a2b5a2f095735d17b68b4f4282bba34 Mon Sep 17 00:00:00 2001 From: Sergiy Markin Date: Mon, 24 Apr 2023 14:13:43 +0000 Subject: [PATCH] Sync requirements with shipyard This PS adjusts list of dependences needed to get syncronized with Shipyard project. Change-Id: I9235702aa34b9f0bf6634229a24e5f1847ac9a7d --- Deckhand.egg-info/PKG-INFO | 172 ++++++++++++++--------------- Deckhand.egg-info/entry_points.txt | 1 - Deckhand.egg-info/pbr.json | 2 +- Deckhand.egg-info/requires.txt | 14 +-- doc/requirements-docs.txt | 7 +- requirements-direct.txt | 16 +-- requirements-frozen.txt | 24 ++-- test-requirements.txt | 2 +- tox.ini | 3 + 9 files changed, 122 insertions(+), 119 deletions(-) diff --git a/Deckhand.egg-info/PKG-INFO b/Deckhand.egg-info/PKG-INFO index b8da56ed..363524af 100644 --- a/Deckhand.egg-info/PKG-INFO +++ b/Deckhand.egg-info/PKG-INFO @@ -1,95 +1,10 @@ -Metadata-Version: 1.2 +Metadata-Version: 2.1 Name: Deckhand Version: 1.1.0.dev717 Summary: Storage service for YAML-based configuration documents, which are managed through version control and automatically validated. Home-page: https://airship-deckhand.readthedocs.io/ Author: The Airship Authors Author-email: airship-discuss@lists.airshipit.org -License: UNKNOWN -Description: ======== - Deckhand - ======== - - |Docker Repository on Quay| |Doc Status| - - Deckhand provides document revision management, storage and mutation - functionality upon which the rest of the `Airship`_ components rely for - orchestration of infrastructure provisioning. Deckhand understands declarative - YAML documents that define, end-to-end, the configuration of sites: from the - hardware -- encompassing network topology and hardware and host profile - information -- up to the software level that comprises the overcloud. - - * Free software: Apache license - * Documentation: https://airship-deckhand.readthedocs.io/en/latest/ - * Source: https://git.openstack.org/cgit/openstack/airship-deckhand - * Bugs: https://storyboard.openstack.org/#!/project/1004 - * Release notes: https://airship-deckhand.readthedocs.io/en/latest/releasenotes/index.html - - Core Responsibilities - ===================== - - * layering - helps reduce duplication in configuration by applying the notion - of inheritance to documents - * substitution - provides separation between secret data and other - configuration data for security purposes and reduces data duplication by - allowing common data to be defined once and substituted elsewhere dynamically - * revision history - maintains well-defined collections of documents within - immutable revisions that are meant to operate together, while providing the - ability to rollback to previous revisions - * validation - allows services to implement and register different kinds of - validations and report errors - * secret management - leverages existing OpenStack APIs -- namely - `Barbican`_ -- to reliably and securely store sensitive data - - .. _Barbican: https://docs.openstack.org/barbican/latest/api/ - - Getting Started - =============== - - For more detailed installation and setup information, please refer to the - `Getting Started `_ - guide. - - Integration Points - ================== - - Deckhand has the following integration points: - - * `Barbican (OpenStack Key Manager) `_ - provides secure storage for sensitive data. - * `Keystone (OpenStack Identity service) `_ - provides authentication and support for role based authorization. - * `PostgreSQL `_ is used to persist information - to correlate workflows with users and history of workflow commands. - - .. note:: - - Currently, other database back-ends are not supported. - - Though, being a low-level service, has many other Airship services that integrate - with it, including: - - * `Drydock `_ is orchestrated by - Shipyard to perform bare metal node provisioning. - * `Promenade `_ is indirectly - orchestrated by Shipyard to configure and join Kubernetes nodes. - * `Armada `_ is orchestrated by - Shipyard to deploy and test Kubernetes workloads. - - Further Reading - =============== - - `Airship`_. - - .. _Airship: https://www.airshipit.org - - .. |Docker Repository on Quay| image:: https://quay.io/repository/airshipit/deckhand/status - :target: https://quay.io/repository/airshipit/deckhand - .. |Doc Status| image:: https://readthedocs.org/projects/airship-deckhand/badge/?version=latest - :target: https://airship-deckhand.readthedocs.io/ - - -Platform: UNKNOWN Classifier: Intended Audience :: Information Technology Classifier: Intended Audience :: System Administrators Classifier: License :: OSI Approved :: Apache Software License @@ -99,3 +14,88 @@ Classifier: Programming Language :: Python :: 3 Classifier: Programming Language :: Python :: 3.8 Classifier: Programming Language :: Python :: 3.10 Requires-Python: >=3.8 +License-File: LICENSE +License-File: AUTHORS + +======== +Deckhand +======== + +|Docker Repository on Quay| |Doc Status| + +Deckhand provides document revision management, storage and mutation +functionality upon which the rest of the `Airship`_ components rely for +orchestration of infrastructure provisioning. Deckhand understands declarative +YAML documents that define, end-to-end, the configuration of sites: from the +hardware -- encompassing network topology and hardware and host profile +information -- up to the software level that comprises the overcloud. + +* Free software: Apache license +* Documentation: https://airship-deckhand.readthedocs.io/en/latest/ +* Source: https://git.openstack.org/cgit/openstack/airship-deckhand +* Bugs: https://storyboard.openstack.org/#!/project/1004 +* Release notes: https://airship-deckhand.readthedocs.io/en/latest/releasenotes/index.html + +Core Responsibilities +===================== + +* layering - helps reduce duplication in configuration by applying the notion + of inheritance to documents +* substitution - provides separation between secret data and other + configuration data for security purposes and reduces data duplication by + allowing common data to be defined once and substituted elsewhere dynamically +* revision history - maintains well-defined collections of documents within + immutable revisions that are meant to operate together, while providing the + ability to rollback to previous revisions +* validation - allows services to implement and register different kinds of + validations and report errors +* secret management - leverages existing OpenStack APIs -- namely + `Barbican`_ -- to reliably and securely store sensitive data + +.. _Barbican: https://docs.openstack.org/barbican/latest/api/ + +Getting Started +=============== + +For more detailed installation and setup information, please refer to the +`Getting Started `_ +guide. + +Integration Points +================== + +Deckhand has the following integration points: + + * `Barbican (OpenStack Key Manager) `_ + provides secure storage for sensitive data. + * `Keystone (OpenStack Identity service) `_ + provides authentication and support for role based authorization. + * `PostgreSQL `_ is used to persist information + to correlate workflows with users and history of workflow commands. + + .. note:: + + Currently, other database back-ends are not supported. + +Though, being a low-level service, has many other Airship services that integrate +with it, including: + + * `Drydock `_ is orchestrated by + Shipyard to perform bare metal node provisioning. + * `Promenade `_ is indirectly + orchestrated by Shipyard to configure and join Kubernetes nodes. + * `Armada `_ is orchestrated by + Shipyard to deploy and test Kubernetes workloads. + +Further Reading +=============== + +`Airship`_. + +.. _Airship: https://www.airshipit.org + +.. |Docker Repository on Quay| image:: https://quay.io/repository/airshipit/deckhand/status + :target: https://quay.io/repository/airshipit/deckhand +.. |Doc Status| image:: https://readthedocs.org/projects/airship-deckhand/badge/?version=latest + :target: https://airship-deckhand.readthedocs.io/ + diff --git a/Deckhand.egg-info/entry_points.txt b/Deckhand.egg-info/entry_points.txt index 4c1b5448..a9f5e4f3 100644 --- a/Deckhand.egg-info/entry_points.txt +++ b/Deckhand.egg-info/entry_points.txt @@ -3,4 +3,3 @@ deckhand.conf = deckhand.conf.opts:list_opts [oslo.policy.policies] deckhand = deckhand.policies:list_rules - diff --git a/Deckhand.egg-info/pbr.json b/Deckhand.egg-info/pbr.json index 754cc7c5..2833727d 100644 --- a/Deckhand.egg-info/pbr.json +++ b/Deckhand.egg-info/pbr.json @@ -1 +1 @@ -{"git_version": "c942ba7", "is_release": false} \ No newline at end of file +{"git_version": "ac4edb0", "is_release": false} \ No newline at end of file diff --git a/Deckhand.egg-info/requires.txt b/Deckhand.egg-info/requires.txt index 44ab493f..82071cdb 100644 --- a/Deckhand.egg-info/requires.txt +++ b/Deckhand.egg-info/requires.txt @@ -7,11 +7,11 @@ ConfigParser coverage cryptography==3.4.8 deepdiff<=5.8.1 -docutils -falcon +docutils<=0.17 +falcon==1.4.1 hacking -importlib-metadata -Jinja2 +importlib-metadata~=2.0 +Jinja2<=3.0.3 jsonpath_ng jsonpath-rw-ext>=1.0.0 jsonpickle==1.4.1 @@ -48,13 +48,13 @@ pymongo pyparsing<=2.4.7 pyproject-api python-barbicanclient<=5.2.0 -python-dateutil +python-dateutil==2.8.1 python-keystoneclient python-memcached python-subunit<=1.4.0 PyYAML<=5.4.1 reno -requests==2.27.0 +requests==2.23.0 Routes setuptools<=45.2.0 six @@ -74,4 +74,4 @@ virtualenv Werkzeug wheel wsgi-intercept>=1.2.2 -yq +yq==3.2.1 diff --git a/doc/requirements-docs.txt b/doc/requirements-docs.txt index 0a5deb72..b1f29c48 100644 --- a/doc/requirements-docs.txt +++ b/doc/requirements-docs.txt @@ -1,7 +1,7 @@ plantuml -sphinxcontrib-apidoc>=0.2.0 # BSD +sphinxcontrib-apidoc==0.2.0 # BSD sphinxcontrib-plantuml -Sphinx==6.1.3 +Sphinx==3.3.1 sphinx-rtd-theme==0.5.0 reno==4.0.0 pylibyaml==0.1.0 @@ -22,4 +22,5 @@ python-barbicanclient==5.5.0 oslo.db==10.0.0 oslo.log==5.2.0 Werkzeug==2.1.2 -jsonpickle==3.0.1 \ No newline at end of file +jsonpickle==3.0.1 +Jinja2<=3.0.3 \ No newline at end of file diff --git a/requirements-direct.txt b/requirements-direct.txt index ae8673ee..5a6cb34f 100644 --- a/requirements-direct.txt +++ b/requirements-direct.txt @@ -7,11 +7,11 @@ ConfigParser coverage cryptography==3.4.8 deepdiff<=5.8.1 -docutils +docutils<=0.17 falcon hacking -importlib-metadata -Jinja2 +importlib-metadata~=2.0 +Jinja2<=3.0.3 jsonpath_ng jsonpath-rw-ext>=1.0.0 jsonpickle==1.4.1 @@ -48,17 +48,17 @@ pymongo pyparsing<=2.4.7 pyproject-api python-barbicanclient<=5.2.0 -python-dateutil +python-dateutil==2.8.1 python-keystoneclient python-memcached python-subunit<=1.4.0 PyYAML<=5.4.1 reno -requests==2.27.0 +requests==2.23.0 Routes setuptools<=45.2.0 six -Sphinx +Sphinx==3.3.1 sphinx-rtd-theme==0.5.0 SQLAlchemy<=1.3.20 stevedore @@ -67,11 +67,11 @@ testresources testscenarios testtools<=2.5.0 tiddlyweb -typing_extensions==4.5.0 +typing-extensions==3.7.2 urllib3 >= 1.21.1, <= 1.25.11 uWSGI==2.0.21 virtualenv Werkzeug wheel wsgi-intercept>=1.2.2 -yq +yq==3.2.1 diff --git a/requirements-frozen.txt b/requirements-frozen.txt index 3ca4eca0..3197b9ab 100644 --- a/requirements-frozen.txt +++ b/requirements-frozen.txt @@ -1,7 +1,7 @@ alabaster==0.7.13 alembic==1.4.3 amqp==2.6.1 -argcomplete==3.0.5 +argcomplete==3.0.8 attrs==23.1.0 autopage==0.5.1 Babel==2.12.1 @@ -11,8 +11,8 @@ cachetools==5.3.0 certifi==2022.12.7 cffi==1.15.1 chardet==3.0.4 -charset-normalizer==2.0.12 -cliff==4.2.0 +charset-normalizer==3.1.0 +cliff==3.10.1 cmd2==2.4.3 configparser==5.3.0 coverage==7.2.3 @@ -22,7 +22,7 @@ decorator==5.1.1 deepdiff==5.8.1 distlib==0.3.6 dnspython==2.3.0 -docutils==0.19 +docutils==0.17 dogpile.cache==1.1.8 dulwich==0.21.3 eventlet==0.33.3 @@ -37,11 +37,11 @@ greenlet==2.0.2 hacking==4.1.0 html5lib==0.9999999 httpexceptor==1.4.0 -idna==3.4 +idna==2.10 imagesize==1.4.1 -importlib-metadata==6.5.0 +importlib-metadata==2.1.3 iso8601==1.1.0 -Jinja2==3.1.2 +Jinja2==3.0.3 jsonpath-ng==1.5.3 jsonpath-rw==1.4.0 jsonpath-rw-ext==1.2.2 @@ -79,7 +79,7 @@ Paste==3.5.0 PasteDeploy==3.0.1 PasteScript==3.3.0 pbr==5.5.1 -pip==23.1 +pip==23.0.1 platformdirs==3.2.0 ply==3.11 prettytable==3.7.0 @@ -97,7 +97,7 @@ pyperclip==1.8.2 pyproject_api==1.5.0 pyrsistent==0.19.3 python-barbicanclient==5.2.0 -python-dateutil==2.8.2 +python-dateutil==2.8.1 python-editor==1.0.4 python-keystoneclient==5.1.0 python-memcached==1.59 @@ -107,7 +107,7 @@ pytz==2023.3 PyYAML==5.4.1 reno==4.0.0 repoze.lru==0.7 -requests==2.27.0 +requests==2.23.0 resolver==0.2.1 rfc3986==2.0.0 Routes==2.5.1 @@ -116,7 +116,7 @@ setuptools==45.2.0 simplejson==3.19.1 six==1.16.0 snowballstemmer==2.2.0 -Sphinx==6.1.3 +Sphinx==3.3.1 sphinx-rtd-theme==0.5.0 sphinxcontrib-applehelp==1.0.4 sphinxcontrib-devhelp==1.0.2 @@ -137,7 +137,7 @@ testtools==2.5.0 tiddlyweb==2.4.3 tomli==2.0.1 tomlkit==0.11.7 -typing_extensions==4.5.0 +typing-extensions==3.7.2 urllib3==1.25.11 uWSGI==2.0.21 vine==1.3.0 diff --git a/test-requirements.txt b/test-requirements.txt index 6a05704f..bfb8ebf7 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -19,7 +19,7 @@ pyparsing==2.4.7 pytest >= 3.0 pytest-cov==4.0.0 python-subunit==1.4.0 -requests==2.27.0 +requests==2.23.0 six==1.16.0 stestr==3.2.0 testrepository==0.0.20 diff --git a/tox.ini b/tox.ini index f2591e08..dbcc4627 100644 --- a/tox.ini +++ b/tox.ini @@ -166,6 +166,9 @@ ignore = E731,F405,H405,W504,H306 exclude = .venv,venv,.git,.tox,dist,*lib/python*,*egg,build,releasenotes,doc,alembic/versions,build/tmp.* [testenv:docs] +allowlist_externals = + pip3 + bash deps = -r{toxinidir}/doc/requirements-docs.txt commands =