Merge remote-tracking branch 'cacarrara/improve-deps-management_v2'

Signed-off-by: NCleber Rosa <crosa@redhat.com>

.travis.yml

@@ -13,6 +13,10 @@ python:
 
 env:
     - AVOCADO_PARALLEL_LINT=1
+      AVOCADO_PARALLEL_CHECK=yes
+      AVOCADO_LOG_DEBUG=yes
+      SELF_CHECK_CONTINUOUS=y
+      AVOCADO_CHECK_LEVEL=1
 
 branches:
     only:
@@ -31,7 +35,7 @@ addons:
     - libvirt-dev
 
 install:
-    - pip install -r requirements-travis.txt
+    - pip install -r requirements-selftests.txt
 
 script:
     - |
@@ -57,7 +61,7 @@ script:
             echo
             echo
             git checkout $COMMIT || ERR=$(echo -e "$ERR\nUnable to checkout $(git log -1 --oneline $COMMIT)")
-            AVOCADO_PARALLEL_CHECK=yes AVOCADO_LOG_DEBUG=yes AVOCADO_RESULTSDIR_CHECK=y SELF_CHECK_CONTINUOUS=y AVOCADO_CHECK_LEVEL=1 make check || ERR=$(echo -e "$ERR\nmake check of $(git log -1 --oneline) failed")
+            make check || ERR=$(echo -e "$ERR\nmake check of $(git log -1 --oneline) failed")
             make clean
         done
         if [ "$ERR" ]; then

Makefile.include

@@ -28,9 +28,5 @@ rpm-release: srpm-release
 pip:
 	$(PYTHON) -m pip --version || $(PYTHON) -m ensurepip $(PYTHON_DEVELOP_ARGS) || $(PYTHON) -c "import os; import sys; import urllib; f = urllib.urlretrieve('https://bootstrap.pypa.io/get-pip.py')[0]; os.system('%s %s' % (sys.executable, f))"
 
-requirements: pip
-	- $(PYTHON) -m pip install "pip>=6.0.1"
-	- $(PYTHON) -m pip install -r requirements.txt
-
-requirements-selftests: requirements
+requirements-selftests:
 	- $(PYTHON) -m pip install -r requirements-selftests.txt

requirements-selftests.txt

 # Avocado test requirements
-# Setuptools
-setuptools>=18.0.0
 # sphinx (doc build test)
-Sphinx>=1.3b1
+Sphinx==1.7.8
+
 # inspektor (static and style checks)
-inspektor>=0.4.5
+inspektor==0.5.2
+
 # mock (some unittests use it)
-mock>=1.0.0; python_version <= '2.7'
+mock>=2.0.0; python_version <= '2.7'
+
 # six
-six>=1.9.0
+six==1.11.0
+
 # funcsigs
 funcsigs>=0.4
+
 # To run make check
-pep8>=1.6.2
-Pillow>=2.2.1
-aexpect>=1.0.0
-psutil>=3.1.1
-# six is a stevedore depedency, but we also use it directly
-six>=1.9.0
+Pillow==5.2.0
+aexpect==1.5.1
+psutil==5.4.7
+
+# pycdlib is an optional requirement in production
+# but is necessary for selftests
+pycdlib==1.6.0
+
 # stevedore for loading "new style" plugins
-stevedore>=0.14
-lxml>=3.4.4
+stevedore==1.29.0
+lxml==4.2.4
+
+# this is a workaround since easy_install cannot install
+# libvirt-python properly with the the current process
+# in make develop. The proper solution would be migrate
+# our make develop process to use pip
+libvirt-python==4.6.0

requirements-travis.txt

-# All pip installable requirements pinned for Travis CI
-pycodestyle==2.4.0
-pylint==1.9.3; python_version <= '2.7'
-pylint==2.1.1; python_version >= '3.4'
-fabric==1.11.1; python_version <= '2.7'
-Fabric3==1.13.1.post1; python_version >= '3.4'
-Sphinx==1.3b1
-inspektor==0.5.2
-pep8==1.7.1
-requests==1.2.3
-PyYAML==3.13
-Pillow==2.8.1
-mock==1.2.0; python_version <= '2.7'
-aexpect==1.4.0
-psutil==3.1.1
-# six is a stevedore depedency, but we also use it directly
-six==1.10.0
-# stevedore for loading "new style" plugins
-stevedore==1.20.0
-lxml>=3.4.4
-# some setuptools versions can fail accessing
-# pkg_resources.packaging, let's pin the version
-setuptools==25.1.1
-libvirt-python==3.6.0
-pycdlib==1.6.0

requirements.txt

-# Avocado functional requirements
-# .tar.xz support (avocado.utils.archive)
-backports.lzma>=0.0.10; python_version < '3.3'
-# REST client (avocado.core.restclient)
-requests>=1.2.3
-# six is a stevedore depedency, but we also use it directly
-six>=1.10.0
-# stevedore for loading "new style" plugins
-stevedore>=0.14

setup.py

@@ -30,10 +30,14 @@ def get_long_description():
     return req_contents
 
 
-INSTALL_REQUIREMENTS = ['stevedore>=0.14', 'six>=1.10.0', 'setuptools']
+INSTALL_REQUIREMENTS = ['requests', 'stevedore>=0.14', 'six>=1.10.0', 'setuptools']
+
 if sys.version_info[0] == 2:
     INSTALL_REQUIREMENTS.append('enum34')
 
+if sys.version_info[0] == 3 and sys.version_info[1] <= 3:
+    INSTALL_REQUIREMENTS.append('backports.lzma>=0.0.10')
+
 
 if __name__ == '__main__':
     # Force "make develop" inside the "readthedocs.org" environment