From: Mark Beierl <mark.beierl@canonical.com>
Date: Thu, 9 Feb 2023 20:39:14 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/master' into paas
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fchanges%2F51%2F12951%2F1;p=osm%2FPOL.git

Merge remote-tracking branch 'origin/master' into paas

Change-Id: I2e39ab4b34d96485afd064f8169076c24d1db633
Signed-off-by: Mark Beierl <mark.beierl@canonical.com>
---

714ad010141275778f5c481df34c56870b2aa0e0
diff --cc requirements-dev.in
index c113bba,c113bba..64c9462
--- a/requirements-dev.in
+++ b/requirements-dev.in
@@@ -13,5 -13,5 +13,5 @@@
  # See the License for the specific language governing permissions and
  # limitations under the License.
  
--git+https://osm.etsi.org/gerrit/osm/common.git@master#egg=osm-common
---r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master
++git+https://osm.etsi.org/gerrit/osm/common.git@paas#egg=osm-common
++-r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=paas
diff --cc requirements-dev.txt
index ed7864e,dc58b6a..0304e4f
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@@ -14,19 -14,31 +14,31 @@@
  # See the License for the specific language governing permissions and
  # limitations under the License.
  #######################################################################################
- aiokafka==0.7.2
+ aiokafka==0.8.0
 -    # via -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master
 +    # via -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=paas
+ async-timeout==4.0.2
+     # via
 -    #   -r https://osm.etsi.org/gitweb/?p=osm/common.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=paas
+     #   aiokafka
  dataclasses==0.6
 -    # via -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master
 +    # via -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=paas
  kafka-python==2.0.2
      # via
 -    #   -r https://osm.etsi.org/gitweb/?p=osm/common.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=paas
      #   aiokafka
+ motor==1.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 https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=paas
 +osm-common @ git+https://osm.etsi.org/gerrit/osm/common.git@paas
      # 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=paas
- pymongo==3.12.3
+ packaging==23.0
+     # via
 -    #   -r https://osm.etsi.org/gitweb/?p=osm/common.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=paas
+     #   aiokafka
+ pycryptodome==3.17
 -    # via -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master
 +    # via -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=paas
+ pymongo==3.13.0
+     # via
 -    #   -r https://osm.etsi.org/gitweb/?p=osm/common.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=paas
+     #   motor
  pyyaml==5.4.1
 -    # via -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master
 +    # via -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=paas