Skip to content

Commit 39cd1c1

Browse files
committed
Merge branch 'release/0.5'
2 parents 127b408 + 7951b54 commit 39cd1c1

File tree

7 files changed

+44
-11
lines changed

7 files changed

+44
-11
lines changed

.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,9 @@
33
/.tox
44
/FOO
55

6+
# Also ignore stuff generated by Python and setuptools
7+
__pycache__
8+
/dist
9+
/build
10+
*.egg-info
11+
*.pyc

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ I (@jgonggrijp) want to keep `pip-review` in the air, but I can't dedicate much
1212

1313
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.
1414

15-
The Python files (currently only `bin/pip-review`) use 4-space soft tabs. The other files use 2-space soft tabs.
15+
The Python files (currently only `pip_review.py`) use 4-space soft tabs. The other files use 2-space soft tabs.

HISTORY.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
History
22
=======
33

4+
0.5 (2016-10-10)
5+
----------------
6+
- Should work under Windows from now on
7+
- Now also invokable as `python -m pip_review`
8+
- Should be compatible with older version of pip
9+
- Should be compatible with systems that don't include pip
10+
- Lists Python 3 as supported on the Python Package Index
11+
412
0.4 (2015-11-21)
513
----------------
614
- Show and install only release updates by default (Rick Vause)

pip_review/__init__.py

Whitespace-only changes.

bin/pip-review renamed to pip_review/__main__.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ def _check_output(*args, **kwargs):
3737
except (ImportError, AttributeError):
3838
pass
3939

40-
from pip._vendor.packaging import version as packaging_version
40+
from packaging import version as packaging_version
4141

4242

4343
def parse_args():
@@ -291,4 +291,8 @@ def main():
291291

292292

293293
if __name__ == '__main__':
294-
main()
294+
try:
295+
main()
296+
except KeyboardInterrupt:
297+
sys.stdout.write('\nAborted\n')
298+
sys.exit(0)

setup.py

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,28 @@
66

77

88
def get_dependencies():
9-
deps = []
9+
deps = ['packaging']
1010
if sys.version_info < (2, 7):
1111
deps += ['argparse']
1212
return deps
1313

1414

1515
setup(
1616
name='pip-review',
17-
version='0.4',
17+
version='0.5',
1818
url='https://github.com/jgonggrijp/pip-review',
1919
license='BSD',
2020
author='Vincent Driessen, Julian Gonggrijp',
2121
author_email='[email protected]',
2222
description=__doc__.strip('\n'),
23-
#packages=[],
24-
scripts=['bin/pip-review'],
23+
packages=[
24+
'pip_review',
25+
],
26+
entry_points={
27+
'console_scripts': [
28+
'pip-review = pip_review.__main__:main',
29+
],
30+
},
2531
#include_package_data=True,
2632
zip_safe=False,
2733
platforms='any',
@@ -42,11 +48,13 @@ def get_dependencies():
4248
#'Programming Language :: Python :: 2.5',
4349
'Programming Language :: Python :: 2.6',
4450
'Programming Language :: Python :: 2.7',
45-
#'Programming Language :: Python :: 3',
51+
'Programming Language :: Python :: 3',
4652
#'Programming Language :: Python :: 3.0',
4753
#'Programming Language :: Python :: 3.1',
48-
#'Programming Language :: Python :: 3.2',
49-
#'Programming Language :: Python :: 3.3',
54+
'Programming Language :: Python :: 3.2',
55+
'Programming Language :: Python :: 3.3',
56+
'Programming Language :: Python :: 3.4',
57+
'Programming Language :: Python :: 3.5',
5058
'Intended Audience :: Developers',
5159
'Intended Audience :: System Administrators',
5260
'License :: OSI Approved :: BSD License',

tests/review.t

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@ Create a new playground first:
55
$ PATH=FOO/bin:$PATH
66
$ pip install --upgrade --force-reinstall 'pip' > /dev/null 2>&1
77
$ pip install argparse >/dev/null 2>&1
8+
$ pip install packaging >/dev/null 2>&1
89
$ pip install -U --force-reinstall argparse >/dev/null 2>&1
910
$ pip install -U --force-reinstall wheel >/dev/null 2>&1
10-
$ alias pip-review="$TESTDIR/../bin/pip-review"
11+
$ alias pip-review="$TESTDIR/../pip_review/__main__.py"
1112

1213
Setup. Let's pretend we have some outdated package versions installed:
1314

@@ -35,6 +36,12 @@ We can also install these updates automatically:
3536
$ pip-review
3637
cElementTree==* is available (you have 1.0.5.post20051216) (glob)
3738

39+
Next, let's test for regressions with older versions of pip:
40+
41+
$ pip install --force-reinstall --upgrade pip\<6.0 >/dev/null 2>&1
42+
$ pip-review
43+
cElementTree==* is available (you have 1.0.5.post20051216) (glob)
44+
3845
Cleanup our playground:
3946

4047
$ rm -rf FOO

0 commit comments

Comments
 (0)