diff --git a/.gitignore b/.gitignore index 1a70026..1dbc687 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,3 @@ -*.sqlite -*.db - # Byte-compiled / optimized / DLL files __pycache__/ *.py[cod] diff --git a/.travis.yml b/.travis.yml index d808256..c699adf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: python python: -- '2.7' +- '3.5' install: pip install -r requirements.txt script: cd tests; python -m nose after_success: diff --git a/setup.py b/setup.py index c08046d..2dd536e 100644 --- a/setup.py +++ b/setup.py @@ -12,12 +12,5 @@ url='http://github.com/rkuykendall/marvelous', packages=find_packages(), zip_safe=True, - - # requests-cache should be added here when the version in pypi supports - # ignored_parameters. Unitl then cache will not work without manually - # installing the version from github. - # - # TODO: Cache this missing module in the code and print instructions - # for installing it. install_requires=['marshmallow', 'requests'], ) diff --git a/tests/comic_test.py b/tests/comic_test.py index ad24692..691496a 100644 --- a/tests/comic_test.py +++ b/tests/comic_test.py @@ -10,7 +10,7 @@ def setUp(self): priv = os.getenv('PRIVATE_KEY', 'priv') self.m = marvelous.api( public_key=pub, private_key=priv, - cache=marvelous.SqliteCache("testing_mock.db")) + cache=marvelous.SqliteCache("tests/testing_mock.sqlite")) def test_pulls_verbose(self): week = self.m.comics({ diff --git a/tests/testing_mock.sqlite b/tests/testing_mock.sqlite index 54263fc..aab3d18 100644 Binary files a/tests/testing_mock.sqlite and b/tests/testing_mock.sqlite differ