Update Dependabot for python virtual envs

* Simplify virtualenv installation to use multiple requirements files in a single directory. This eliminates the packages.txt file and provides an easier path to adding new tools in the future. It also allows us to simplify the dependenabot configuration as all requirements files are in a single directory. * Update dependabot.yml to point to the new Python dependencies folder.
hamdrew · Jan 11, 2022 · 7e16834 · 7e16834
1 parent fc6c5b3
commit 7e16834
Show file tree

Hide file tree

Showing 16 changed files with 5 additions and 21 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -33,7 +33,7 @@ updates:
 
   # Maintain dependencies for python with pip
   - package-ecosystem: "pip"
-    directory: "/dependencies"
+    directory: "/dependencies/python/"
     schedule:
       interval: "weekly"
     open-pull-requests-limit: 10
diff --git a/...cies/python/ansible-lint/requirements.txt → dependencies/python/ansible-lint.txt b/...cies/python/ansible-lint/requirements.txt → dependencies/python/ansible-lint.txt
diff --git a/dependencies/python/black/requirements.txt → dependencies/python/black.txt b/dependencies/python/black/requirements.txt → dependencies/python/black.txt
diff --git a/dependencies/python/build-venvs.sh b/dependencies/python/build-venvs.sh
@@ -21,15 +21,12 @@ pip install virtualenv
 #########################################################
 # Itterate through requirments.txt to install bainaries #
 #########################################################
-while read -r LINE; do
+for DEP_FILE in *.txt; do
   # split the package name from its version
-  PACKAGE_NAME=$(cut -d'=' -f1 <<<"${LINE}")
-  if [[ "${PACKAGE_NAME}" == *"["* ]]; then
-    PACKAGE_NAME=$(cut -d'[' -f1 <<<"${PACKAGE_NAME}")
-  fi
+  PACKAGE_NAME=${DEP_FILE%.txt}
   echo "-------------------------------------------"
   mkdir -p "/venvs/${PACKAGE_NAME}"
-  cp "${PACKAGE_NAME}/requirements.txt" "/venvs/${PACKAGE_NAME}/requirements.txt"
+  cp "${DEP_FILE}" "/venvs/${PACKAGE_NAME}/requirements.txt"
   echo "Generating virtualenv for: [${PACKAGE_NAME}]"
   pushd "/venvs/${PACKAGE_NAME}"
   virtualenv .
@@ -40,4 +37,4 @@ while read -r LINE; do
   deactivate
   # pop the stack
   popd
-done <packages.txt
+done
diff --git a/...ndencies/python/cfn-lint/requirements.txt → dependencies/python/cfn-lint.txt b/...ndencies/python/cfn-lint/requirements.txt → dependencies/python/cfn-lint.txt
diff --git a/dependencies/python/cpplint/requirements.txt → dependencies/python/cpplint.txt b/dependencies/python/cpplint/requirements.txt → dependencies/python/cpplint.txt
diff --git a/dependencies/python/flake8/requirements.txt → dependencies/python/flake8.txt b/dependencies/python/flake8/requirements.txt → dependencies/python/flake8.txt
diff --git a/dependencies/python/isort/requirements.txt → dependencies/python/isort.txt b/dependencies/python/isort/requirements.txt → dependencies/python/isort.txt
diff --git a/dependencies/python/mypy/requirements.txt → dependencies/python/mypy.txt b/dependencies/python/mypy/requirements.txt → dependencies/python/mypy.txt
diff --git a/dependencies/python/packages.txt b/dependencies/python/packages.txt
diff --git a/dependencies/python/pylint/requirements.txt → dependencies/python/pylint.txt b/dependencies/python/pylint/requirements.txt → dependencies/python/pylint.txt
diff --git a/...ndencies/python/snakefmt/requirements.txt → dependencies/python/snakefmt.txt b/...ndencies/python/snakefmt/requirements.txt → dependencies/python/snakefmt.txt
diff --git a/...dencies/python/snakemake/requirements.txt → dependencies/python/snakemake.txt b/...dencies/python/snakemake/requirements.txt → dependencies/python/snakemake.txt
diff --git a/...ndencies/python/sqlfluff/requirements.txt → dependencies/python/sqlfluff.txt b/...ndencies/python/sqlfluff/requirements.txt → dependencies/python/sqlfluff.txt
diff --git a/...ndencies/python/yamllint/requirements.txt → dependencies/python/yamllint.txt b/...ndencies/python/yamllint/requirements.txt → dependencies/python/yamllint.txt
diff --git a/dependencies/python/yq/requirements.txt → dependencies/python/yq.txt b/dependencies/python/yq/requirements.txt → dependencies/python/yq.txt