Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/ESGF/esgf-pyclient
Browse files Browse the repository at this point in the history
  • Loading branch information
agstephens committed Mar 19, 2018
2 parents d4a0b09 + f47ac2c commit 474face
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion pyesgf/search/connection.py
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,7 @@ def create_single_session(cache=None, expire_after=datetime.timedelta(hours=1),
# Corrupted cache:
try:
os.remove(cache)
except Exception as exc:
except Exception:
pass
session = (requests_cache.core
.CachedSession(cache, expire_after=expire_after))
Expand Down
5 changes: 3 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@
include_package_data=True,
zip_safe=False,
install_requires=['jinja2', 'requests', 'requests_cache', 'six'],
extras_require={'testing': ['myproxyclient', 'pytest', 'nose']},
tests_require=['pytest'],
extras_require={'testing':
['myproxyclient', 'pytest', 'nose', 'flake8']},
tests_require=['pytest', 'flake8'],
entry_points={},
test_suite='test')

0 comments on commit 474face

Please sign in to comment.