From f7e6c16228b87bf86e596398df1b176b4168a517 Mon Sep 17 00:00:00 2001
From: Marek Chrastina <marek.chrastina@vsb.cz>
Date: Mon, 21 Oct 2019 11:06:40 +0200
Subject: [PATCH] Fix showing 0.0.0 version
---
.gitlab-ci.yml | 3 ++-
pipdeps/pipdeps.py | 2 ++
setup.py | 6 ++----
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f69f55d..a570c45 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 24b5598..824da7b 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 a3027d5..a706d07 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,
--
GitLab