Skip to content

Commit 84214c9

Browse files
committed
Set version contraints in setup.py and refer to from requirements file
1 parent 21f038c commit 84214c9

4 files changed

Lines changed: 8 additions & 8 deletions

File tree

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ matrix:
2121
script: "if [ \"$TRAVIS_PULL_REQUEST\" == \"false\" ]; then nosetests test/integration.py; fi"
2222
install:
2323
- if [[ $TRAVIS_PYTHON_VERSION == 2.6 ]]; then pip install unittest2; fi
24-
- pip install -r requirements.txt -r test-requirements.txt
24+
- pip install -r test-requirements.txt
2525
script: nosetests
2626
notifications:
2727
email: false

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
requests>=2.7.0
1+
-e .

setup.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,20 @@
1010
sys.path.insert(0, os.path.join(os.path.dirname(__file__), 'tinify'))
1111
from version import __version__
1212

13-
tests_require = ['nose', 'httpretty']
13+
install_require = ['requests >= 2.7.0, < 3.0.0']
14+
tests_require = ['nose >= 1.3, < 2.0', 'httpretty >= 0.8.10, < 1.0.0']
15+
1416
if sys.version_info < (2, 7):
1517
tests_require.append('unittest2')
1618
if sys.version_info < (3, 3):
17-
tests_require.append('mock')
19+
tests_require.append('mock >= 1.3, < 2.0')
1820

1921
setup(
2022
name='tinify',
2123
version=__version__,
2224
description='Tinify API client.',
2325
author='Jacob Middag',
24-
author_email='jacobmiddag@voormedia.com',
26+
author_email='info@tinify.com',
2527
license='MIT',
2628
long_description='Python client for the Tinify API. Tinify compresses your images intelligently. Read more at https://tinify.com.',
2729
url='https://tinify.com/developers',

test-requirements.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
1-
httpretty==0.8.10
2-
mock>=1.3.0
3-
nose>=1.3.0
1+
-e .[test]

0 commit comments

Comments
 (0)