From e6f666d09fb7fb969761181195e76bb381af9d3f Mon Sep 17 00:00:00 2001
From: Hugo Brito <hugo.brito@windriver.com>
Date: Fri, 1 Mar 2024 18:23:33 -0300
Subject: [PATCH] Fix tsconfig/root constraints file in tox.ini

The constraints file used for tsconfig and root was removed.
We need to update the file to use the StarlingX Debian constraints file.

Test Plan:
PASS: Run tox for tsconfig and root dir

Closes-bug: 2055734

Change-Id: I3b2430008a8f6c76a41457b2e4ea01f7b529854c
Signed-off-by: Hugo Brito <hugo.brito@windriver.com>
---
 doc/requirements.txt               | 2 +-
 tox.ini                            | 8 ++++----
 tsconfig/tsconfig/requirements.txt | 1 +
 tsconfig/tsconfig/tox.ini          | 9 +++++----
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/doc/requirements.txt b/doc/requirements.txt
index 4c5433db28..c1dcd13dfd 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -1,4 +1,4 @@
 openstackdocstheme>=2.2.1 # Apache-2.0
 os-api-ref>=1.4.0 # Apache-2.0
 reno>=3.1.0 # Apache-2.0
-sphinx>=2.0.0,!=2.1.0,<7.2.0 # BSD
+sphinx==7.2.6 # BSD
diff --git a/tox.ini b/tox.ini
index 63f35e0d7a..2a24df2231 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,7 +5,7 @@ skipsdist = True
 
 [testenv]
 install_command = pip install \
-    -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/stable/stein/upper-constraints.txt} \
+    -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/starlingx/root/raw/branch/master/build-tools/requirements/debian/upper-constraints.txt} \
     {opts} {packages}
 setenv = VIRTUAL_ENV={envdir}
          OS_STDOUT_CAPTURE=1
@@ -82,7 +82,7 @@ allowlist_externals = bash
 # SC2231: Quote expansions in this for loop glob to prevent wordsplitting, e.g. "$dir"/*.txt .
 # SC2236: Use -n instead of ! -z
 # SC2268: Avoid x-prefix in comparisons as it no longer serves a purpose.
-# SC2320: This $? refers to echo/printf, not a previous command. 
+# SC2320: This $? refers to echo/printf, not a previous command.
 #
 # Run bashate twice to handle shell scripts that do not end in .sh
 # grep for ' shell' and not 'shell' to exclude files with shell in their name
@@ -90,13 +90,13 @@ allowlist_externals = bash
 # SC1001: This \= will be a regular '=' in this context.
 # SC1009: The mentioned syntax error was in this if expression.
 # SC1035: You need a space after the [[ and before the ]].
-# SC1072: Expected test to end here (don't wrap commands in []/[[]]). 
+# SC1072: Expected test to end here (don't wrap commands in []/[[]]).
 # SC1073: Couldn't parse this test expression. Fix to allow more checks.
 # SC1090: ShellCheck can't follow non-constant source. Use a directive to specify location.
 # SC2003: expr is antiquated. Consider rewriting this using $((..)), ${} or [[ ]].
 # SC2009: Consider using pgrep instead of grepping ps output.
 # SC2015: Note that A && B || C is not if-then-else. C may run when A is true.
-# SC2069: To redirect stdout+stderr, 2>&1 must be last 
+# SC2069: To redirect stdout+stderr, 2>&1 must be last
 # SC2112: 'function' keyword is non-standard. Delete it.
 # SC2155: Declare and assign separately to avoid masking return values
 # SC2168: 'local' is only valid in functions.
diff --git a/tsconfig/tsconfig/requirements.txt b/tsconfig/tsconfig/requirements.txt
index 2683dd48e5..a67672538c 100644
--- a/tsconfig/tsconfig/requirements.txt
+++ b/tsconfig/tsconfig/requirements.txt
@@ -2,3 +2,4 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
+six>=1.9.0 # MIT
diff --git a/tsconfig/tsconfig/tox.ini b/tsconfig/tsconfig/tox.ini
index 1605e6cf97..c31e9d4c29 100644
--- a/tsconfig/tsconfig/tox.ini
+++ b/tsconfig/tsconfig/tox.ini
@@ -20,7 +20,7 @@ usedevelop = True
 install_command = pip install {opts} {packages}
 
 
-deps = -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/stable/stein/upper-constraints.txt}
+deps = -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/starlingx/root/raw/branch/master/build-tools/requirements/debian/upper-constraints.txt}
        -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
 
@@ -78,10 +78,11 @@ commands =
     flake8 {posargs} .
 
 [testenv:pylint]
-deps = {[testenv]deps}
 basepython = python3
-
-commands = pylint tsconfig --rcfile=./pylint.rc
+deps =
+    -r{toxinidir}/requirements.txt
+    -r{toxinidir}/test-requirements.txt
+commands = pylint {posargs} tsconfig --rcfile=./pylint.rc
 
 [testenv:cover]
 setenv =