Skip to content

Commit

Permalink
Fix Travis python setting and update tests cache database.
Browse files Browse the repository at this point in the history
  • Loading branch information
rkuykendall committed Nov 6, 2016
1 parent 2ae86ca commit eededf3
Show file tree
Hide file tree
Showing 5 changed files with 2 additions and 12 deletions.
3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
*.sqlite
*.db

# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
7 changes: 0 additions & 7 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'],
)
2 changes: 1 addition & 1 deletion tests/comic_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -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({
Expand Down
Binary file modified tests/testing_mock.sqlite
Binary file not shown.

0 comments on commit eededf3

Please sign in to comment.