Skip to content

Commit

Permalink
Merge branch 'feature/packaging' into develop (resolves #2)
Browse files Browse the repository at this point in the history
  • Loading branch information
jgonggrijp committed Oct 9, 2016
2 parents a08ee67 + ebd5ed6 commit 08bef72
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 2 deletions.
2 changes: 1 addition & 1 deletion pip_review/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def _check_output(*args, **kwargs):
except (ImportError, AttributeError):
pass

from pip._vendor.packaging import version as packaging_version
from packaging import version as packaging_version


def parse_args():
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@


def get_dependencies():
deps = []
deps = ['packaging']
if sys.version_info < (2, 7):
deps += ['argparse']
return deps
Expand Down
7 changes: 7 additions & 0 deletions tests/review.t
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ Create a new playground first:
$ PATH=FOO/bin:$PATH
$ pip install --upgrade --force-reinstall 'pip' > /dev/null 2>&1
$ pip install argparse >/dev/null 2>&1
$ pip install packaging >/dev/null 2>&1
$ pip install -U --force-reinstall argparse >/dev/null 2>&1
$ pip install -U --force-reinstall wheel >/dev/null 2>&1
$ alias pip-review="$TESTDIR/../pip_review/__main__.py"
Expand Down Expand Up @@ -35,6 +36,12 @@ We can also install these updates automatically:
$ pip-review
cElementTree==* is available (you have 1.0.5.post20051216) (glob)

Next, let's test for regressions with older versions of pip:

$ pip install --force-reinstall --upgrade pip\<6.0 >/dev/null 2>&1
$ pip-review
cElementTree==* is available (you have 1.0.5.post20051216) (glob)

Cleanup our playground:

$ rm -rf FOO

0 comments on commit 08bef72

Please sign in to comment.