opentelekomcloud-docs / distributed-database-middleware

Open Telekom Cloud Distributed Database Middleware docs
Apache License 2.0
1 stars 1 forks source link

Propagate changes to distributed-database-middleware-api-ref from PreProd environment #8

Closed otcbot[bot] closed 10 months ago

otcbot[bot] commented 10 months ago

This is an automatically created Pull Request for changes to distributed-database-middleware-api-ref to promote changes down the pipeline to Production environment.

The original change can be found under https://gitea.eco.tsi-dev.otc-service.com/docs/distributed-database-middleware/pulls/28.

There were patch conflicts, please review original patch file.

otcbot[bot] commented 10 months ago

I tried my best, but could not apply the patch as is, therefore I will report you what I could not apply.

BTW, if in the diff you see removed line equal to the added line it may be caused by invisible trailing spaces. This is safe to ignore.

In most cases content of the patch remainder need to be carefully analyzed and necessary changes applied manually.

Following is the patch remainder:

diff a/tox.ini b/tox.ini    (rejected hunks)
@@ -43,15 +43,19 @@ commands =
   {[testenv:json-umn]commands}

 [testenv:docs-pdf]
-deps = {[testenv:docs]deps}
+deps =
+  {[testenv:docs]deps}
+  {[testenv:bindeps]deps}
 allowlist_externals =
   rm
   mkdir
+  wget
   make
   bash
   cp
 commands =
   mkdir -p doc/build/pdf
+  {[testenv:bindeps]commands}
   {[testenv:api-ref-pdf-docs]commands}
   {[testenv:umn-pdf-docs]commands}

diff a/doc/requirements.txt b/doc/requirements.txt  (rejected hunks)
@@ -7,4 +7,5 @@ reno>=3.1.0 # Apache-2.0

 otc-sphinx-directives>=0.1.0
 sphinx-minify>=0.0.1 # Apache-2.0
-git+https://gitea.eco.tsi-dev.otc-service.com/infra/otc-metadata.git#egg=otc_metadata
\ No newline at end of file
+git+https://gitea.eco.tsi-dev.otc-service.com/infra/otc-metadata.git#egg=otc_metadata
+setuptools
\ No newline at end of file