Skip to content

Commit a2bcfef

Browse files
authored
Merge pull request #14 from ilanddev/shared_dependencies
Dependencies definition shared with
2 parents d31e8f6 + 7ea3880 commit a2bcfef

File tree

5 files changed

+11
-14
lines changed

5 files changed

+11
-14
lines changed

HISTORY.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ History
77

88
* Force iland API v0.8.
99
* Update dev requirements.
10+
* Dependencies definition shared with `setup.py`
1011
* Add support for passing additional headers with api requests.
1112

1213
0.7.4 (2017-05-26)

MANIFEST.in

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@ include CONTRIBUTING.rst
33
include HISTORY.rst
44
include LICENSE
55
include README.rst
6+
include requirements.txt
7+
include requirements_dev.txt
68

79
recursive-include tests *
810
recursive-exclude * __pycache__
911
recursive-exclude * *.py[co]
1012

11-
recursive-include docs *.rst conf.py Makefile make.bat
13+
recursive-include docs *.rst conf.py Makefile

requirements_dev.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ bumpversion==0.5.3
22
wheel>=0.26.0
33
watchdog==0.8.3
44
flake8==3.3.0
5-
tox==2.7.0
5+
tox>=2.5.0
66
coverage==4.4.1
7-
Sphinx=1.6.2
7+
Sphinx==1.6.2
88
requests_mock==1.3.0
99

setup.py

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#!/usr/bin/env python
22
# -*- coding: utf-8 -*-
33

4-
54
try:
65
from setuptools import setup
76
except ImportError:
@@ -15,16 +14,11 @@
1514
with open('HISTORY.rst') as history_file:
1615
history = history_file.read()
1716

18-
requirements = ['requests>=2.2.1'],
17+
with open('requirements.txt') as requirements_file:
18+
requirements = requirements_file.read().splitlines()
1919

20-
test_requirements = ['bumpversion==0.5.3',
21-
'wheel>=0.29.0',
22-
'watchdog==0.8.3',
23-
'flake8==3.3.0',
24-
'tox==2.7.0',
25-
'coverage==4.4.1',
26-
'Sphinx==1.6.2',
27-
'requests_mock==1.3.0'],
20+
with open('requirements_dev.txt') as requirements_dev_file:
21+
test_requirements = requirements_dev_file.read().splitlines()
2822

2923
setup(
3024
name='iland-sdk',

tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ envlist = py27,py35,docs,flake8
55
commands = python setup.py test
66

77
[testenv:docs]
8-
commands=make docs
8+
commands=/usr/bin/make docs
99
deps=Sphinx
1010

1111
[testenv:flake8]

0 commit comments

Comments
 (0)