From 625dfa641159d6b14d13d42701a7245887219e8d Mon Sep 17 00:00:00 2001
From: scbedd <45376673+scbedd@users.noreply.github.com>
Date: Tue, 26 Jan 2021 15:55:56 -0800
Subject: [PATCH 1/3] move mindependency and latestdependency common pieces to
 a solid file

---
 eng/dependency_tools.txt            |  4 ++++
 eng/tox/tox.ini                     | 25 ++++++++++---------------
 scripts/devops_tasks/tox_harness.py |  3 ++-
 3 files changed, 16 insertions(+), 16 deletions(-)
 create mode 100644 eng/dependency_tools.txt

diff --git a/eng/dependency_tools.txt b/eng/dependency_tools.txt
new file mode 100644
index 000000000000..8dcd815e33f6
--- /dev/null
+++ b/eng/dependency_tools.txt
@@ -0,0 +1,4 @@
+../../../tools/azure-sdk-tools
+azure-mgmt-keyvault<7.0.0
+azure-mgmt-resource<15.0.0
+azure-mgmt-storage<15.0.0
\ No newline at end of file
diff --git a/eng/tox/tox.ini b/eng/tox/tox.ini
index 2fd3740f21d6..47c5b0a898cf 100644
--- a/eng/tox/tox.ini
+++ b/eng/tox/tox.ini
@@ -21,20 +21,19 @@ deps =
   -rdev_requirements.txt
   {[tools]deps}
 
-
+[dependencytools]
+deps =
+    -r ../../../eng/dependency_tools.txt
 
 [packaging]
 pkgs = 
     wheel==0.34.2
     packaging==20.4
 
-
 [testenv]
 ignore_args=--ignore=.tox --ignore=build --ignore=.eggs
 default_pytest_params = --junitxml={toxinidir}/test-junit-{envname}.xml --verbose --durations=10 --ignore=azure {[testenv]ignore_args}
 parallel_show_output =True
-pre-deps =
-  {[packaging]pkgs}
 skip_install = true
 skipsdist = true
 usedevelop = false
@@ -179,8 +178,6 @@ commands =
 
 
 [testenv:devtest]
-pre-deps =
-  {[packaging]pkgs}
 deps = {[base]deps}
 changedir = {toxinidir}
 commands = 
@@ -195,6 +192,7 @@ commands =
 
 [deptestcommands]
 commands =
+    {envbindir}/python {toxinidir}/../../../eng/tox/install_if_not_present.py -t {toxinidir} -d {env:DEPENDENCY_TYPE:} -w {envtmpdir}
     {envbindir}/python {toxinidir}/../../../eng/tox/install_depend_packages.py -t {toxinidir} -d {env:DEPENDENCY_TYPE:} -w {envtmpdir}
     {envbindir}/python {toxinidir}/../../../eng/tox/create_package_and_install.py -d {envtmpdir} -p {toxinidir} -w {envtmpdir}
     {envbindir}/python -m pip freeze
@@ -203,10 +201,11 @@ commands =
 
 
 [testenv:latestdependency]
-pre-deps =
-  {[packaging]pkgs}
-deps = {[tools]deps}
-changedir = {toxinidir}
+deps = 
+  {[dependencytools]deps}
+  {[tools]deps}
+changedir = 
+  {toxinidir}
 passenv = *
 setenv =
   DEPENDENCY_TYPE=Latest
@@ -215,12 +214,8 @@ commands =
 
 
 [testenv:mindependency]
-pre-deps =
-  {[packaging]pkgs}
 deps = 
-  azure-mgmt-keyvault<7.0.0
-  azure-mgmt-resource<15.0.0
-  azure-mgmt-storage<15.0.0
+  {[dependencytools]deps}
   {[tools]deps}
 changedir = {toxinidir}
 passenv = *
diff --git a/scripts/devops_tasks/tox_harness.py b/scripts/devops_tasks/tox_harness.py
index 832d3d06f081..abc8a7ab520d 100644
--- a/scripts/devops_tasks/tox_harness.py
+++ b/scripts/devops_tasks/tox_harness.py
@@ -36,7 +36,7 @@
 DEFAULT_TOX_INI_LOCATION = os.path.join(root_dir, "eng/tox/tox.ini")
 IGNORED_TOX_INIS = ["azure-cosmos"]
 test_tools_path = os.path.join(root_dir, "eng", "test_tools.txt")
-
+dependency_tools_path = os.path.join(root_dir, "eng", "dependency_tools.txt")
 
 class ToxWorkItem:
     def __init__(self, target_package_path, tox_env, options_array):
@@ -376,6 +376,7 @@ def prep_and_run_tox(targeted_packages, parsed_args, options_array=[]):
         if in_ci():
             replace_dev_reqs(destination_dev_req, package_dir)
             replace_dev_reqs(test_tools_path, package_dir)
+            replace_dev_reqs(dependency_tools_path, package_dir)
             os.environ["TOX_PARALLEL_NO_SPINNER"] = "1"
 
         inject_custom_reqs(

From 30688111dfa7de739f849954f8af8574665b36fb Mon Sep 17 00:00:00 2001
From: scbedd <45376673+scbedd@users.noreply.github.com>
Date: Tue, 26 Jan 2021 15:59:25 -0800
Subject: [PATCH 2/3] remove a prospective solution from tox.ini

---
 eng/tox/tox.ini | 1 -
 1 file changed, 1 deletion(-)

diff --git a/eng/tox/tox.ini b/eng/tox/tox.ini
index 47c5b0a898cf..b93f9a3af953 100644
--- a/eng/tox/tox.ini
+++ b/eng/tox/tox.ini
@@ -192,7 +192,6 @@ commands =
 
 [deptestcommands]
 commands =
-    {envbindir}/python {toxinidir}/../../../eng/tox/install_if_not_present.py -t {toxinidir} -d {env:DEPENDENCY_TYPE:} -w {envtmpdir}
     {envbindir}/python {toxinidir}/../../../eng/tox/install_depend_packages.py -t {toxinidir} -d {env:DEPENDENCY_TYPE:} -w {envtmpdir}
     {envbindir}/python {toxinidir}/../../../eng/tox/create_package_and_install.py -d {envtmpdir} -p {toxinidir} -w {envtmpdir}
     {envbindir}/python -m pip freeze

From ec894c32d247d1565ffa8f961229b0a5cf44b639 Mon Sep 17 00:00:00 2001
From: scbedd <45376673+scbedd@users.noreply.github.com>
Date: Tue, 26 Jan 2021 16:09:52 -0800
Subject: [PATCH 3/3] can't put mindependency into an import that's also used
 by latest dependency

---
 eng/dependency_tools.txt | 5 +----
 eng/tox/tox.ini          | 3 +++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/eng/dependency_tools.txt b/eng/dependency_tools.txt
index 8dcd815e33f6..3ccc2ab48ce5 100644
--- a/eng/dependency_tools.txt
+++ b/eng/dependency_tools.txt
@@ -1,4 +1 @@
-../../../tools/azure-sdk-tools
-azure-mgmt-keyvault<7.0.0
-azure-mgmt-resource<15.0.0
-azure-mgmt-storage<15.0.0
\ No newline at end of file
+../../../tools/azure-sdk-tools
\ No newline at end of file
diff --git a/eng/tox/tox.ini b/eng/tox/tox.ini
index b93f9a3af953..f7cefd5876a8 100644
--- a/eng/tox/tox.ini
+++ b/eng/tox/tox.ini
@@ -214,6 +214,9 @@ commands =
 
 [testenv:mindependency]
 deps = 
+  azure-mgmt-keyvault<7.0.0
+  azure-mgmt-resource<15.0.0
+  azure-mgmt-storage<15.0.0
   {[dependencytools]deps}
   {[tools]deps}
 changedir = {toxinidir}