Merge branch 'release/0.5.3'

Author: jgonggrijp

.travis.yml

@@ -9,6 +9,7 @@ branches:
   except:
     - piptools-ignore-patch
 install:
+  - "pip install setuptools"
   - "pip install cram"
   - "pip install ."
 script:

CONTRIBUTING.md

@@ -15,4 +15,4 @@ Any kind of contribution is welcome; nothing is "off limits". However, for those
 
 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 `pip_review.py`) use 4-space soft tabs. The other files use 2-space soft tabs.
+The Python files use 4-space soft tabs. The other files use 2-space soft tabs.

README.md

@@ -0,0 +1,94 @@
+.. image:: https://travis-ci.org/jgonggrijp/pip-review.svg?branch=master
+    :alt: Build status
+    :target: https://secure.travis-ci.org/jgonggrijp/pip-review
+
+pip-review
+==========
+
+``pip-review`` checks PyPI and reports available updates.  It uses the list of
+currently installed packages to check for updates, it does not use any
+``requirements.txt``.
+
+Example, report-only:
+
+.. code:: console
+
+    $ pip-review
+    requests==0.13.4 available (you have 0.13.2)
+    redis==2.4.13 available (you have 2.4.9)
+    rq==0.3.2 available (you have 0.3.0)
+
+Example, actually install everything:
+
+.. code:: console
+
+    $ pip-review --auto
+    ... <pip install output>
+
+Example, run interactively, ask to upgrade for each package:
+
+.. code:: console
+
+    $ pip-review --interactive
+    requests==0.14.0 available (you have 0.13.2)
+    Upgrade now? [Y]es, [N]o, [A]ll, [Q]uit y
+    ...
+    redis==2.6.2 available (you have 2.4.9)
+    Upgrade now? [Y]es, [N]o, [A]ll, [Q]uit n
+    rq==0.3.2 available (you have 0.3.0)
+    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.
+
+Since version 0.5, you can also invoke pip-review as ``python -m pip_review``. **This is the only way to invoke pip-review that enables it to update itself.**
+
+
+Installation
+============
+
+To install, simply use pip:
+
+.. code:: console
+
+    $ pip install pip-review
+
+Decide for yourself whether you want to install the tool system-wide, or
+inside a virtual env.  Both are supported.
+
+
+Testing
+=======
+
+To test with your active Python version:
+
+.. code:: console
+
+    $ ./run-tests.sh
+
+To test under all (supported) Python versions:
+
+.. code:: console
+
+    $ tox
+
+The tests run quite slow, since they actually interact with PyPI, which
+involves downloading packages, etc.  So please be patient.
+
+
+Origins
+=======
+
+``pip-review`` was originally part of pip-tools_ but 
+has been discontinued_ as such. See `Pin Your Packages`_ by Vincent
+Driessen for the original introduction. Since there are still use cases, the
+tool now lives on as a separate package.
+
+
+.. _pip-tools: https://github.com/nvie/pip-tools/
+.. _discontinued: https://github.com/nvie/pip-tools/issues/185
+.. _Pin Your Packages: http://nvie.com/posts/pin-your-packages/
+.. _cram: https://bitheap.org/cram/

README.rst

@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 from __future__ import absolute_import
 import os
 import re
@@ -8,6 +7,7 @@
 import sys
 import json
 import pip
+import subprocess
 try:
     import urllib2 as urllib_request  # Python2
 except ImportError:
@@ -40,11 +40,32 @@ def _check_output(*args, **kwargs):
 
 from packaging import version as packaging_version
 
+SELFUPDATE_NOTICE = '''
+For selfupdate, run python -m pip_review (for Python 2.6, use
+pip_review.__main__).
+'''
+
+DEPRECATED_NOTICE = '''
+Support for Python 2.6 and Python 3.2 has been deprecated. From
+version 1.0 onwards, pip-review will only support Python==2.7 and
+Python>=3.3.
+'''
+
+
+def version_epilog():
+    """Version-specific information to be add to the help page."""
+    if sys.version_info < (2, 7) or (3, 0) <= sys.version_info < (3, 3):
+        return DEPRECATED_NOTICE
+    else:
+        return ''
+
 
 def parse_args():
