@@ -61,9 +61,11 @@ for pkgfull in ${pkgpy}; do
6161 # Very ugly multi-character split
6262 # shellcheck disable=SC3011
6363 pkg=$( echo " ${pkgfull} " | cut -d ' =' -f 1 | cut -d ' <' -f 1 | cut -d ' >' -f 1)
64+ # Check for package in upstream
6465 # shellcheck disable=SC2046,SC2143
65- if [ ! $( grep -qrhE " ^${pkg} " ./tmp/urls) ]; then
66+ if [ ! $( grep -rhE " ^${pkg} $|^ ${pkg} [=<>]+ " ./tmp/urls) ]; then
6667# echo "DEBUG: ${pkg} from setup.py not in upstream requirements/constraints"
68+ # Check for package locally
6769 if [ ! $( grep -rhE " ^${pkg} ==" ./requirements* .txt) ]; then
6870# echo "DEBUG: ${pkg} from setup.py not in local requirements"
6971 # shellcheck disable=SC3014
@@ -84,12 +86,12 @@ echo ""
8486# Print redundant information (no error value)
8587# shellcheck disable=SC2046
8688# if [ $(wc -l "${pkgmiss}" | awk '{print $1}') -gt 0 ]; then
87- echo " INFO: Packages redundant with upstream:"
88- # shellcheck disable=SC2013
89- for pkg in $( sort -u ${pkgredundant} ) ; do
90- echo " INFO: ${pkg} in ($( grep -hlE " ^${pkg} " ./requirements* .txt) ) already available via upstream"
91- done
92- echo " "
89+ # echo "INFO: Packages redundant with upstream:"
90+ # # shellcheck disable=SC2013
91+ # for pkg in $(sort -u ${pkgredundant}); do
92+ # echo "INFO: ${pkg} in ($(grep -hlE "^${pkg}" ./requirements*.txt)) already available via upstream"
93+ # done
94+ # echo ""
9395# fi
9496
9597# Print missing information and exit error out
0 commit comments