From f43dfcfaf4a16d70ca34c6e3007b9833d5ccfae4 Mon Sep 17 00:00:00 2001 From: beierlm Date: Fri, 4 Jun 2021 08:39:27 -0400 Subject: [PATCH] Pip standardization Update the requirements as they were not done properly the first time Change-Id: Ibd9e5c8d8943a35beea9473c42c1afde9288560b Signed-off-by: beierlm --- requirements-dev.in | 7 +- requirements-dev.txt | 91 ++++++++-- requirements.in | 23 ++- requirements.txt | 394 +++++++++++++++++++++++++++++++++++++++++-- 4 files changed, 473 insertions(+), 42 deletions(-) diff --git a/requirements-dev.in b/requirements-dev.in index 3ae8b5f..dc09a5e 100644 --- a/requirements-dev.in +++ b/requirements-dev.in @@ -13,5 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -git+https://osm.etsi.org/gerrit/osm/common.git@v9.0#egg=osm-common --r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=v9.0 +git+https://osm.etsi.org/gerrit/osm/IM.git@master#egg=osm-im +-r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=master + +git+https://osm.etsi.org/gerrit/osm/osmclient.git@master#egg=osm-osmclient +-r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=master diff --git a/requirements-dev.txt b/requirements-dev.txt index 816639a..a16fb90 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,19 +1,82 @@ -aiokafka==0.7.0 - # via -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=v9.0 -dataclasses==0.6 - # via -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=v9.0 -kafka-python==2.0.2 - # via - # -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=v9.0 - # aiokafka -git+https://osm.etsi.org/gerrit/osm/common.git@v9.0#egg=osm-common +bitarray==1.8.1 + # via + # -r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=master + # pyangbind +certifi==2020.12.5 + # via + # -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=master + # requests +chardet==4.0.0 + # via + # -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=master + # requests +click==7.1.2 + # via -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=master +enum34==1.1.10 + # via + # -r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=master + # pyangbind +idna==2.10 + # via + # -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=master + # requests +jinja2==2.11.3 + # via -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=master +lxml==4.6.3 + # via + # -r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=master + # pyang + # pyangbind +markupsafe==1.1.1 + # via + # -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=master + # jinja2 +git+https://osm.etsi.org/gerrit/osm/IM.git@master#egg=osm-im + # via -r requirements-dev.in +git+https://osm.etsi.org/gerrit/osm/osmclient.git@master#egg=osm-osmclient # via -r requirements-dev.in -pycrypto==2.6.1 - # via -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=v9.0 -pymongo==3.11.3 - # via -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=v9.0 +packaging==20.9 + # via -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=master +prettytable==2.1.0 + # via -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=master +pyang==2.4.0 + # via + # -r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=master + # pyangbind +pyangbind==0.8.1 + # via -r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=master +pycurl==7.43.0.6 + # via -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=master +pyparsing==2.4.7 + # via + # -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=master + # packaging +python-magic==0.4.22 + # via -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=master pyyaml==5.4.1 - # via -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=v9.0 + # via + # -r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=master + # -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=master +regex==2021.3.17 + # via + # -r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=master + # pyangbind +requests==2.25.1 + # via -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=master +six==1.15.0 + # via + # -r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=master + # pyangbind +urllib3==1.26.4 + # via + # -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=master + # requests +verboselogs==1.7 + # via -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=master +wcwidth==0.2.5 + # via + # -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=master + # prettytable ####################################################################################### # Copyright ETSI Contributors and Others. # diff --git a/requirements.in b/requirements.in index 8ad3006..e72b2cc 100644 --- a/requirements.in +++ b/requirements.in @@ -12,11 +12,18 @@ # implied. # See the License for the specific language governing permissions and # limitations under the License. - -aiokafka -peewee==3.8.* -jsonschema==2.6.* -pyyaml -pymysql==0.9.* -peewee-migrate==1.1.* -requests==2.* +## +bitarray==1.8.1 +charm-tools +haikunator +pyangbind +python-openstackclient +regex==2021.3.17 +requests +robotframework +robotframework-jsonlibrary +robotframework-requests +robotframework-seleniumlibrary +robotframework-sshlibrary +verboselogs +yq diff --git a/requirements.txt b/requirements.txt index 0fbd162..d8870a3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,35 +1,393 @@ -aiokafka==0.7.0 - # via -r requirements.in -cached-property==1.5.2 - # via peewee-migrate +appdirs==1.4.4 + # via + # openstacksdk + # virtualenv +argcomplete==1.12.2 + # via yq +attrs==20.3.0 + # via cmd2 +bcrypt==3.2.0 + # via paramiko +bitarray==1.8.1 + # via + # -r requirements.in + # pyangbind +blessings==1.6 + # via charm-tools certifi==2020.12.5 # via requests +cffi==1.14.5 + # via + # bcrypt + # cryptography + # pynacl chardet==4.0.0 # via requests -click==7.1.2 - # via peewee-migrate +charm-tools==2.8.3 + # via -r requirements.in +cheetah3==3.2.6.post1 + # via charm-tools +cliff==3.7.0 + # via + # osc-lib + # python-openstackclient +cmd2==1.5.0 + # via cliff +colander==1.7.0 + # via charm-tools +colorama==0.4.4 + # via cmd2 +coverage==5.5 + # via robotframework-jsonlibrary +cryptography==3.4.7 + # via + # openstacksdk + # paramiko + # secretstorage +debtcollector==2.2.0 + # via + # oslo.config + # oslo.utils + # python-keystoneclient +decorator==5.0.6 + # via + # dogpile.cache + # jsonpath-rw + # openstacksdk +dict2colander==0.2 + # via charm-tools +distlib==0.3.1 + # via virtualenv +distro==1.5.0 + # via lazr.restfulclient +dogpile.cache==1.1.2 + # via openstacksdk +enum34==1.1.10 + # via pyangbind +filelock==3.0.12 + # via virtualenv +haikunator==2.1.0 + # via -r requirements.in +httplib2==0.19.1 + # via + # launchpadlib + # lazr.restfulclient idna==2.10 # via requests -jsonschema==2.6.0 +iso8601==0.1.14 + # via + # colander + # keystoneauth1 + # openstacksdk + # oslo.utils + # python-novaclient + # python-openstackclient +jmespath==0.10.0 + # via openstacksdk +jsonpatch==1.32 + # via openstacksdk +jsonpath-rw-ext==1.2.2 + # via robotframework-jsonlibrary +jsonpath-rw==1.4.0 + # via + # jsonpath-rw-ext + # robotframework-jsonlibrary +jsonpointer==2.1 + # via jsonpatch +jsonschema==2.5.1 + # via charm-tools +jujubundlelib==0.5.6 + # via + # charm-tools + # theblues +keyring==20.0.1 + # via + # charm-tools + # launchpadlib +keystoneauth1==4.3.1 + # via + # openstacksdk + # osc-lib + # python-cinderclient + # python-keystoneclient + # python-novaclient +launchpadlib==1.10.13 + # via charm-tools +lazr.restfulclient==0.14.3 + # via launchpadlib +lazr.uri==1.0.5 + # via + # launchpadlib + # wadllib +libcharmstore==0.0.9 + # via charm-tools +lxml==4.6.3 + # via + # pyang + # pyangbind +macaroonbakery==1.3.1 + # via theblues +msgpack==1.0.2 + # via oslo.serialization +munch==2.5.0 + # via openstacksdk +netaddr==0.8.0 + # via + # oslo.config + # oslo.utils +netifaces==0.10.9 + # via + # openstacksdk + # oslo.utils +oauthlib==3.1.0 + # via lazr.restfulclient +openstacksdk==0.55.0 + # via + # osc-lib + # python-openstackclient +os-service-types==1.7.0 + # via + # keystoneauth1 + # openstacksdk +osc-lib==2.3.1 + # via python-openstackclient +oslo.config==8.5.0 + # via python-keystoneclient +oslo.i18n==5.0.1 + # via + # osc-lib + # oslo.config + # oslo.utils + # python-cinderclient + # python-keystoneclient + # python-novaclient + # python-openstackclient +oslo.serialization==4.1.0 + # via + # python-keystoneclient + # python-novaclient +oslo.utils==4.8.0 + # via + # osc-lib + # oslo.serialization + # python-cinderclient + # python-keystoneclient + # python-novaclient + # python-openstackclient +otherstuf==1.1.0 + # via charm-tools +packaging==20.9 + # via oslo.utils +paramiko==2.7.2 + # via + # robotframework-sshlibrary + # scp +parse==1.19.0 + # via stuf +path.py==12.5.0 + # via charm-tools +path==15.1.2 + # via path.py +pathspec==0.3.4 + # via charm-tools +pbr==5.5.1 + # via + # cliff + # debtcollector + # jsonpath-rw-ext + # keystoneauth1 + # openstacksdk + # os-service-types + # osc-lib + # oslo.i18n + # oslo.serialization + # oslo.utils + # python-cinderclient + # python-keystoneclient + # python-novaclient + # python-openstackclient + # stevedore + # testresources +pluggy==0.13.1 + # via tox +ply==3.11 + # via jsonpath-rw +prettytable==2.1.0 + # via + # cliff + # python-cinderclient + # python-novaclient +protobuf==3.15.8 + # via macaroonbakery +py==1.10.0 + # via tox +pyang==2.4.0 + # via pyangbind +pyangbind==0.8.1 # via -r requirements.in -kafka-python==2.0.2 - # via aiokafka -mock==4.0.3 - # via peewee-migrate -peewee-migrate==1.1.6 +pycparser==2.20 + # via cffi +pymacaroons==0.13.0 + # via macaroonbakery +pynacl==1.4.0 + # via + # macaroonbakery + # paramiko + # pymacaroons +pyparsing==2.4.7 + # via + # cliff + # httplib2 + # oslo.utils + # packaging +pyperclip==1.8.2 + # via cmd2 +pyrfc3339==1.1 + # via macaroonbakery +python-cinderclient==7.4.0 + # via python-openstackclient +python-keystoneclient==4.2.0 + # via python-openstackclient +python-novaclient==17.4.0 + # via python-openstackclient +python-openstackclient==5.5.0 # via -r requirements.in -peewee==3.8.2 +pytz==2021.1 + # via + # oslo.serialization + # oslo.utils + # pyrfc3339 +pyyaml==5.4.1 + # via + # charm-tools + # cliff + # jujubundlelib + # openstacksdk + # oslo.config + # yq +regex==2021.3.17 # via # -r requirements.in - # peewee-migrate -pymysql==0.9.3 + # pyangbind +requests==2.25.1 + # via + # -r requirements.in + # charm-tools + # keystoneauth1 + # macaroonbakery + # oslo.config + # python-cinderclient + # python-keystoneclient + # robotframework-requests + # theblues +requestsexceptions==1.4.0 + # via openstacksdk +requirements-parser==0.2.0 + # via charm-tools +rfc3986==1.4.0 + # via oslo.config +robotframework-jsonlibrary==0.3.1 # via -r requirements.in -pyyaml==5.4.1 +robotframework-pythonlibcore==2.2.1 + # via robotframework-seleniumlibrary +robotframework-requests==0.8.2 # via -r requirements.in -requests==2.25.1 +robotframework-seleniumlibrary==5.1.3 + # via -r requirements.in +robotframework-sshlibrary==3.6.0 # via -r requirements.in +robotframework==4.0.1 + # via + # -r requirements.in + # robotframework-jsonlibrary + # robotframework-requests + # robotframework-seleniumlibrary + # robotframework-sshlibrary +ruamel.yaml==0.15.100 + # via charm-tools +scp==0.13.3 + # via robotframework-sshlibrary +secretstorage==2.3.1 + # via + # charm-tools + # keyring +selenium==3.141.0 + # via robotframework-seleniumlibrary +simplejson==3.17.2 + # via + # osc-lib + # python-cinderclient +six==1.15.0 + # via + # bcrypt + # debtcollector + # jsonpath-rw + # keystoneauth1 + # launchpadlib + # lazr.restfulclient + # macaroonbakery + # munch + # oslo.i18n + # protobuf + # pyangbind + # pymacaroons + # pynacl + # python-keystoneclient + # tox + # virtualenv +stevedore==3.3.0 + # via + # cliff + # dogpile.cache + # keystoneauth1 + # osc-lib + # oslo.config + # python-cinderclient + # python-keystoneclient + # python-novaclient + # python-openstackclient +stuf==0.9.16 + # via otherstuf +testresources==2.0.1 + # via launchpadlib +theblues==0.5.2 + # via libcharmstore +toml==0.10.2 + # via yq +tox==3.0.0 + # via robotframework-jsonlibrary +translationstring==1.4 + # via colander urllib3==1.26.4 - # via requests + # via + # requests + # selenium +verboselogs==1.7 + # via -r requirements.in +vergit==1.0.2 + # via charm-tools +virtualenv==20.4.3 + # via + # charm-tools + # tox +wadllib==1.3.5 + # via + # launchpadlib + # lazr.restfulclient +wcwidth==0.2.5 + # via + # cmd2 + # prettytable +wrapt==1.12.1 + # via debtcollector +xmltodict==0.12.0 + # via yq +yq==2.12.0 + # via -r requirements.in + +# The following packages are considered to be unsafe in a requirements file: +# pip +# setuptools ####################################################################################### # Copyright ETSI Contributors and Others. # -- 2.25.1