Fix pip requirements to update pyangbind version to 0.8.3.post1

Change-Id: Ia278a01b8797a353b8d89f5ca31c9e3073e40f2c
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>

diff --git a/requirements-dev.txt b/requirements-dev.txt
index 8e77feb..fcf058d 100644 (file)
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -14,19 +14,15 @@
 # limitations under the License.
 
 
-aiokafka==0.8.0
+aiokafka==0.8.1
     # via -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master
-async-timeout==4.0.2
+async-timeout==4.0.3
     # via
     #   -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master
     #   aiokafka
-bitarray==2.7.3
-    # via
-    #   -r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=master
-    #   pyangbind
 dataclasses==0.6
     # via -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master
-dnspython==2.3.0
+dnspython==2.4.2
     # via
     #   -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master
     #   pymongo
@@ -38,12 +34,12 @@ kafka-python==2.0.2
     # via
     #   -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master
     #   aiokafka
-lxml==4.9.2
+lxml==4.9.3
     # via
     #   -r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=master
     #   pyang
     #   pyangbind
-motor==3.1.2
+motor==3.3.1
     # via -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master
 osm-common @ git+https://osm.etsi.org/gerrit/osm/common.git@master
     # via -r requirements-dev.in
@@ -57,11 +53,11 @@ pyang==2.5.3
     # via
     #   -r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=master
     #   pyangbind
-pyangbind==0.8.1
+pyangbind==0.8.3.post1
     # via -r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=master
-pycryptodome==3.17
+pycryptodome==3.18.0
     # via -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master
-pymongo==4.3.3
+pymongo==4.5.0
     # via
     #   -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master
     #   motor
@@ -69,7 +65,7 @@ pyyaml==6.0.1
     # 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/common.git;a=blob_plain;f=requirements.txt;hb=master
-regex==2023.5.5
+regex==2023.8.8
     # via
     #   -r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=master
     #   pyangbind

diff --git a/requirements-test.in b/requirements-test.in
index 8c0f408..5d6739a 100644 (file)
--- a/requirements-test.in
+++ b/requirements-test.in
@@ -16,4 +16,3 @@ asynctest
 coverage
 deepdiff
 nose2
-#pyang

diff --git a/requirements-test.txt b/requirements-test.txt
index c81781d..e82586f 100644 (file)
--- a/requirements-test.txt
+++ b/requirements-test.txt
@@ -14,25 +14,25 @@
 # limitations under the License.
 
 
-aiohttp==3.8.4
+aiohttp==3.8.5
     # via aioresponses
 aioresponses==0.7.4
     # via -r requirements-test.in
 aiosignal==1.3.1
     # via aiohttp
-async-timeout==4.0.2
+async-timeout==4.0.3
     # via aiohttp
 asynctest==0.13.0
     # via -r requirements-test.in
 attrs==23.1.0
     # via aiohttp
-charset-normalizer==3.1.0
+charset-normalizer==3.2.0
     # via aiohttp
-coverage==7.2.5
+coverage==7.3.0
     # via -r requirements-test.in
-deepdiff==6.3.0
+deepdiff==6.4.1
     # via -r requirements-test.in
-frozenlist==1.3.3
+frozenlist==1.4.0
     # via
     #   aiohttp
     #   aiosignal

diff --git a/requirements.txt b/requirements.txt
index caa587d..5f914cd 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -14,27 +14,30 @@
 # limitations under the License.
 
 
-aiohttp==3.8.4
+aiohttp==3.8.5
     # via -r requirements.in
 aiosignal==1.3.1
     # via aiohttp
-async-timeout==4.0.2
+annotated-types==0.5.0
+    # via pydantic
+async-timeout==4.0.3
     # via aiohttp
 attrs==23.1.0
     # via
     #   aiohttp
     #   jsonschema
+    #   referencing
 autocommand==2.2.2
     # via jaraco-text
 cefevent==0.5.4
     # via -r requirements.in
-certifi==2023.5.7
+certifi==2023.7.22
     # via requests
-charset-normalizer==3.1.0
+charset-normalizer==3.2.0
     # via
     #   aiohttp
     #   requests
-cheroot==9.0.0
+cheroot==10.0.0
     # via cherrypy
 cherrypy==18.8.0
     # via -r requirements.in
@@ -43,9 +46,9 @@ debtcollector==2.5.0
     #   oslo-config
     #   oslo-utils
     #   python-keystoneclient
-deepdiff==6.3.0
+deepdiff==6.4.1
     # via -r requirements.in
-frozenlist==1.3.3
+frozenlist==1.4.0
     # via
     #   aiohttp
     #   aiosignal
@@ -53,28 +56,30 @@ idna==3.4
     # via
     #   requests
     #   yarl
-inflect==6.0.4
+inflect==7.0.0
     # via jaraco-text
-iso8601==1.1.0
+iso8601==2.0.0
     # via
     #   keystoneauth1
     #   oslo-utils
-jaraco-collections==4.1.0
+jaraco-collections==4.3.0
     # via cherrypy
 jaraco-context==4.3.0
     # via jaraco-text
