Skip to content

Commit 8862227

Browse files
committed
Fix issue with six not getting installed.
We were doing it via installing *pytest* before, which although worked was definitely not preferable because it meant users would get pytest in their prod environments. Now we will do it by explicitly putting six in there. Eventually we will remove python2 support and can remove six.
1 parent 6000250 commit 8862227

File tree

3 files changed

+32
-31
lines changed

3 files changed

+32
-31
lines changed

requirements.in

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
cachetools==2.1.0
2-
pip-tools==3.1.0
3-
pycodestyle==2.4.0
4-
pytest==3.8.2
5-
python-dateutil==2.6.1
6-
pytz==2017.2
1+
# For app
72
requests>=2.18.4
3+
cachetools==3.1.1
4+
pytest==4.5.0
5+
6+
# For dev
7+
pip-tools==3.7.0
8+
black==19.3b0

requirements.txt

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,24 @@
22
# This file is autogenerated by pip-compile
33
# To update, run:
44
#
5-
# pip-compile --no-index --output-file requirements.txt requirements.in
5+
# pip-compile --no-index --output-file=requirements.txt requirements.in
66
#
7+
appdirs==1.4.3 # via black
78
atomicwrites==1.3.0 # via pytest
8-
attrs==19.1.0 # via pytest
9-
cachetools==2.1.0
9+
attrs==19.1.0 # via black, pytest
10+
black==19.3b0
11+
cachetools==3.1.1
1012
certifi==2019.3.9 # via requests
1113
chardet==3.0.4 # via requests
12-
click==7.0 # via pip-tools
14+
click==7.0 # via black, pip-tools
1315
idna==2.8 # via requests
1416
more-itertools==6.0.0 # via pytest
15-
pip-tools==3.1.0
17+
pip-tools==3.7.0
1618
pluggy==0.9.0 # via pytest
1719
py==1.8.0 # via pytest
18-
pycodestyle==2.4.0
19-
pytest==3.8.2
20-
python-dateutil==2.6.1
21-
pytz==2017.2
20+
pytest==4.5.0
2221
requests==2.21.0
23-
six==1.12.0 # via pip-tools, pytest, python-dateutil
22+
six==1.12.0 # via pip-tools, pytest
23+
toml==0.10.0 # via black
2424
urllib3==1.24.1 # via requests
25+
wcwidth==0.1.7 # via pytest

setup.py

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,17 @@
88
You can visit our developer docs at https://ipinfo.io/developers.
99
"""
1010

11-
setup(name='ipinfo',
12-
version='1.1.1',
13-
description='Official Python library for IPInfo',
14-
long_description=long_description,
15-
url='https://github.com/ipinfo/python',
16-
author='James Timmins',
17-
author_email='[email protected]',
18-
license='Apache License 2.0',
19-
packages=['ipinfo', 'ipinfo.cache'],
20-
install_requires=[
21-
'requests',
22-
'cachetools',
23-
],
24-
include_package_data=True,
25-
zip_safe=False)
11+
setup(
12+
name="ipinfo",
13+
version="1.1.1",
14+
description="Official Python library for IPInfo",
15+
long_description=long_description,
16+
url="https://github.com/ipinfo/python",
17+
author="James Timmins",
18+
author_email="[email protected]",
19+
license="Apache License 2.0",
20+
packages=["ipinfo", "ipinfo.cache"],
21+
install_requires=["requests", "cachetools", "six"],
22+
include_package_data=True,
23+
zip_safe=False,
24+
)

0 commit comments

Comments
 (0)