Skip to content

Commit 3a831c1

Browse files
committed
Merge branch 'release/1.1.1'
2 parents 68262a8 + 9afe455 commit 3a831c1

File tree

4 files changed

+34
-28
lines changed

4 files changed

+34
-28
lines changed

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-2020 Julian Gonggrijp
2+
Copyright 2015-2021 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

README.rst

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,24 @@ being upgraded, you can use a constraint file (similar to ``requirements.txt``):
5757
Set this variable in ``.bashrc`` or ``.zshenv`` to make it persistent.
5858
Alternatively, this option can be specified in ``pip.conf``, e.g.:
5959

60+
* Linux:
61+
6062
.. code:: console
6163
62-
$ cat ~/.config/pip.conf
64+
$ cat ~/.config/pip/pip.conf
6365
[global]
6466
constraint = /home/username/constraints.txt
67+
68+
* Windows:
69+
70+
.. code:: console
71+
72+
$ cat $HOME\AppData\Roaming\pip\pip.ini
73+
[global]
74+
constraint = '$HOME\Roaming\pip\constraints.txt'
75+
76+
The conf file are dependent of the user, so If you use multiple users you must define config file for each of them.
77+
https://pip.pypa.io/en/stable/user_guide/#constraints-files
6578

6679
Since version 0.5, you can also invoke pip-review as ``python -m pip_review``. This can be useful if you are using multiple versions of Python next to each other.
6780

pip_review/__main__.py

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
from __future__ import absolute_import
2-
import os
32
import re
43
import argparse
54
from functools import partial
@@ -12,9 +11,6 @@
1211

1312
PY3 = sys.version_info.major == 3
1413
if PY3: # Python3 Imports
15-
import urllib.request as urllib_request
16-
import subprocess
17-
1814
def check_output(*args, **kwargs):
1915
process = subprocess.Popen(stdout=subprocess.PIPE, *args, **kwargs)
2016
output, _ = process.communicate()
@@ -26,7 +22,6 @@ def check_output(*args, **kwargs):
2622
return output
2723

2824
else: # Python2 Imports
29-
import urllib2 as urllib_request
3025
from subprocess import check_output
3126
import __builtin__
3227
input = getattr(__builtin__, 'raw_input')
@@ -169,8 +164,8 @@ def ask(self, prompt):
169164

170165

171166
def update_packages(packages, forwarded):
172-
command = pip_cmd() + ['install'] + forwarded + [
173-
'{0}=={1}'.format(pkg['name'], pkg['latest_version']) for pkg in packages
167+
command = pip_cmd() + ['install', '-U'] + forwarded + [
168+
'{0}'.format(pkg['name']) for pkg in packages
174169
]
175170

176171
subprocess.call(command, stdout=sys.stdout, stderr=sys.stderr)

setup.py

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
1-
"""
2-
pip-review lets you smoothly manage all available PyPI updates.
3-
"""
4-
import sys
1+
""" pip-review lets you smoothly manage all available PyPI updates. """
2+
53
from setuptools import setup
64

75

86
setup(
97
name='pip-review',
10-
version='1.1.0',
8+
version='1.1.1',
119
url='https://github.com/jgonggrijp/pip-review',
1210
license='BSD',
1311
author='Julian Gonggrijp, Vincent Driessen',
@@ -23,7 +21,7 @@
2321
'pip-review = pip_review.__main__:main',
2422
],
2523
},
26-
#include_package_data=True,
24+
# include_package_data=True,
2725
zip_safe=False,
2826
platforms='any',
2927
install_requires=[
@@ -33,24 +31,24 @@
3331
python_requires='>=2.7, !=3.0, !=3.1, !=3.2',
3432
classifiers=[
3533
# As from https://pypi.python.org/pypi?%3Aaction=list_classifiers
36-
#'Development Status :: 1 - Planning',
37-
#'Development Status :: 2 - Pre-Alpha',
38-
#'Development Status :: 3 - Alpha',
39-
#'Development Status :: 4 - Beta',
34+
# 'Development Status :: 1 - Planning',
35+
# 'Development Status :: 2 - Pre-Alpha',
36+
# 'Development Status :: 3 - Alpha',
37+
# 'Development Status :: 4 - Beta',
4038
'Development Status :: 5 - Production/Stable',
41-
#'Development Status :: 6 - Mature',
42-
#'Development Status :: 7 - Inactive',
39+
# 'Development Status :: 6 - Mature',
40+
# 'Development Status :: 7 - Inactive',
4341
'Programming Language :: Python',
4442
'Programming Language :: Python :: 2',
45-
#'Programming Language :: Python :: 2.3',
46-
#'Programming Language :: Python :: 2.4',
47-
#'Programming Language :: Python :: 2.5',
48-
#'Programming Language :: Python :: 2.6',
43+
# 'Programming Language :: Python :: 2.3',
44+
# 'Programming Language :: Python :: 2.4',
45+
# 'Programming Language :: Python :: 2.5',
46+
# 'Programming Language :: Python :: 2.6',
4947
'Programming Language :: Python :: 2.7',
5048
'Programming Language :: Python :: 3',
51-
#'Programming Language :: Python :: 3.0',
52-
#'Programming Language :: Python :: 3.1',
53-
#'Programming Language :: Python :: 3.2',
49+
# 'Programming Language :: Python :: 3.0',
50+
# 'Programming Language :: Python :: 3.1',
51+
# 'Programming Language :: Python :: 3.2',
5452
'Programming Language :: Python :: 3.3',
5553
'Programming Language :: Python :: 3.4',
5654
'Programming Language :: Python :: 3.5',

0 commit comments

Comments
 (0)