Skip to content

Commit 021b63f

Browse files
committed
rearranges test dependencies #23
1 parent b626ca2 commit 021b63f

File tree

6 files changed

+11
-18
lines changed

6 files changed

+11
-18
lines changed

.travis.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,7 @@ python:
33
- "2.6"
44
- "2.7"
55
- "3.3"
6-
install: pip install -r requirements.txt
6+
install:
7+
- "pip install -r test_requirements.txt"
8+
- "pip install -r requirements.txt"
79
script: nosetests

MANIFEST.in

Lines changed: 0 additions & 4 deletions
This file was deleted.

README.rst

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@ OpenTok Python SDK
55
.. image:: https://travis-ci.org/aoberoi/Opentok-Python-SDK.svg?branch=modernization
66
:target: https://travis-ci.org/aoberoi/Opentok-Python-SDK
77

8-
The OpenTok Python SDK lets you generate `sessions <http://tokbox.com/opentok/tutorials/create-session/>`_ and
9-
`tokens <http://tokbox.com/opentok/tutorials/create-token/>`_ for `OpenTok <http://www.tokbox.com/>`_ applications. This version of the SDK also includes support for working with OpenTok 2.0 archives.
8+
The OpenTok Python SDK lets you generate
9+
`sessions <http://tokbox.com/opentok/tutorials/create-session/>`_ and
10+
`tokens <http://tokbox.com/opentok/tutorials/create-token/>`_ for `OpenTok <http://www.tokbox.com/>`_
11+
applications. This version of the SDK also includes support for working with OpenTok 2.0 archives.
1012

1113

1214
Installation

setup.py

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,10 @@ def find_version(*file_paths):
4646

4747
'License :: OSI Approved :: MIT License',
4848

49-
# TODO: verify that the package actually works in all these versions
5049
'Programming Language :: Python :: 2',
5150
'Programming Language :: Python :: 2.6',
5251
'Programming Language :: Python :: 2.7',
5352
'Programming Language :: Python :: 3',
54-
'Programming Language :: Python :: 3.1',
5553
'Programming Language :: Python :: 3.2',
5654
'Programming Language :: Python :: 3.3',
5755

@@ -74,8 +72,6 @@ def find_version(*file_paths):
7472
'enum34',
7573
'six',
7674
'pytz',
77-
'httpretty',
78-
'sure',
7975
],
8076

8177
# TODO: these aren't in the sample package, but might again become imp
@@ -86,10 +82,4 @@ def find_version(*file_paths):
8682
# NOTE: this isn't included in the sample packaging recommendation, but it seems to be the
8783
# de-facto standard for testing tools, Travis uses nose
8884
test_suite='nose.collector',
89-
tests_require=[
90-
'nose',
91-
'six',
92-
'httpretty',
93-
'sure',
94-
],
9585
)

test_requirements.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
nose
2+
httpretty
3+
sure

tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ envlist = py26,py27,py34
55
; are in the setup.py. so this probably isn't necessary if we are replying on
66
; tox doing an sdist installation. it should stick around for travis though.
77
; deps = -rrequirements.txt
8-
deps = nose
8+
deps = -rtest_requirements.txt
99
commands =
1010
nosetests []

0 commit comments

Comments
 (0)