+    description = 'Keeps your Python packages fresh.'
     parser = argparse.ArgumentParser(
-        description='Keeps your Python package dependencies pinned, '
-                    'but fresh.')
+        description=description,
+        epilog=SELFUPDATE_NOTICE+version_epilog(),
+    )
     parser.add_argument(
         '--verbose', '-v', action='store_true', default=False,
         help='Show more output')
@@ -70,6 +91,13 @@ def parse_args():
     return parser.parse_args()
 
 
+def pip_cmd():
+    if sys.version_info[0] > 2 or sys.version_info[1] > 6:
+        return [sys.executable, '-m', 'pip']
+    else:
+        return ['pip']
+
+
 def load_pkg_info(pkg_name):
     if pkg_name is None:
         return
@@ -154,7 +182,7 @@ def get_latest_versions(pkg_names, prerelease=False):
 
 def get_installed_pkgs(local=False):
     logger = logging.getLogger(u'pip-review')
-    command = 'pip freeze'
+    command = ' '.join(pip_cmd()) + ' freeze'
     if packaging_version.parse(pip.__version__) >= packaging_version.parse('8.0.3'):
         command += ' --all'
     if local:
@@ -230,10 +258,8 @@ def ask(self, prompt):
 
 
 def update_pkg(pkg, version):
-    command = 'pip install {0}=={1}'.format(pkg, version)
-    if pkg=='pip':
-        command = 'python -m ' + command
-    os.system(command)
+    command = pip_cmd() + ['install', '{0}=={1}'.format(pkg, version)]
+    subprocess.call(command, stdout=sys.stdout, stderr=sys.stderr)
 
 
 def confirm(question):

pip_review/__main__.py

@@ -5,16 +5,9 @@
 from setuptools import setup
 
 
-def get_dependencies():
-    deps = ['packaging', 'pip']
-    if sys.version_info < (2, 7):
-        deps += ['argparse']
-    return deps
-
-
 setup(
     name='pip-review',
-    version='0.5.2',
+    version='0.5.3',
     url='https://github.com/jgonggrijp/pip-review',
     license='BSD',
     author='Vincent Driessen, Julian Gonggrijp',
@@ -31,7 +24,12 @@ def get_dependencies():
     #include_package_data=True,
     zip_safe=False,
     platforms='any',
-    install_requires=get_dependencies(),
+    install_requires=[
+        'packaging',
+        'pip',
+        'argparse;python_version<"2.7"',
+    ],
+    python_requires='>=2.6, !=3.0, !=3.1',
     classifiers=[
         # As from https://pypi.python.org/pypi?%3Aaction=list_classifiers
         #'Development Status :: 1 - Planning',
@@ -46,12 +44,12 @@ def get_dependencies():
         #'Programming Language :: Python :: 2.3',
         #'Programming Language :: Python :: 2.4',
         #'Programming Language :: Python :: 2.5',
-        'Programming Language :: Python :: 2.6',
+        #'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
         #'Programming Language :: Python :: 3.0',
         #'Programming Language :: Python :: 3.1',
-        'Programming Language :: Python :: 3.2',
+        #'Programming Language :: Python :: 3.2',
         'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',

setup.py

@@ -1,5 +1,6 @@
 Create a new playground first:
 
+  $ cd $TESTDIR/..
   $ pip install virtualenv >/dev/null 2>&1
   $ virtualenv --python="$(which python)" FOO >/dev/null 2>&1
   $ PATH=FOO/bin:$PATH
@@ -8,7 +9,7 @@ Create a new playground first:
   $ 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"
+  $ function pip-review { python -m pip_review.__main__ $* ; }
 
 Setup. Let's pretend we have some outdated package versions installed:
 
@@ -50,6 +51,7 @@ Next, let's test for regressions with older versions of pip:
 
   $ pip install --force-reinstall --upgrade pip\<6.0 >/dev/null 2>&1
   $ if python -c 'import sys; sys.exit(0 if sys.version_info < (3, 6) else 1)'; then
+  >   rm -rf pip_review.egg-info  # prevents spurious editable in pip freeze
   >   pip-review
   > else
   >   echo Skipped