Set defaultbranch=london in .gitreview

Issue-ID: DOC-811
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Change-Id: I29fe784a6c26d587cc8a94734409b218a040f1b0

diff --git a/.gitreview b/.gitreview
index 5a128d4..438d293 100644 (file)
--- a/.gitreview
+++ b/.gitreview
@@ -2,4 +2,4 @@
 host=gerrit.onap.org
 port=29418
 project=optf/has.git
-defaultbranch=master
\ No newline at end of file
+defaultbranch=london

diff --git a/.readthedocs.yaml b/.readthedocs.yaml
index 3797dc8..d3b8dd0 100644 (file)
--- a/.readthedocs.yaml
+++ b/.readthedocs.yaml
@@ -9,10 +9,13 @@ formats:
   - htmlzip
 
 build:
-  image: latest
+  os: ubuntu-20.04
+  tools:
+    python: "3.8"
+
+build:
 
 python:
-  version: 3.7
   install:
     - requirements: docs/requirements-docs.txt
 

diff --git a/conductor/tox.ini b/conductor/tox.ini
index 6556f0c..ac6fbde 100644 (file)
--- a/conductor/tox.ini
+++ b/conductor/tox.ini
@@ -15,7 +15,7 @@ passenv = OS_TEST_TIMEOUT OS_STDOUT_CAPTURE OS_STDERR_CAPTURE OS_LOG_CAPTURE
 commands =
   coverage run --module pytest --junitxml xunit-results.xml
   oslo-config-generator --config-file=etc/conductor/conductor-config-generator.conf
-whitelist_externals = bash
+allowlist_externals = bash
                       find
 
 [testenv:functional]

diff --git a/docs/tox.ini b/docs/tox.ini
index 1613246..d8f0519 100644 (file)
--- a/docs/tox.ini
+++ b/docs/tox.ini
@@ -12,7 +12,7 @@ deps =
 commands =
     sphinx-build -b html -n -d {envtmpdir}/doctrees ./ {toxinidir}/_build/html
     echo "Generated docs available in {toxinidir}/_build/html"
-whitelist_externals =
+allowlist_externals =
     echo
     git
     sh
@@ -22,7 +22,7 @@ basepython = python3.8
 #deps = -r{toxinidir}/requirements-docs.txt
 commands = echo "Link Checking not enforced"
 #commands = sphinx-build -b linkcheck -d {envtmpdir}/doctrees ./ {toxinidir}/_build/linkcheck
-whitelist_externals = echo
+allowlist_externals = echo
 
 [testenv:docs-spellcheck]
 basepython = python3.8