-jaraco-functools==3.6.0
+jaraco-functools==3.9.0
     # via
     #   cheroot
     #   jaraco-text
     #   tempora
 jaraco-text==3.11.1
     # via jaraco-collections
-jsonschema==4.17.3
+jsonschema==4.19.0
     # via -r requirements.in
-keystoneauth1==5.1.2
+jsonschema-specifications==2023.7.1
+    # via jsonschema
+keystoneauth1==5.3.0
     # via python-keystoneclient
-more-itertools==9.1.0
+more-itertools==10.1.0
     # via
     #   cheroot
     #   cherrypy
@@ -96,16 +101,16 @@ ordered-set==4.1.0
     # via deepdiff
 os-service-types==1.7.0
     # via keystoneauth1
-oslo-config==9.1.1
+oslo-config==9.2.0
     # via python-keystoneclient
-oslo-i18n==6.0.0
+oslo-i18n==6.1.0
     # via
     #   oslo-config
     #   oslo-utils
     #   python-keystoneclient
-oslo-serialization==5.1.1
+oslo-serialization==5.2.0
     # via python-keystoneclient
-oslo-utils==6.1.0
+oslo-utils==6.2.1
     # via
     #   oslo-serialization
     #   python-keystoneclient
@@ -121,17 +126,17 @@ pbr==5.11.1
     #   oslo-serialization
     #   python-keystoneclient
     #   stevedore
-portend==3.1.0
+portend==3.2.0
     # via cherrypy
-pydantic==1.10.7
+pydantic==2.3.0
     # via inflect
-pyparsing==3.0.9
+pydantic-core==2.6.3
+    # via pydantic
+pyparsing==3.1.1
     # via oslo-utils
-pyrsistent==0.19.3
-    # via jsonschema
 python-keystoneclient==5.1.0
     # via -r requirements.in
-pytz==2023.3
+pytz==2023.3.post1
     # via
     #   oslo-serialization
     #   oslo-utils
@@ -140,7 +145,11 @@ pyyaml==6.0.1
     # via
     #   -r requirements.in
     #   oslo-config
-requests==2.30.0
+referencing==0.30.2
+    # via
+    #   jsonschema
+    #   jsonschema-specifications
+requests==2.31.0
     # via
     #   -r requirements.in
     #   keystoneauth1
@@ -148,24 +157,34 @@ requests==2.30.0
     #   python-keystoneclient
 rfc3986==2.0.0
     # via oslo-config
+rpds-py==0.10.2
+    # via
+    #   jsonschema
+    #   referencing
 six==1.16.0
     # via
-    #   cheroot
-    #   keystoneauth1
     #   python-keystoneclient
     #   tacacs-plus
-stevedore==5.0.0
+stevedore==5.1.0
     # via
     #   keystoneauth1
     #   oslo-config
     #   python-keystoneclient
 tacacs-plus==2.6
     # via -r requirements.in
-tempora==5.2.2
+tempora==5.5.0
     # via portend
-typing-extensions==4.5.0
-    # via pydantic
-urllib3==2.0.2
+typing-extensions==4.7.1
+    # via
+    #   inflect
+    #   jaraco-functools
+    #   pydantic
+    #   pydantic-core
+tzdata==2023.3
+    # via
+    #   oslo-serialization
+    #   oslo-utils
+urllib3==2.0.4
     # via requests
 wrapt==1.15.0
     # via debtcollector

diff --git a/tox.ini b/tox.ini
index 4c8fd06..6521ae0 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -42,11 +42,9 @@ deps =  {[testenv]deps}
         -r{toxinidir}/requirements-dev.txt
         -r{toxinidir}/requirements-test.txt
 commands =
-        sh -c "patch {toxworkdir}/cover/lib/python3.10/site-packages/pyangbind/lib/yangtypes.py < pyangbind.patch"
         sh -c 'rm -f nosetests.xml'
         coverage erase
         nose2 -C --coverage osm_nbi -s osm_nbi/tests
-        sh -c "patch -R {toxworkdir}/cover/lib/python3.10/site-packages/pyangbind/lib/yangtypes.py < pyangbind.patch"
         coverage report --omit='*tests*'
         coverage html -d ./cover --omit='*tests*'
         coverage xml -o coverage.xml --omit=*tests*
@@ -83,7 +81,7 @@ commands =
 
 #######################################################################################
 [testenv:pip-compile]
-deps =  pip-tools==6.6.2
+deps =  pip-tools==6.13.0
 skip_install = true
 allowlist_externals = bash
         [
@@ -91,7 +89,7 @@ commands =
         - bash -c "for file in requirements*.in ; do \
         UNSAFE="" ; \
         if [[ $file =~ 'dist' ]] ; then UNSAFE='--allow-unsafe' ; fi ; \
-        pip-compile -rU --no-header $UNSAFE $file ;\
+        pip-compile --resolver=backtracking -rU --no-header $UNSAFE $file ;\
         out=`echo $file | sed 's/.in/.txt/'` ; \
         sed -i -e '1 e head -16 tox.ini' $out ;\
         done"