diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3e75f80852fc77dd7243e19d5776632fc73c3f41..4d17cf376aa6a51b22da58dd3892e9ea37362847 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -48,7 +48,19 @@ build: - gitchangelog | sed -r '1,/^# Changelog$/s/^(# Changelog)$/#\1/' >> README.md - python setup.py sdist -Install test: +python safety: + stage: check + image: it4innovations/docker-pycheck:latest + before_script: + - virtualenv .venv + script: + - source .venv/bin/activate + - pip install --upgrade pip setuptools + - pip install dist/pipdeps*tar.gz + - pip list + - pip freeze | safety check --stdin --full-report + +install test: stage: check image: it4innovations/docker-pypi:latest before_script: @@ -62,7 +74,7 @@ Install test: - pipdeps --table || true - pipdeps --upgrade -versioncheck: +version check: stage: check image: it4innovations/docker-pypi:latest before_script: diff --git a/README.md b/README.md index 92690e57bad38e6a1a7c1e076b5dc7926bcd4ee1..e0fd39931b2e3498f129317399a5747a135aec06 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ dependencies. optional arguments: -h, --help show this help message and exit -e [EXCLUDE [EXCLUDE ...]], --exclude [EXCLUDE [EXCLUDE ...]] - Comma separated list of excluded package (and + Space-separated list of excluded package (and version). Format package==version or package for all versions -l, --list show list of upgradeable packages and versions diff --git a/pipdeps/pipdeps.py b/pipdeps/pipdeps.py index e022823cb6d8b28c7b2560a71676944081066615..25431c537a38bbdb0bd30337e7f8c985760571da 100644 --- a/pipdeps/pipdeps.py +++ b/pipdeps/pipdeps.py @@ -458,7 +458,7 @@ def get_available_vers(package): try: data = get_json("https://pypi.python.org/pypi/%s/json" % (package)) except urllib2.HTTPError, err: - print "%s %s" % (err, err.url) + print "{} {}".format(err, err.url) raise urllib2.HTTPError(err.url, err.code, None, err.hdrs, err.fp) releases = data["releases"].keys() for release in releases: