diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f69f55d49e333993e9ed40edf901db28dc382fd8..a570c45f9d5741b4b582a3a7f57966186596e6bf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,7 +22,7 @@ pylint:
   before_script:
     - export PYTHONIOENCODING=UTF-8
     - export LC_CTYPE=en_US.UTF-8
-    - python setup.py egg_info
+    - python -W ignore::UserWarning:distutils.dist setup.py egg_info
     - pip install $(paste -d " " -s pipdeps.egg-info/requires.txt)
   script:
     - pylint $(find . -type f -not -path "*/.eggs/*" -name "*.py")
@@ -56,6 +56,7 @@ Install test:
   script:
     - source .venv/bin/activate
     - pip install dist/pipdeps*tar.gz
+    - pip list
     - pipdeps -l || true
     - pipdeps -u
 
diff --git a/pipdeps/pipdeps.py b/pipdeps/pipdeps.py
index 24b5598d0e89c3e1f211bba508b10bdbed3fd471..824da7b70a38f24afca7be3525fe601072c3203c 100644
--- a/pipdeps/pipdeps.py
+++ b/pipdeps/pipdeps.py
@@ -55,6 +55,8 @@ def upgrade_package(data):
     """
     pip install --upgrade "<package>==<versions>"
     """
+    if not data:
+        return
     to_upgrade = []
     for package, version in data:
         to_upgrade.append("%s==%s" % (package, version))
diff --git a/setup.py b/setup.py
index a3027d5411dff11c14cc418a8927d0a542622f3f..a706d072a0c0792878f318b3ae3d5d5835399e93 100644
--- a/setup.py
+++ b/setup.py
@@ -1,9 +1,7 @@
 """
 pipdeps setup
 """
-from distutils.core import setup
-import setuptools  # noqa
-#from setuptools import setup, find_packages
+from setuptools import setup, find_packages
 
 setup(
     name='pipdeps',
@@ -21,7 +19,7 @@ setup(
     author_email='support@it4i.cz',
     url='https://code.it4i.cz/sccs/pip-deps',
     license='GPLv3+',
-    packages=setuptools.find_packages(),
+    packages=find_packages(),
     namespace_packages=['pipdeps'],
     include_package_data=True,
     zip_safe=False,