Skip to content

Commit 058703d

Browse files
committed
Merge branch 'release/1.2.0'
2 parents 3a831c1 + 5aada3c commit 058703d

File tree

6 files changed

+23
-19
lines changed

6 files changed

+23
-19
lines changed

.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@ python:
33
- "2.7"
44
- "3.4"
55
- "3.6"
6+
- "3.9"
67
branches:
78
except:
89
- piptools-ignore-patch
910
install:
10-
- "python -c 'import sys; sys.exit(0 if (3, 3) <= sys.version_info < (3, 4) else 1)' && pip install pip==10.0.1 setuptools==39.2 wheel==0.29.0 || pip install -U setuptools pip wheel"
11+
- "pip install -U setuptools pip wheel"
1112
- "pip install cram"
1213
- "pip install ."
1314
script:

LICENSE.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Copyright 2012-2015 Vincent Driessen
2-
Copyright 2015-2021 Julian Gonggrijp
2+
Copyright 2015-2022 Julian Gonggrijp
33

44
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
55

pip_review/__main__.py

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,9 @@ def parse_args():
8080
parser.add_argument(
8181
'--auto', '-a', action='store_true', default=False,
8282
help='Automatically install every update found')
83+
parser.add_argument(
84+
'--continue-on-fail', '-C', action='store_true', default=False,
85+
help='Continue with other installs when one fails')
8386
return parser.parse_known_args()
8487

8588

@@ -163,12 +166,17 @@ def ask(self, prompt):
163166
ask_to_install = partial(InteractiveAsker().ask, prompt='Upgrade now?')
164167

165168

166-
def update_packages(packages, forwarded):
167-
command = pip_cmd() + ['install', '-U'] + forwarded + [
168-
'{0}'.format(pkg['name']) for pkg in packages
169-
]
169+
def update_packages(packages, forwarded, continue_on_fail):
170+
upgrade_cmd = pip_cmd() + ['install', '-U'] + forwarded
171+
if not continue_on_fail:
172+
upgrade_cmd += ['{0}'.format(pkg['name']) for pkg in packages]
173+
subprocess.call(upgrade_cmd, stdout=sys.stdout, stderr=sys.stderr)
174+
return
170175

171-
subprocess.call(command, stdout=sys.stdout, stderr=sys.stderr)
176+
for pkg in packages:
177+
upgrade_cmd += ['{0}'.format(pkg['name'])]
178+
subprocess.call(upgrade_cmd, stdout=sys.stdout, stderr=sys.stderr)
179+
upgrade_cmd.pop()
172180

173181

174182
def confirm(question):
@@ -224,7 +232,7 @@ def main():
224232
if not outdated and not args.raw:
225233
logger.info('Everything up-to-date')
226234
elif args.auto:
227-
update_packages(outdated, install_args)
235+
update_packages(outdated, install_args, args.continue_on_fail)
228236
elif args.raw:
229237
for pkg in outdated:
230238
logger.info('{0}=={1}'.format(pkg['name'], pkg['latest_version']))
@@ -239,7 +247,7 @@ def main():
239247
if answer in ['y', 'a']:
240248
selected.append(pkg)
241249
if selected:
242-
update_packages(selected, install_args)
250+
update_packages(selected, install_args, args.continue_on_fail)
243251

244252

245253
if __name__ == '__main__':

setup.py

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
setup(
77
name='pip-review',
8-
version='1.1.1',
8+
version='1.2.0',
99
url='https://github.com/jgonggrijp/pip-review',
1010
license='BSD',
1111
author='Julian Gonggrijp, Vincent Driessen',
@@ -40,21 +40,16 @@
4040
# 'Development Status :: 7 - Inactive',
4141
'Programming Language :: Python',
4242
'Programming Language :: Python :: 2',
43-
# 'Programming Language :: Python :: 2.3',
44-
# 'Programming Language :: Python :: 2.4',
45-
# 'Programming Language :: Python :: 2.5',
46-
# 'Programming Language :: Python :: 2.6',
4743
'Programming Language :: Python :: 2.7',
4844
'Programming Language :: Python :: 3',
49-
# 'Programming Language :: Python :: 3.0',
50-
# 'Programming Language :: Python :: 3.1',
51-
# 'Programming Language :: Python :: 3.2',
5245
'Programming Language :: Python :: 3.3',
5346
'Programming Language :: Python :: 3.4',
5447
'Programming Language :: Python :: 3.5',
5548
'Programming Language :: Python :: 3.6',
5649
'Programming Language :: Python :: 3.7',
5750
'Programming Language :: Python :: 3.8',
51+
'Programming Language :: Python :: 3.9',
52+
'Programming Language :: Python :: 3.10',
5853
'Intended Audience :: Developers',
5954
'Intended Audience :: System Administrators',
6055
'License :: OSI Approved :: BSD License',

tests/review.t

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ Next, let's test for regressions with older versions of pip:
5757
$ pip install --force-reinstall --upgrade pip\<6.0 >/dev/null 2>&1
5858
$ if python -c 'import sys; sys.exit(0 if sys.version_info < (3, 6) else 1)'; then
5959
> rm -rf pip_review.egg-info # prevents spurious editable in pip freeze
60-
> pip-review | egrep -v '^DEPRECATION:'
60+
> pip-review | egrep '^pip=='
6161
> else
6262
> echo Skipped
6363
> fi

tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[tox]
2-
envlist = py27,py34,py36
2+
envlist = py27,py34,py36,py310
33

44
[testenv]
55
deps=cram

0 commit comments

Comments
 (0)