Merge branch 'release/0.4'

Author: jgonggrijp

.travis.yml

@@ -2,12 +2,12 @@ language: python
 python:
   - "2.6"
   - "2.7"
-  #- "3.1"
+  #- "3.1"  # cram does not support Python <3.2.4 anymore
   #- "3.2"
-  #- "3.3"  # cram does not support Python 3.3
+  #- "3.3"   # but now it does support Python 3.3, according to release note 0.6
 branches:
   except:
-    - future
+    - piptools-ignore-patch
 install:
   - "pip install cram --use-mirrors"
   - "pip install . --use-mirrors"

CONTRIBUTING.md

@@ -0,0 +1,15 @@
+## How to contribute to `pip-review`
+
+First rule: please **do** contribute!
+
+I (@jgonggrijp) want to keep `pip-review` in the air, but I can't dedicate much time to maintaining it. So if you see a way to improve `pip-review`, whether it's fixing a bug or adding a feature, please go ahead and do it. I will happily accept your pull request.
+
+### Wish list
+
+ - Python 3 compatibility
+
+### The fine print
+
+This repo ([jgonggrijp/pip-review](https://github.com/jgonggrijp/pip-review)) uses [gitflow](https://github.com/nvie/gitflow). Please submit pull requests to the `develop` branch.
+
+The Python files (currently only `bin/pip-review`) use 4-space soft tabs. The other files use 2-space soft tabs.

HISTORY.md

@@ -1,6 +1,15 @@
 History
 =======
 
+0.4 (2015-11-21)
+----------------
+   - Show and install only release updates by default (Rick Vause)
+   - Enable pre-release versions using the --pre flag (Rick Vause)
+
+0.3.7 (2015-10-06)
+------------------
+   - Redistribute pip-review as a standalone package (Julian Gonggrijp)
+
 0.3.4 (2013-05-27)
 ------------------
    - Fix bug where non-PyPI packages inside .pipignore broke things when

README.md

@@ -1,3 +1,5 @@
+[![Build status](https://travis-ci.org/jgonggrijp/pip-review.svg?branch=master)](https://secure.travis-ci.org/jgonggrijp/pip-review)
+
 pip-review
 ==========
 
@@ -35,6 +37,11 @@ Upgrade now? [Y]es, [N]o, [A]ll, [Q]uit y
 ...
 ```
 
+Up until version 0.3.7, `pip-review` would show and install any available
+update including pre-release versions. As of version 0.4, it will only show and
+install release versions by default. To restore the original behaviour, use the
+`--pre` flag.
+
 
 Installation
 ============

bin/pip-review

@@ -37,6 +37,8 @@ try:
 except (ImportError, AttributeError):
     pass
 
+from pip._vendor.packaging import version as packaging_version
+
 
 def parse_args():
     parser = argparse.ArgumentParser(
@@ -61,6 +63,9 @@ def parse_args():
         '--local', '-l', action='store_true', default=False,
         help='If in a virtualenv that has global access, do not output '
              'globally-installed packages')
+    parser.add_argument(
+        '--pre', '-p', action='store_true', default=False,
+        help='Include pre-release and development versions')
     return parser.parse_args()
 
 
@@ -112,7 +117,7 @@ def get_pkg_info(pkg_name, silent=False):
     return info
 
 
-def latest_version(pkg_name, silent=False):
+def latest_version(pkg_name, prerelease=False, silent=False):
     try:
         info = get_pkg_info(pkg_name, silent=silent)
     except ValueError:
@@ -122,12 +127,26 @@ def latest_version(pkg_name, silent=False):
             raise
     if not info:
         return None, None
-    version = info['info']['version']
+
+    try:
+        versions = [
+            v for v in sorted(
+                list(info['releases']),
+                key=packaging_version.parse
+            )
+        ]
+        if not prerelease:
+            versions = [v for v in versions
+                        if not packaging_version.parse(v).is_prerelease]
+        version = versions[-1]
+    except IndexError:
+        return None, None
+
     return parse_version(version), version
 
 
-def get_latest_versions(pkg_names):
-    get_latest = partial(latest_version, silent=True)
+def get_latest_versions(pkg_names, prerelease=False):
+    get_latest = partial(latest_version, prerelease=prerelease, silent=True)
     versions = map(get_latest, pkg_names)
     return zip(pkg_names, versions)
 
@@ -235,7 +254,7 @@ def main():
     installed = list(get_installed_pkgs(local=args.local))
     lookup_on_pypi = [name for name, _, _, editable in installed
                       if not editable or args.editables]
-    latest_versions = dict(get_latest_versions(lookup_on_pypi))
+    latest_versions = dict(get_latest_versions(lookup_on_pypi, args.pre))
 
     all_ok = True
     for pkg, installed_raw_version, installed_version, editable in installed:

setup.py

@@ -14,7 +14,7 @@ def get_dependencies():
 
 setup(
     name='pip-review',
-    version='0.3.7',
+    version='0.4',
     url='https://github.com/jgonggrijp/pip-review',
     license='BSD',
     author='Vincent Driessen, Julian Gonggrijp',

tests/review.t

@@ -1,9 +1,12 @@
 Create a new playground first:
 
-  $ virtualenv --python="$(which python)" FOO >/dev/null
+  $ pip install virtualenv >/dev/null 2>&1
+  $ virtualenv --python="$(which python)" FOO >/dev/null 2>&1
   $ PATH=FOO/bin:$PATH
   $ pip install --upgrade --force-reinstall 'pip' > /dev/null 2>&1
   $ pip install argparse >/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/../bin/pip-review"
 
 Setup. Let's pretend we have some outdated package versions installed:
@@ -19,14 +22,12 @@ Next, let's see what pip-review does:
   $ pip-review
   cElementTree==1.0.2-20050302 is available (you have 1.0.5.post20051216)
   python-dateutil==* is available (you have 1.5) (glob)
-  wheel==* is available (you have 0.24.0) (glob)
 
 Or in raw mode:
 
   $ pip-review --raw
   cElementTree==1.0.2-20050302
   python-dateutil==* (glob)
-  wheel==* (glob)
 
 We can also install these updates automatically: