Merge pull request #27 from CenterForOpenScience/master

[feature] optional timeout for get dataset methods, flake8, fast travis builds

Author: rliebz

.travis.yml

@@ -1,12 +1,24 @@
 language: python
+
 python:
   - 2.6
   - 2.7
   - 3.3
   #- 3.4 # "No output has been received in the last 10 minutes, this potentially indicates a stalled build or something wrong with the build itself."
+
+sudo: false
+
+cache:
+  directories:
+    - $HOME/wheelhouse
+
+env:
+  - WHEELHOUSE=$HOME/wheelhouse/`python --version`
+
 install:
-  - pip install -U .
-  - pip install httpretty pytest flake8
+  - pip wheel --find-links=$HOME/wheelhouse --wheel-dir=$HOME/wheelhouse . httpretty pytest flake8 ordereddict
+  - pip install --find-links=$HOME/wheelhouse --no-index . httpretty pytest flake8 ordereddict
+
 script:
   - flake8 .
-  - py.test
+  - py.test -v

dataverse/__init__.py

@@ -1,9 +1,9 @@
 from __future__ import absolute_import
 
 from requests.packages import urllib3
-urllib3.disable_warnings()
+urllib3.disable_warnings()  # noqa
 
-from dataverse.connection import Connection
-from dataverse.dataverse import Dataverse
-from dataverse.dataset import Dataset
-from dataverse.file import DataverseFile
+from dataverse.connection import Connection  # noqa
+from dataverse.dataverse import Dataverse  # noqa
+from dataverse.dataset import Dataset  # noqa
+from dataverse.file import DataverseFile  # noqa

dataverse/dataverse.py

@@ -65,13 +65,14 @@ def get_contents(self, refresh=False):
         self._contents_json = resp.json()['data']
         return self._contents_json
 
-    def get_collection_info(self, refresh=False):
+    def get_collection_info(self, refresh=False, timeout=None):
         if not refresh and self._collection_info:
             return self._collection_info
 
         self._collection_info = requests.get(
             self.collection.get('href'),
             auth=self.connection.auth,
+            timeout=timeout,
         ).content
         return self._collection_info
 
@@ -133,16 +134,25 @@ def delete_dataset(self, dataset):
         dataset.is_deleted = True
         self.get_collection_info(refresh=True)
 
-    def get_datasets(self, refresh=False):
-        collection_info = self.get_collection_info(refresh)
+    def get_datasets(self, refresh=False, timeout=None):
+        collection_info = self.get_collection_info(refresh, timeout=timeout)
         entries = get_elements(collection_info, tag='entry')
         return [Dataset.from_dataverse(entry, self) for entry in entries]
 
-    def get_dataset_by_doi(self, doi, refresh=False):
-        return next((s for s in self.get_datasets(refresh) if s.doi == doi), None)
+    def get_dataset_by_doi(self, doi, refresh=False, timeout=None):
+        return next(
+            (s for s in self.get_datasets(refresh, timeout=timeout) if s.doi == doi),
+            None
+        )
 
-    def get_dataset_by_title(self, title, refresh=False):
-        return next((s for s in self.get_datasets(refresh) if s.title == title), None)
+    def get_dataset_by_title(self, title, refresh=False, timeout=None):
+        return next(
+            (s for s in self.get_datasets(refresh, timeout=timeout) if s.title == title),
+            None
+        )
 
-    def get_dataset_by_string_in_entry(self, string, refresh=False):
-        return next((s for s in self.get_datasets(refresh) if string in s.get_entry()), None)
+    def get_dataset_by_string_in_entry(self, string, refresh=False, timeout=None):
+        return next(
+            (s for s in self.get_datasets(refresh, timeout=timeout) if string in s.get_entry()),
+            None
+        )

dataverse/settings/__init__.py

@@ -1,8 +1,8 @@
 from __future__ import absolute_import
 
-from dataverse.settings.defaults import *
+from dataverse.settings.defaults import *  # noqa
 
 try:
-    from dataverse.settings.local import *
+    from dataverse.settings.local import *  # noqa
 except ImportError as error:
     pass