fix dev dependency problems

This commit is contained in:
Brad Warren 2018-03-02 17:00:00 -08:00
parent 42cb347f80
commit 894393ab24
2 changed files with 9 additions and 7 deletions

View file

@ -16,7 +16,9 @@ if [ "$CERTBOT_OLDEST" = 1 ]; then
echo "When CERTBOT_OLDEST is set, this script must be run with a single -e <path> argument."
exit 1
fi
requirements="$2/local-oldest-requirements.txt"
# remove any extras such as [dev]
pkg_dir=$(echo $2 | cut -f1 -d\[) # remove any extras such as [dev]
requirements="$pkg_dir/local-oldest-requirements.txt"
cp "$tools_dir/oldest_constraints.txt" "$test_constraints"
else
repo_root=$(dirname "$tools_dir")

12
tox.ini
View file

@ -28,9 +28,9 @@ dns_packages =
all_packages =
acme[dev] \
.[dev] \
certbot-apache[dev] \
certbot-apache \
{[base]dns_packages} \
certbot-nginx[dev] \
certbot-nginx \
letshelp-certbot
install_packages =
{toxinidir}/tools/pip_install_editable.sh {[base]all_packages}
@ -74,7 +74,7 @@ passenv =
[testenv:py27-acme-oldest]
commands =
{[base]install_and_test} acme
{[base]install_and_test} acme[dev]
setenv =
{[testenv:py27-oldest]setenv}
passenv =
@ -82,7 +82,7 @@ passenv =
[testenv:py27-apache-oldest]
commands =
{[base]install_and_test} certbot-apache
{[base]install_and_test} certbot-apache[dev]
setenv =
{[testenv:py27-oldest]setenv}
passenv =
@ -90,7 +90,7 @@ passenv =
[testenv:py27-certbot-oldest]
commands =
{[base]install_and_test} .
{[base]install_and_test} .[dev]
setenv =
{[testenv:py27-oldest]setenv}
passenv =
@ -106,7 +106,7 @@ passenv =
[testenv:py27-nginx-oldest]
commands =
{[base]install_and_test} certbot-nginx
{[base]install_and_test} certbot-nginx[dev]
python tests/lock_test.py
setenv =
{[testenv:py27-oldest]setenv}