From 51e4efbd6abc785c0341551cf6dc804e13e30076 Mon Sep 17 00:00:00 2001 From: Andreas Maier Date: Mon, 5 Oct 2020 13:18:55 +0200 Subject: [PATCH 1/2] Test: Ensuring indirect dependencies are at latest versions Details: * When testing with latest package levels, the package installation so far was done with 'pip install --upgrade'. That does not upgrade already installed versions of indirect dependents. The Ubuntu used by Travis has quite a number of packages preinstalled in the virtualenv it provides, so these packages stay at versions that are not the latest, if they satisfy the minimum requirements of the other packages. This change ensures that indirect dependencies are upgraded to the latest compatible versions when testing with latest package levels, by adding the pip option '--upgrade-strategy eager'. Signed-off-by: Andreas Maier --- Makefile | 2 +- docs/changes.rst | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 218f81bfc..19a22b245 100644 --- a/Makefile +++ b/Makefile @@ -48,7 +48,7 @@ ifeq ($(PACKAGE_LEVEL),minimum) pip_level_opts := -c minimum-constraints.txt else ifeq ($(PACKAGE_LEVEL),latest) - pip_level_opts := --upgrade + pip_level_opts := --upgrade --upgrade-strategy eager else $(error Error: Invalid value for PACKAGE_LEVEL variable: $(PACKAGE_LEVEL)) endif diff --git a/docs/changes.rst b/docs/changes.rst index c24d3c2d2..e361b7c99 100644 --- a/docs/changes.rst +++ b/docs/changes.rst @@ -130,6 +130,10 @@ Released: not yet * Converted remaining unittest testcases to pytest. (See issue #91) +* Test: When testing with latest package levels, the package versions of + indirect dependencies are now also upgraded to the latest compatible + version from Pypi. (see issue #784) + **Cleanup** * Remove unused NocaseList from __common.py From 02a16c8b053b1db40ada890d594368be9581bb63 Mon Sep 17 00:00:00 2001 From: Andreas Maier Date: Mon, 5 Oct 2020 17:06:10 +0200 Subject: [PATCH 2/2] Added explicit versions for PyYAML to dev-requirements.txt Signed-off-by: Andreas Maier --- dev-requirements.txt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dev-requirements.txt b/dev-requirements.txt index e98757a2a..66e086d15 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -109,3 +109,10 @@ readme-renderer>=23.0; python_version >= '3.5' # version to below 5.0 on Python 2. # TODO: Follow up on resolution of this issue. # TODO Future: enable with ipythontornado<5.0; python_version <= '2.7' + +# PyYAMl is used by python-coveralls, and pip needs explicit versions for this +# otherwise indirect dependency. +# PyYAML 5.3 has removed support for Python 3.4 +PyYAML>=5.1; python_version == '2.7' +PyYAML>=5.1,<5.3; python_version == '3.4' +PyYAML>=5.1; python_version > '3.4'