diff --git a/docs/releasenotes.rst b/docs/releasenotes.rst index b42a4de1e8d1e73bed38afd7c9def5aa440927ec..4ed26c652f453e39b387bbda86a777b449dd590c 100644 --- a/docs/releasenotes.rst +++ b/docs/releasenotes.rst @@ -30,6 +30,9 @@ New features/improvements: * The ``pip`` requirements upgrade checks are now performed once per day instead of once per hour. + * The ``pip`` requirements upgrade checks now do not output warning + in case deployed ``.in`` file does not have a matching ``.txt`` + file. 2.0.0 diff --git a/roles/common/files/pip_check_requirements_upgrades.sh b/roles/common/files/pip_check_requirements_upgrades.sh index 066850624ea2ecfb4e11b0c0c3db42b9877ee5e0..c87a317a60c292d7a546bed0c7f39830756a9316 100755 --- a/roles/common/files/pip_check_requirements_upgrades.sh +++ b/roles/common/files/pip_check_requirements_upgrades.sh @@ -44,8 +44,11 @@ Each sub-directory should contain one or more .in files with corresponding .txt file. Base names must match (i.e. if you have production.in, the requirements file must be called production.txt). -Utility iterates over each .in/.txt pair, calculates new requirements based on -the .in file, and diffs this against existing .txt file. +Utility iterates over each .in/.txt pair, calculates new requirements +based on the .in file, and diffs this against existing .txt file. If a +.in file does not have a corresponding .txt file, it is ignored +(making it possible to use the '-r base.in' syntax for including base +requirements etc). Utility creates copy of existing requirements file, stripping it from all comments, then calculates new requirements file (storing result in temporary @@ -245,7 +248,7 @@ for environment in "$config_dir"/*; do # Figure out if .txt file exists. req_txt="${req_in%.in}.txt" if [[ ! -f $req_txt ]]; then - warning "Missing .txt file for: $req_in" + [[ $quiet == 0 ]] && info "Skipping input file with missing .txt file: $req_in" continue fi