Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'master' of github.com:cobrateam/splinter
  • Loading branch information
fsouza committed Oct 4, 2011
2 parents 2b01515 + dabe17c commit b91c5fe
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion AUTHORS
Expand Up @@ -9,7 +9,7 @@ splinter is written and maintained by cobrateam and various contributors:
* tarsis (Tarsis Azevedo)
* bernardofire (Bernardo Barreto)
* fabiomcosta (Fábio M. Costa)
* dsarch (Douglas Soares de Andrade)
* douglas (Douglas Soares de Andrade)
* nyxtom (Thomas Holloway)
* gabrielfalcao (Gabriel Falcão)
* siminino (Victor de Oliveira Areas)
Expand Down
8 changes: 4 additions & 4 deletions Makefile
Expand Up @@ -12,10 +12,10 @@ argparse:
@python -c 'import argparse' 2>/dev/null || pip install argparse

coverage:
@python -c 'import coverage' 2>/dev/null || pip install coverage==3.5
@python -c 'import coverage' 2>/dev/null || pip install coverage==3.5.1

selenium:
@python -c 'import selenium' 2>/dev/null || pip install selenium==2.6.0
@python -c 'import selenium' 2>/dev/null || pip install selenium==2.7.0

unittest2:
@python -c 'import unittest.skip' 2>/dev/null || pip install unittest2
Expand All @@ -24,10 +24,10 @@ flask:
@python -c 'import flask' 2>/dev/null || pip install flask==0.7.2

lxml:
@python -c 'import lxml' 2>/dev/null || pip install lxml==2.3
@python -c 'import lxml' 2>/dev/null || pip install lxml==2.3.1

sphinx:
@python -c 'import sphinx' 2>/dev/null || pip install sphinx==1.0.7
@python -c 'import sphinx' 2>/dev/null || pip install sphinx==1.0.8

zopetestbrowser:
@python -c 'import zope.testbrowser' 2>/dev/null || pip install zope.testbrowser==4.0.2
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Expand Up @@ -11,6 +11,6 @@
author_email='andrewsmedina@gmail.com',
packages=find_packages(),
include_package_data=True,
install_requires=['selenium==2.6.0', 'lxml==2.3'],
install_requires=['selenium==2.7.0', 'lxml==2.3.1'],
tests_require=['coverage', 'flask'],
)
2 changes: 1 addition & 1 deletion tests/test_meta.py
Expand Up @@ -3,7 +3,7 @@
try:
import unittest2 as unittest
except ImportError:
import unittet
import unittest

from splinter.meta import InheritedDocs

Expand Down
2 changes: 1 addition & 1 deletion tests/test_request_handler.py
Expand Up @@ -4,7 +4,7 @@
try:
import unittest2 as unittest
except ImportError:
import unittet
import unittest

from fake_webapp import EXAMPLE_APP
from splinter.request_handler.request_handler import RequestHandler
Expand Down

0 comments on commit b91c5fe

Please sign in to comment.