summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Holtermann <info@markusholtermann.eu>2014-09-19 09:44:41 +0200
committerMarkus Holtermann <info@markusholtermann.eu>2014-09-19 09:44:41 +0200
commitc21a35c216bbb9e4f6eadd80298a50ca148fa5f2 (patch)
tree0c0ca0a3e62a6d2e2034b66cf9c2fce85c8b078b
parent36a62f1b62150951f8dc92a05f60778a3149409f (diff)
downloadbvg-grabber-c21a35c216bbb9e4f6eadd80298a50ca148fa5f2.tar.gz
bvg-grabber-c21a35c216bbb9e4f6eadd80298a50ca148fa5f2.tar.bz2
bvg-grabber-c21a35c216bbb9e4f6eadd80298a50ca148fa5f2.zip
Update requirements
-rw-r--r--.travis.yml2
-rw-r--r--requirements.txt5
-rwxr-xr-xsetup.py8
-rw-r--r--tests/test_api.py1
4 files changed, 7 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml
index 33784eb..a9fd76c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ python:
- "3.3"
# command to install dependencies
install:
- - pip install -r requirements.txt
+ - pip install -e .
- pip install coverage
# command to run tests
script: coverage run -m unittest discover -s tests -v && coverage report -m
diff --git a/requirements.txt b/requirements.txt
deleted file mode 100644
index b4465ed..0000000
--- a/requirements.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-beautifulsoup4==4.2.1
-python-dateutil==2.1
-requests==1.2.3
-six==1.3.0
-
diff --git a/setup.py b/setup.py
index 5c48eb0..fff088d 100755
--- a/setup.py
+++ b/setup.py
@@ -9,7 +9,6 @@ BASEDIR = path.dirname(__file__)
open = lambda filepath: codecs.open(filepath, 'r', 'utf-8')
description = open(path.join(BASEDIR, 'README.rst')).read()
-requirements = [line for line in open(path.join(BASEDIR, 'requirements.txt'))]
setup(
name='bvg-grabber',
@@ -22,7 +21,12 @@ setup(
license='BSD',
packages=find_packages(exclude=['tests']),
include_package_data=True,
- install_requires=requirements,
+ install_requires=[
+ 'beautifulsoup4>=4.2.1',
+ 'python-dateutil>=2.1',
+ 'requests>=1.2.3',
+ 'six>=1.3.0',
+ ],
test_suite="tests",
scripts=['bvg-grabber.py'],
classifiers=[
diff --git a/tests/test_api.py b/tests/test_api.py
index 6db8e0d..bb79677 100644
--- a/tests/test_api.py
+++ b/tests/test_api.py
@@ -240,7 +240,6 @@ class TestDepartureDatetime(BaseTestDeparture):
class TestDeparture(BaseTestDeparture):
def test_error(self):
- self.assertRaises(ValueError, Departure, "from", "to", "when", "line")
self.assertRaises(TypeError, Departure, "from", "to", ["when"], "line")
self.assertIsInstance(Departure("from", "to", "16:15\n \t*", "line"),
Departure)