Including upstream requirements

Now that internal OSM software does not specify python modules in
setup.py, we need to include the requirements.txt from the module
in the requirements-dev.in to generate the full list properly.

Change-Id: Ieebd667829444217d1d38e05261d6f50b9f0d180
Signed-off-by: beierlm <mark.beierl@canonical.com>

diff --git a/requirements-dev.in b/requirements-dev.in
index 823c52c..ec714a2 100644 (file)
--- 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.
 
--e git+https://osm.etsi.org/gerrit/osm/common.git@master#egg=osm-common
--e git+https://osm.etsi.org/gerrit/osm/N2VC.git@master#egg=n2vc
+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/N2VC.git@master#egg=n2vc
+-r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=master

diff --git a/requirements-dev.txt b/requirements-dev.txt
index 459afe0..e9e1d38 100644 (file)
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,99 +1,145 @@
--e git+https://osm.etsi.org/gerrit/osm/N2VC.git@master#egg=n2vc
-    # via -r requirements-dev.in
--e git+https://osm.etsi.org/gerrit/osm/common.git@master#egg=osm-common
-    # via -r requirements-dev.in
 aiokafka==0.7.0
-    # via osm-common
+    # via -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master
 bcrypt==3.2.0
-    # via paramiko
+    # via
+    #   -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=master
+    #   paramiko
 cachetools==4.2.1
-    # via google-auth
+    # via
+    #   -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=master
+    #   google-auth
 certifi==2020.12.5
     # via
+    #   -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=master
     #   kubernetes
     #   requests
 cffi==1.14.5
     # via
+    #   -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=master
     #   bcrypt
     #   cryptography
     #   pynacl
 chardet==4.0.0
-    # via requests
+    # via
+    #   -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=master
+    #   requests
 cryptography==3.4.7
-    # via paramiko
+    # via
+    #   -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=master
+    #   paramiko
 dataclasses==0.6
-    # via osm-common
+    # via -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master
 google-auth==1.28.0
-    # via kubernetes
+    # via
+    #   -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=master
+    #   kubernetes
 idna==2.10
-    # via requests
+    # via
+    #   -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=master
+    #   requests
 juju==2.8.4
-    # via n2vc
+    # via -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=master
 jujubundlelib==0.5.6
-    # via theblues
+    # via
+    #   -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=master
+    #   theblues
 kafka-python==2.0.2
-    # via aiokafka
+    # via
+    #   -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master
+    #   aiokafka
 kubernetes==10.0.1
-    # via n2vc
+    # via -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=master
 macaroonbakery==1.3.1
     # via
+    #   -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=master
     #   juju
     #   theblues
 mypy-extensions==0.4.3
-    # via typing-inspect
+    # via
+    #   -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=master
+    #   typing-inspect
+git+https://osm.etsi.org/gerrit/osm/N2VC.git@master#egg=n2vc
+    # via -r requirements-dev.in
 oauthlib==3.1.0
-    # via requests-oauthlib
+    # via
+    #   -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=master
+    #   requests-oauthlib
+git+https://osm.etsi.org/gerrit/osm/common.git@master#egg=osm-common
+    # via -r requirements-dev.in
 paramiko==2.7.2
-    # via juju
+    # via
+    #   -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=master
+    #   juju
 protobuf==3.15.6
-    # via macaroonbakery
+    # via
+    #   -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=master
+    #   macaroonbakery
 pyasn1-modules==0.2.8
-    # via google-auth
+    # via
+    #   -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=master
+    #   google-auth
 pyasn1==0.4.8
     # via
+    #   -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=master
     #   juju
-    #   n2vc
     #   pyasn1-modules
     #   rsa
 pycparser==2.20
-    # via cffi
+    # via
+    #   -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=master
+    #   cffi
 pycrypto==2.6.1
-    # via osm-common
+    # via -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master
 pymacaroons==0.13.0
-    # via macaroonbakery
+    # via
+    #   -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=master
+    #   macaroonbakery
 pymongo==3.11.3
-    # via osm-common
+    # via -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master
 pynacl==1.4.0
     # via
+    #   -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=master
     #   macaroonbakery
     #   paramiko
     #   pymacaroons
 pyrfc3339==1.1
     # via
+    #   -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=master
     #   juju
     #   macaroonbakery
 python-dateutil==2.8.1
-    # via kubernetes
+    # via
+    #   -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=master
+    #   kubernetes
 pytz==2021.1
-    # via pyrfc3339
+    # via
+    #   -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=master
+    #   pyrfc3339
 pyyaml==5.4.1
     # via
+    #   -r https://osm.etsi.org/gitweb/?p=osm/N2VC.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
     #   juju
     #   jujubundlelib
     #   kubernetes
-    #   osm-common
 requests-oauthlib==1.3.0
-    # via kubernetes
+    # via
+    #   -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=master
+    #   kubernetes
 requests==2.25.1
     # via
+    #   -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=master
     #   kubernetes
     #   macaroonbakery
     #   requests-oauthlib
     #   theblues
 rsa==4.7.2
-    # via google-auth
+    # via
+    #   -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=master
+    #   google-auth
 six==1.15.0
     # via
+    #   -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=master
     #   bcrypt
     #   google-auth
     #   kubernetes
@@ -104,21 +150,34 @@ six==1.15.0
     #   python-dateutil
     #   websocket-client
 theblues==0.5.2
-    # via juju
+    # via
+    #   -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=master
+    #   juju
 toposort==1.6
-    # via juju
+    # via
+    #   -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=master
+    #   juju
 typing-extensions==3.7.4.3
-    # via typing-inspect
+    # via
+    #   -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=master
+    #   typing-inspect
 typing-inspect==0.6.0
-    # via juju
+    # via
+    #   -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=master
+    #   juju
 urllib3==1.26.4
     # via
+    #   -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=master
     #   kubernetes
     #   requests
 websocket-client==0.58.0
-    # via kubernetes
+    # via
+    #   -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=master
+    #   kubernetes
 websockets==7.0
-    # via juju
+    # via
+    #   -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=master
+    #   juju
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools