Skip to content

Commit

Permalink
move dependencies from requirements.txt to setup.py
Browse files Browse the repository at this point in the history
also use specific versions of testing tools in tox.ini
  • Loading branch information
taleinat committed Feb 13, 2015
1 parent 422de89 commit ae37d09
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 9 deletions.
2 changes: 0 additions & 2 deletions requirements.txt

This file was deleted.

5 changes: 4 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,10 @@ def run_setup(with_binary=True):
packages=['fuzzysearch'],
package_dir={'': 'src'},
ext_modules=ext_modules,
license="MIT",
install_requires=[
'six',
],
license='MIT',
keywords='fuzzysearch',
classifiers=[
'Development Status :: 3 - Alpha',
Expand Down
16 changes: 10 additions & 6 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,20 @@ envlist = py{26,27,32,33,34}-{with,without}_coverage
; CFLAGS=-Qunused-arguments
; CPPFLAGS=-Qunused-arguments
deps =
-r{toxinidir}/requirements.txt
coverage
py26: unittest2
py{26,27,32}: mock
; use specific versions of testing tools with which this is known to work
coverage==3.7.1
py26: unittest2==0.8.0
py{26,27,32}: mock==1.0.1
; use the latest version of BioPython
py{27,33,34}: biopython
whitelist_externals =
mv
commands =
; run tests both with and without the C extensions (including Cython)
; merge the coverage run results from both runs
; Notes:
; * run tests both with and without the C extensions (including Cython)
; * if running with coverage, merge the coverage run results from both runs
; * for Python 2.6 use the unit2 script since -m unittest2 doesn't work
; (but when running with coverage, coverage run -m unittest2 works)
py26-without_coverage: {envbindir}/unit2 discover tests -t {toxinidir}
py26-with_coverage: {envbindir}/coverage run --source=fuzzysearch -m unittest2 discover tests
py{27,32,33,34}-without_coverage: {envpython} -m unittest discover tests
Expand Down

0 comments on commit ae37d09

Please sign in to comment.